Merge branch 'dev' into 6193_inventory

db/dump/fixtures.before.sql

@@ -3068,3 +3068,6 @@ INSERT INTO `vn`.`cmr` (id,truckPlate,observations,senderInstruccions,paymentIns
 	VALUES (1,'123456A','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',442,1,2,1,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet'),
 	    (2,'123456N','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',69,3,4,2,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet'),
 	    (3,'123456B','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',567,5,6,69,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet');
+
+UPDATE vn.department
+    SET workerFk = null;

modules/worker/back/methods/worker/specs/new.spec.js

@@ -139,9 +139,12 @@ describe('Worker new', () => {
     });
 
     it('should create a new worker', async() => {
-        const newWorker = await models.Worker.new({args: defaultWorker, req});
+        let newWorker;
-
+        try {
-        await removeWorker(newWorker.id);
+            newWorker = await models.Worker.new({args: defaultWorker, req});
+        } finally {
+            await removeWorker(newWorker.id);
+        }
 
         expect(newWorker.id).toBeDefined();
     });
@@ -173,9 +176,12 @@ describe('Worker new', () => {
                 }),
             req
         };
-        const newWorker = await models.Worker.new(newWorkerData);
+        let newWorker;
-
+        try {
-        await models.Worker.destroyById(newWorker.id);
+            newWorker = await models.Worker.new(newWorkerData);
+        } finally {
+            await models.Worker.destroyById(newWorker.id);
+        }
 
         expect(newWorker.id).toEqual(bruceWayneId);
     });