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

.eslintrc.yml

@@ -32,3 +32,5 @@ rules:
     indent: [error, 4]
     arrow-parens: [error, as-needed]
     jasmine/no-focused-tests: 0
+    no-multiple-empty-lines: ["error", { "max": 1, "maxEOF": 1 }]
+    space-in-parens: ["error", "never"]

e2e/helpers/selectors.js

@@ -511,14 +511,16 @@ export default {
     },
     ticketRequests: {
         addRequestButton: 'vn-ticket-request-index > a > vn-float-button > button',
-        request: 'vn-ticket-request-index vn-table vn-tr',
         descriptionInput: 'vn-ticket-request-create [ng-model="$ctrl.ticketRequest.description"]',
         atender: 'vn-ticket-request-create vn-autocomplete[ng-model="$ctrl.ticketRequest.attenderFk"]',
         quantity: 'vn-ticket-request-create vn-input-number[ng-model="$ctrl.ticketRequest.quantity"]',
         price: 'vn-ticket-request-create vn-input-number[ng-model="$ctrl.ticketRequest.price"]',
-        firstRemoveRequestButton: 'vn-ticket-request-index vn-icon[icon="delete"]:nth-child(1)',
+        firstRequestQuantity: 'vn-ticket-request-index vn-table vn-tr:nth-child(1) > vn-td:nth-child(6) vn-input-number',
+        secondRequestQuantity: 'vn-ticket-request-index vn-table vn-tr:nth-child(2) > vn-td:nth-child(6) vn-input-number',
+        thirdDescription: 'vn-ticket-request-index vn-table vn-tr:nth-child(3) > vn-td:nth-child(2) vn-textfield',
+        thirdRemoveRequestButton: 'vn-ticket-request-index vn-tr:nth-child(3) vn-icon[icon="delete"]',
+        thirdRequestQuantity: 'vn-ticket-request-index vn-table vn-tr:nth-child(3) > vn-td:nth-child(6) vn-input-number',
         saveButton: 'vn-ticket-request-create button[type=submit]',
-        firstDescription: 'vn-ticket-request-index vn-table vn-tr:nth-child(1) > vn-td:nth-child(2) vn-textfield',
 
     },
     ticketLog: {

e2e/paths/02-client/05_add_address.spec.js

@@ -70,13 +70,13 @@ describe('Client Add address path', () => {
     });
 
     it(`should confirm the new address exists and it's the default one`, async() => {
+        await page.waitFor(2000); // needs more than a single second to load the section
         const result = await page.waitToGetProperty(selectors.clientAddresses.defaultAddress, 'innerText');
 
         expect(result).toContain('320 Park Avenue New York');
     });
 
-    it(`should click on the make default icon of the second address`, async() => {
+    it('should click on the make default icon of the second address', async() => {
-        await page.waitForContentLoaded();
         await page.waitToClick(selectors.clientAddresses.secondMakeDefaultStar);
         const result = await page.waitForLastSnackbar();
 

e2e/paths/05-ticket/10_request.spec.js

@@ -9,7 +9,7 @@ describe('Ticket purchase request path', () => {
         browser = await getBrowser();
         page = browser.page;
         await page.loginAndModule('salesPerson', 'ticket');
-        await page.accessToSearchResult('16');
+        await page.accessToSearchResult('1');
         await page.accessToSection('ticket.card.request.index');
     });
 
@@ -17,10 +17,10 @@ describe('Ticket purchase request path', () => {
         await browser.close();
     });
 
-    it(`should add a new request`, async() => {
+    it('should add a new request', async() => {
         await page.waitToClick(selectors.ticketRequests.addRequestButton);
         await page.write(selectors.ticketRequests.descriptionInput, 'New stuff');
-        await page.write(selectors.ticketRequests.quantity, '99');
+        await page.write(selectors.ticketRequests.quantity, '9');
         await page.autocompleteSearch(selectors.ticketRequests.atender, 'buyerNick');
         await page.write(selectors.ticketRequests.price, '999');
         await page.waitToClick(selectors.ticketRequests.saveButton);
@@ -29,29 +29,52 @@ describe('Ticket purchase request path', () => {
         expect(result).toEqual('Data saved!');
     });
 
-    it(`should have been redirected to the request index`, async() => {
+    it('should have been redirected to the request index', async() => {
         let url = await page.expectURL('/request');
 
         expect(url).toBe(true);
     });
 
-    it(`should confirm the new request was added`, async() => {
+    it(`should edit the third request quantity as it's state is still new`, async() => {
-        await page.reloadSection('ticket.card.request.index');
+        await page.waitFor(2000); // looks like it needs more than a single second some times to load
-        const result = await page.waitToGetProperty(selectors.ticketRequests.firstDescription, 'value');
+        await page.write(selectors.ticketRequests.thirdRequestQuantity, '9');
-
+        await page.keyboard.press('Enter');
-        expect(result).toEqual('New stuff');
-    });
-
-    it(`should delete the added request`, async() => {
-        await page.waitToClick(selectors.ticketRequests.firstRemoveRequestButton);
         const result = await page.waitForLastSnackbar();
 
         expect(result).toEqual('Data saved!');
     });
 
-    it(`should confirm the request was deleted`, async() => {
+    it('should confirm the new request was added', async() => {
+        await page.reloadSection('ticket.card.request.index');
+        const result = await page.waitToGetProperty(selectors.ticketRequests.thirdRequestQuantity, 'value');
+
+        expect(result).toEqual('99');
+    });
+
+    it(`should confirm first request can't be edited as its state is different to new`, async() => {
+        await page.waitForClassPresent(selectors.ticketRequests.firstRequestQuantity, 'disabled');
+        const result = await page.isDisabled(selectors.ticketRequests.firstRequestQuantity);
+
+        expect(result).toBe(true);
+    });
+
+    it(`should confirm second request can't be edited as its state is different to new`, async() => {
+        await page.waitForClassPresent(selectors.ticketRequests.secondRequestQuantity, 'disabled');
+        const result = await page.isDisabled(selectors.ticketRequests.secondRequestQuantity);
+
+        expect(result).toBe(true);
+    });
+
+    it('should delete the added request', async() => {
+        await page.waitToClick(selectors.ticketRequests.thirdRemoveRequestButton);
+        const result = await page.waitForLastSnackbar();
+
+        expect(result).toEqual('Data saved!');
+    });
+
+    it('should confirm the request was deleted', async() => {
         await page.reloadSection('ticket.card.request.index');
         await page.wait(selectors.ticketRequests.addRequestButton);
-        await page.waitForSelector(selectors.ticketRequests.request, {hidden: true});
+        await page.waitForSelector(selectors.ticketRequests.thirdDescription, {hidden: true});
     });
 });