Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

Jenkinsfile

@@ -101,6 +101,7 @@ pipeline {
         }
         stage('Database') {
             when { anyOf {
+                branch 'dev'
                 branch 'test'
                 branch 'master'
             }}

db/dump/fixtures.before.sql

@@ -6,9 +6,10 @@
  */
 SET foreign_key_checks = 0;
 
--- CREATE ROLE 'salix';
--- GRANT 'salix' TO 'root'@'%';
--- SET DEFAULT ROLE 'salix' FOR 'root'@'%';
+DROP ROLE 'salix';
+CREATE ROLE 'salix';
+GRANT 'salix' TO 'root'@'%';
+SET DEFAULT ROLE 'salix' FOR 'root'@'%';
 
 CREATE SCHEMA IF NOT EXISTS `vn2008`;
 CREATE SCHEMA IF NOT EXISTS `tmp`;

db/versions/10849-chocolateCymbidium/00-roleLog.sql

@@ -0,0 +1 @@
+ALTER TABLE account.roleLog DROP FOREIGN KEY roleLog_ibfk_1;

db/versions/10849-chocolateCymbidium/01-userLog.sql

@@ -0,0 +1 @@
+ALTER TABLE account.userLog DROP FOREIGN KEY userLog_ibfk_1;

db/versions/10849-chocolateCymbidium/02-entryLog.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.entryLog DROP FOREIGN KEY entryLog_ibfk_1;

db/versions/10849-chocolateCymbidium/03-clientLog.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.clientLog DROP FOREIGN KEY clientLog_ibfk_1;

db/versions/10849-chocolateCymbidium/04-itemLog.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.itemLog DROP FOREIGN KEY itemLogItemFk;

db/versions/10849-chocolateCymbidium/05-shelvingLog.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.shelvingLog DROP FOREIGN KEY shelvingLog_ibfk_1;

db/versions/10849-chocolateCymbidium/06-workerLog.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.workerLog DROP FOREIGN KEY workerFk;

db/versions/10849-chocolateCymbidium/07-deviceProductionLog.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.deviceProductionLog DROP FOREIGN KEY deviceProductionOriginFk;

db/versions/10849-chocolateCymbidium/08-zoneLog.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.zoneLog DROP FOREIGN KEY zoneLog_ibfk_1;

db/versions/10849-chocolateCymbidium/09-rateLog.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.rateLog DROP FOREIGN KEY rateOriginFk;

db/versions/10849-chocolateCymbidium/10-ticketLog.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.ticketLog DROP FOREIGN KEY ticketLog_ibfk_1;

db/versions/10849-chocolateCymbidium/11-userLog.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.userLog DROP FOREIGN KEY userLog_ibfk_1;

db/versions/10849-chocolateCymbidium/12-routeLog.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.routeLog DROP FOREIGN KEY routeLog_ibfk_1;

db/versions/10849-chocolateCymbidium/13-claimLog.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.claimLog DROP FOREIGN KEY claimOriginFk;

db/versions/10849-chocolateCymbidium/14-supplierLog.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.supplierLog DROP FOREIGN KEY supplierLog_supplierFk;

db/versions/10849-chocolateCymbidium/15-invoiceInLog.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.invoiceInLog DROP FOREIGN KEY invoiceInLog_ibfk_1;

db/versions/10849-chocolateCymbidium/16-travelLog.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.travelLog DROP FOREIGN KEY travelLog_ibfk_1;

db/versions/10849-chocolateCymbidium/17-packingSiteDeviceLog.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.packingSiteDeviceLog DROP FOREIGN KEY packingSiteDeviceLog_ibfk_1;

e2e/paths/05-ticket/02_expeditions_and_log.spec.js

@@ -27,6 +27,6 @@ describe('Ticket expeditions and log path', () => {
         const result = await page
             .countElement(selectors.ticketExpedition.expeditionRow);
 
-        expect(result).toEqual(4);
+        expect(result).toEqual(6);
     });
 });

e2e/paths/13-supplier/02_basic_data.spec.js

@@ -41,10 +41,10 @@ describe('Supplier basic data path', () => {
         expect(result).toEqual('Plants Nick SL');
     });
 
-    it('should check the isSerious checkbox is now unchecked', async() => {
+    it('should check the isSerious checkbox is now checked', async() => {
         const result = await page.checkboxState(selectors.supplierBasicData.isSerious);
 
-        expect(result).toBe('unchecked');
+        expect(result).toBe('checked');
     });
 
     it('should check the isActive checkbox is now unchecked', async() => {