test: enable one test and skip another
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Alex Moreno 2022-12-12 13:11:45 +01:00
parent b2dcb84a7b
commit 4cb8d8c763
5 changed files with 18 additions and 6 deletions

View File

@ -22,12 +22,7 @@ USE `util`;
LOCK TABLES `config` WRITE; LOCK TABLES `config` WRITE;
/*!40000 ALTER TABLE `config` DISABLE KEYS */; /*!40000 ALTER TABLE `config` DISABLE KEYS */;
<<<<<<< HEAD
INSERT INTO `config` VALUES
(1,'10502',0,'production',NULL);
=======
INSERT INTO `config` VALUES (1,'224602',0,'production',NULL); INSERT INTO `config` VALUES (1,'224602',0,'production',NULL);
>>>>>>> ac447d4981695aeceab34cdc30c48cfe26f559b0
/*!40000 ALTER TABLE `config` ENABLE KEYS */; /*!40000 ALTER TABLE `config` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
@ -13729,6 +13724,17 @@ INSERT INTO `link` VALUES
/*!40000 ALTER TABLE `link` ENABLE KEYS */; /*!40000 ALTER TABLE `link` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
--
-- Manual Dumping data for table `agencyTermConfig`
--
LOCK TABLES `agencyTermConfig` WRITE;
/*!40000 ALTER TABLE `agencyTermConfig` DISABLE KEYS */;
INSERT INTO `vn`.`agencyTermConfig` (`expenceFk`, `vatAccountSupported`, `vatPercentage`, `transaction`)
VALUES
('6240000000', '4721000015', 21.0000000000, 'Adquisiciones intracomunitarias de servicios');
/*!40000 ALTER TABLE `agencyTermConfig` ENABLE KEYS */;
UNLOCK TABLES;
-- --
-- Dumping data for table `location` -- Dumping data for table `location`
-- --

View File

@ -2742,3 +2742,7 @@ INSERT INTO `salix`.`url` (`appName`, `environment`, `url`)
VALUES VALUES
('lilium', 'dev', 'http://localhost:8080/#/'), ('lilium', 'dev', 'http://localhost:8080/#/'),
('salix', 'dev', 'http://localhost:5000/#!/'); ('salix', 'dev', 'http://localhost:5000/#!/');
INSERT INTO `vn`.`payDemDetail` (`id`, `detail`)
VALUES
(1, 1);

View File

@ -41,6 +41,7 @@ dump_tables ${TABLES[@]}
TABLES=( TABLES=(
vn vn
agencyTermConfig
alertLevel alertLevel
bookingPlanner bookingPlanner
businessType businessType

View File

@ -16,7 +16,6 @@ describe('AgencyTerm createInvoiceIn()', () => {
]; ];
it('should make an invoiceIn', async() => { it('should make an invoiceIn', async() => {
pending('Include after #3638 export database');
const tx = await models.AgencyTerm.beginTransaction({}); const tx = await models.AgencyTerm.beginTransaction({});
const options = {transaction: tx}; const options = {transaction: tx};

View File

@ -410,6 +410,8 @@ describe('workerTimeControl add/delete timeEntry()', () => {
describe('12h rest', () => { describe('12h rest', () => {
it('should throw an error when the 12h rest is not fulfilled yet', async() => { it('should throw an error when the 12h rest is not fulfilled yet', async() => {
pending('https://redmine.verdnatura.es/issues/4707');
activeCtx.accessToken.userId = salesBossId; activeCtx.accessToken.userId = salesBossId;
const workerId = hankPymId; const workerId = hankPymId;