Merge branch 'dev' into 5187-error-permisos

e2e/paths/05-ticket/21_future.spec.js

@@ -4,12 +4,17 @@ import getBrowser from '../../helpers/puppeteer';
 describe('Ticket Future path', () => {
     let browser;
     let page;
+    let httpRequest;
 
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
         await page.loginAndModule('employee', 'ticket');
         await page.accessToSection('ticket.future');
+        page.on('request', req => {
+            if (req.url().includes(`Tickets/getTicketsFuture`))
+                httpRequest = req.url();
+        });
     });
 
     afterAll(async() => {
@@ -42,114 +47,82 @@ describe('Ticket Future path', () => {
     it('should search with the required data', async() => {
         await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
         await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
+
+        expect(httpRequest).toBeDefined();
     });
 
     it('should search with the origin IPT', async() => {
         await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
 
-        await page.clearInput(selectors.ticketFuture.ipt);
-        await page.clearInput(selectors.ticketFuture.futureIpt);
-        await page.clearInput(selectors.ticketFuture.state);
-        await page.clearInput(selectors.ticketFuture.futureState);
-
         await page.autocompleteSearch(selectors.ticketFuture.ipt, 'Horizontal');
         await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
+
+        expect(httpRequest).toContain('ipt=H');
     });
 
     it('should search with the destination IPT', async() => {
         await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
 
         await page.clearInput(selectors.ticketFuture.ipt);
-        await page.clearInput(selectors.ticketFuture.futureIpt);
-        await page.clearInput(selectors.ticketFuture.state);
-        await page.clearInput(selectors.ticketFuture.futureState);
 
         await page.autocompleteSearch(selectors.ticketFuture.futureIpt, 'Horizontal');
         await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
+
+        expect(httpRequest).toContain('futureIpt=H');
     });
 
     it('should search with the origin grouped state', async() => {
         await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
 
-        await page.clearInput(selectors.ticketFuture.ipt);
         await page.clearInput(selectors.ticketFuture.futureIpt);
-        await page.clearInput(selectors.ticketFuture.state);
-        await page.clearInput(selectors.ticketFuture.futureState);
 
         await page.autocompleteSearch(selectors.ticketFuture.state, 'Free');
         await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 3);
+
+        expect(httpRequest).toContain('state=FREE');
     });
 
     it('should search with the destination grouped state', async() => {
         await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
 
-        await page.clearInput(selectors.ticketFuture.ipt);
-        await page.clearInput(selectors.ticketFuture.futureIpt);
         await page.clearInput(selectors.ticketFuture.state);
-        await page.clearInput(selectors.ticketFuture.futureState);
 
         await page.autocompleteSearch(selectors.ticketFuture.futureState, 'Free');
         await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 0);
+
+        expect(httpRequest).toContain('futureState=FREE');
 
         await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-        await page.clearInput(selectors.ticketFuture.ipt);
-        await page.clearInput(selectors.ticketFuture.futureIpt);
-        await page.clearInput(selectors.ticketFuture.state);
         await page.clearInput(selectors.ticketFuture.futureState);
-
         await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
     });
 
     it('should search in smart-table with an ID Origin', async() => {
         await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.write(selectors.ticketFuture.tableId, '13');
+        await page.write(selectors.ticketFuture.tableId, '1');
         await page.keyboard.press('Enter');
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 2);
 
+        expect(httpRequest).toContain('id');
         await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-        await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
-    });
-
-    it('should search in smart-table with an ID Destination', async() => {
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.write(selectors.ticketFuture.tableFutureId, '12');
-        await page.keyboard.press('Enter');
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 5);
-
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-        await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
-    });
-
-    it('should search in smart-table with an IPT Origin', async() => {
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.autocompleteSearch(selectors.ticketFuture.tableIpt, 'Vertical');
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 1);
-
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-        await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
     });
 
     it('should search in smart-table with an IPT Destination', async() => {
         await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.autocompleteSearch(selectors.ticketFuture.tableFutureIpt, 'Vertical');
+        await page.autocompleteSearch(selectors.ticketFuture.tableFutureIpt, 'Horizontal');
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 1);
 
+        expect(httpRequest).toContain('futureIpt');
+        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
+    });
+
+    it('should search in smart-table with an ID Destination', async() => {
+        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
+        await page.write(selectors.ticketFuture.tableFutureId, '1');
+        await page.keyboard.press('Enter');
+
+        expect(httpRequest).toContain('futureId');
         await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
         await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
         await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
     });
 
     it('should check the three last tickets and move to the future', async() => {

e2e/paths/05-ticket/22_advance.spec.js

@@ -4,7 +4,7 @@ import getBrowser from '../../helpers/puppeteer';
 describe('Ticket Advance path', () => {
     let browser;
     let page;
-    const httpRequests = [];
+    let httpRequest;
 
     beforeAll(async() => {
         browser = await getBrowser();
@@ -13,7 +13,7 @@ describe('Ticket Advance path', () => {
         await page.accessToSection('ticket.advance');
         page.on('request', req => {
             if (req.url().includes(`Tickets/getTicketsAdvance`))
-                httpRequests.push(req.url());
+                httpRequest = req.url();
         });
     });
 
@@ -49,7 +49,7 @@ describe('Ticket Advance path', () => {
         await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
         await page.waitToClick(selectors.ticketAdvance.submit);
 
-        expect(httpRequests.length).toBeGreaterThan(0);
+        expect(httpRequest).toBeDefined();
     });
 
     it('should search with the origin IPT', async() => {
@@ -57,11 +57,7 @@ describe('Ticket Advance path', () => {
         await page.autocompleteSearch(selectors.ticketAdvance.futureIpt, 'Horizontal');
         await page.waitToClick(selectors.ticketAdvance.submit);
 
-        const request = httpRequests.find(req => req.includes(('futureIpt=H')));
+        expect(httpRequest).toContain('futureIpt=H');
-
-        expect(request).toBeDefined();
-
-        httpRequests.splice(httpRequests.indexOf(request), 1);
 
         await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
         await page.clearInput(selectors.ticketAdvance.futureIpt);
@@ -73,11 +69,7 @@ describe('Ticket Advance path', () => {
         await page.autocompleteSearch(selectors.ticketAdvance.ipt, 'Horizontal');
         await page.waitToClick(selectors.ticketAdvance.submit);
 
-        const request = httpRequests.find(req => req.includes(('ipt=H')));
+        expect(httpRequest).toContain('ipt=H');
-
-        expect(request).toBeDefined();
-
-        httpRequests.splice(httpRequests.indexOf(request), 1);
 
         await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
         await page.clearInput(selectors.ticketAdvance.ipt);
@@ -88,11 +80,7 @@ describe('Ticket Advance path', () => {
         await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
         await page.autocompleteSearch(selectors.ticketAdvance.tableFutureIpt, 'Vertical');
 
-        const request = httpRequests.find(req => req.includes(('futureIpt')));
+        expect(httpRequest).toContain('futureIpt');
-
-        expect(request).toBeDefined();
-
-        httpRequests.splice(httpRequests.indexOf(request), 1);
 
         await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
         await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
@@ -103,11 +91,7 @@ describe('Ticket Advance path', () => {
         await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
         await page.autocompleteSearch(selectors.ticketAdvance.tableIpt, 'Vertical');
 
-        const request = httpRequests.find(req => req.includes(('ipt')));
+        expect(httpRequest).toContain('ipt');
-
-        expect(request).toBeDefined();
-
-        httpRequests.splice(httpRequests.indexOf(request), 1);
 
         await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
         await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);

modules/invoiceOut/back/methods/invoiceOut/createPdf.js

@@ -44,7 +44,7 @@ module.exports = Self => {
         try {
             const invoiceOut = await Self.findById(id, null, myOptions);
             const hasInvoicing = await models.Account.hasRole(userId, 'invoicing', myOptions);
-
+            console.log(invoiceOut, !hasInvoicing);
             if (invoiceOut.hasPdf && !hasInvoicing)
                 throw new UserError(`You don't have enough privileges`);
 

modules/invoiceOut/back/methods/invoiceOut/downloadZip.js

@@ -47,6 +47,7 @@ module.exports = Self => {
         ids = ids.split(',');
 
         for (let id of ids) {
+            console.log(zipConfig, totalSize, zipConfig ? zipConfig.maxSize : null);
             if (zipConfig && totalSize > zipConfig.maxSize) throw new UserError('Files are too large');
             const invoiceOutPdf = await models.InvoiceOut.download(ctx, id, myOptions);
             const fileName = extractFileName(invoiceOutPdf[2]);

modules/invoiceOut/back/methods/invoiceOut/specs/createPdf.spec.js

@@ -11,7 +11,6 @@ describe('InvoiceOut createPdf()', () => {
     const ctx = {req: activeCtx};
 
     it('should create a new PDF file and set true the hasPdf property', async() => {
-        pending('https://redmine.verdnatura.es/issues/5035');
         const invoiceId = 1;
         spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
             active: activeCtx

modules/invoiceOut/back/methods/invoiceOut/specs/downloadZip.spec.js

@@ -30,8 +30,6 @@ describe('InvoiceOut downloadZip()', () => {
     });
 
     it('should return an error if the size of the files is too large', async() => {
-        pending('https://redmine.verdnatura.es/issues/5035');
-
         const tx = await models.InvoiceOut.beginTransaction({});
 
         let error;

modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js

@@ -65,8 +65,9 @@ describe('InvoiceOut filter()', () => {
             await invoiceOut.updateAttribute('hasPdf', true, options);
 
             const result = await models.InvoiceOut.filter(ctx, {id: invoiceOut.id}, options);
+            console.log(result);
 
-            expect(result.length).toBeGreaterThanOrEqual(1);
+            expect(result.length).toEqual(1);
 
             await tx.rollback();
         } catch (e) {