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

2017-11-07 10:00:32 +01:00 · 2017-11-07 10:00:32 +01:00 · ed3ee81292
parent 7f3df756c8 5a81fabc65
commit ed3ee81292
6 changed files with 67 additions and 38 deletions
--- a/1
+++ b/1
@ -14,6 +14,7 @@ node
 {
    stage ('Checkout') {
        checkout scm
+    }

    stage ('install modules'){
        sh "npm install"
--- a/client/route/src/logistic-data/logistic-data.html
+++ b/client/route/src/logistic-data/logistic-data.html
@ -16,7 +16,6 @@
                </vn-horizontal>
                <vn-horizontal>
                        <vn-textfield vn-one label="Packages" model="$ctrl.route.packages"></vn-textfield>
-                        <vn-textfield vn-one label="Route document" model="$ctrl.route.document"></vn-textfield>
                        <vn-textfield vn-one label="M3" model="$ctrl.route.m3"></vn-textfield>
                        <vn-one></vn-one>
                </vn-horizontal>
--- a/e2e/helpers/selector_variables.js
+++ b/e2e/helpers/selector_variables.js
@ -0,0 +1,17 @@
+// eslint max-len: ["error", 500]
+// eslint key-spacing: ["error", 500]
+
+// delete me, this comment is to add a commit
+export default {
+    vnTextfield: 'vn-textfield > div > input',
+    vnSubmit: 'vn-submit > input',
+    vnTopbar: 'vn-topbar > header',
+    vnIcon: 'vn-icon',
+    vnMainMenu: 'vn-main-menu > div',
+    vnModuleContainer: 'vn-module-container > a',
+    vnSearchBar: 'vn-searchbar > form > vn-horizontal',
+    vnItemClient: 'vn-item-client',
+    vnFloatButton: 'vn-float-button > button',
+    vnMenuItem: 'vn-menu-item > li > a',
+    vnAutocomplete: 'vn-autocomplete'
+};
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@ -1,46 +1,57 @@
 // eslint max-len: ["error", 500]
 // eslint key-spacing: ["error", 500]
+import components from './selector_variables.js';
+console.log(`${checkElement(components.vnAutocomplete, '$ctrl.client.contactChannelFk')}`);
+function checkElement(selector, attributeValue) {
+    let aux = selector.split(' ');
+    if (aux[0] === 'vn-autocomplete') {
+        return selector.replace(aux[0], `${aux[0]}[field="${attributeValue}"]`);
+    }
+    if (aux[0] === 'vn-textfield') {
+        return selector.replace(aux[4], `${aux[4]}[name="${attributeValue}"]`);
+    }
+}
+
 export default {
    login: {
-        textFieldInput: 'vn-textfield > div > input',
-        submitButton: 'vn-submit > input[type="submit"]'
+        textFieldInput: `${components.vnTextfield}`,
+        submitButton: `${components.vnSubmit}`
    },
    globalItems: {
-        topBar: 'vn-topbar',
-        logOutButton: 'body > vn-app > vn-vertical > vn-topbar > header > vn-main-menu > div > vn-icon:nth-child(4)',
+        topBar: `${components.vnTopbar}`,
+        logOutButton: `${components.vnIcon}[icon="exit_to_app"]`,
        snackbarIsActive: '.mdl-snackbar--active > .mdl-snackbar__text',
-        applicationsMenuButton: '#apps > i',
-        applicationsMenuVisible: 'body > vn-app > vn-vertical > vn-topbar > header > vn-main-menu > div .is-visible > div',
-        clientsButton: 'body > vn-app > vn-vertical > vn-topbar > header > vn-main-menu > div > div > ul > li:nth-child(1)'
-
+        applicationsMenuButton: `${components.vnIcon}[icon="apps"]`,
+        applicationsMenuVisible: `${components.vnMainMenu} .is-visible > div`,
+        clientsButton: `${components.vnMainMenu} > div > ul > li:nth-child(1)`
    },
    moduleAccessView: {
-        clientsSectionButton: 'body > vn-app > vn-vertical > vn-vertical > vn-home > vn-vertical > vn-module-container > a:nth-child(1)'
+        clientsSectionButton: `${components.vnModuleContainer}[ui-sref="clients"]`
    },
    clientsIndex: {
-        searchClientInput: 'body > vn-app > vn-vertical > vn-vertical > vn-client-index > div > div > vn-card:nth-child(1) > div > vn-horizontal > vn-searchbar > form > vn-horizontal > vn-textfield > div > input',
-        searchButton: 'body > vn-app > vn-vertical > vn-vertical > vn-client-index > div > div > vn-card:nth-child(1) > div > vn-horizontal > vn-searchbar > form > vn-horizontal > vn-icon-button > button',
-        searchResult: 'body > vn-app > vn-vertical > vn-vertical > vn-client-index > div > div > vn-card:nth-child(2) > div > vn-item-client:nth-child(1) > a',
-        createClientButton: 'body > vn-app > vn-vertical > vn-vertical > vn-client-index > div > a > vn-float-button > button'
+        searchClientInput: `${components.vnTextfield}`,
+        searchButton: `${components.vnSearchBar} > vn-icon-button > button`,
+        searchResult: `${components.vnItemClient}:nth-child(1) > a`,
+        createClientButton: `${components.vnFloatButton}`
    },
    createClientView: {
-        name: 'body > vn-app > vn-vertical > vn-vertical > vn-client-create > form > div > vn-card > div > vn-vertical > vn-horizontal:nth-child(2) > vn-textfield:nth-child(1) > div > input',
-        taxNumber: 'body > vn-app > vn-vertical > vn-vertical > vn-client-create > form > div > vn-card > div > vn-vertical > vn-horizontal:nth-child(2) > vn-textfield:nth-child(2) > div > input',
-        businessName: 'body > vn-app > vn-vertical > vn-vertical > vn-client-create > form > div > vn-card > div > vn-vertical > vn-horizontal:nth-child(3) > vn-textfield:nth-child(1) > div > input',
-        userName: 'body > vn-app > vn-vertical > vn-vertical > vn-client-create > form > div > vn-card > div > vn-vertical > vn-horizontal:nth-child(3) > vn-textfield:nth-child(2) > div > input',
-        email: 'body > vn-app > vn-vertical > vn-vertical > vn-client-create > form > div > vn-card > div > vn-vertical > vn-horizontal:nth-child(4) > vn-textfield > div > input',
-        createButton: 'body > vn-app > vn-vertical > vn-vertical > vn-client-create > form > div > vn-button-bar > vn-button > button'
+        name: `${checkElement(components.vnTextfield, 'name')}`,
+        taxNumber: `${checkElement(components.vnTextfield, 'fi')}`,
+        socialName: `${checkElement(components.vnTextfield, 'socialName')}`,
+        userName: `${checkElement(components.vnTextfield, 'userName')}`,
+        email: `${checkElement(components.vnTextfield, 'email')}`,
+        createButton: `${components.vnSubmit}`
    },
    basicData: {
-        basicDataButton: 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-horizontal > vn-empty > vn-left-menu > vn-card > div > vn-vertical > vn-actions > vn-horizontal > ul > vn-menu-item:nth-child(1) > li > a',
-        nameInput: 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-horizontal > vn-auto > vn-vertical > vn-client-basic-data > form > vn-card > div > vn-vertical > vn-horizontal:nth-child(2) > vn-textfield:nth-child(1) > div > input',
-        taxNumberInput: 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-horizontal > vn-auto > vn-vertical > vn-client-basic-data > form > vn-card > div > vn-vertical > vn-horizontal:nth-child(2) > vn-textfield:nth-child(2) > div > input',
-        socialNameInput: 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-horizontal > vn-auto > vn-vertical > vn-client-basic-data > form > vn-card > div > vn-vertical > vn-horizontal:nth-child(2) > vn-textfield:nth-child(3) > div > input',
-        phoneInput: 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-horizontal > vn-auto > vn-vertical > vn-client-basic-data > form > vn-card > div > vn-vertical > vn-horizontal:nth-child(3) > vn-textfield:nth-child(1) > div > input',
-        mobileInput: 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-horizontal > vn-auto > vn-vertical > vn-client-basic-data > form > vn-card > div > vn-vertical > vn-horizontal:nth-child(3) > vn-textfield:nth-child(2) > div > input',
-        faxInput: 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-horizontal > vn-auto > vn-vertical > vn-client-basic-data > form > vn-card > div > vn-vertical > vn-horizontal:nth-child(3) > vn-textfield:nth-child(3) > div > input',
-        emailInput: 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-horizontal > vn-auto > vn-vertical > vn-client-basic-data > form > vn-card > div > vn-vertical > vn-horizontal:nth-child(4) > vn-textfield > div > input',
-        salesPersonInput: 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-horizontal > vn-auto > vn-vertical > vn-client-basic-data > form > vn-card > div > vn-vertical > vn-horizontal:nth-child(4) > vn-autocomplete:nth-child(2) > vn-vertical > vn-textfield > div > input',
+        basicDataButton: `${components.vnMenuItem}`,
+        nameInput: `${checkElement(components.vnTextfield, 'name')}`,
+        taxNumberInput: `${checkElement(components.vnTextfield, 'fi')}`,
+        socialNameInput: `${checkElement(components.vnTextfield, 'socialName')}`,
+        phoneInput: `${checkElement(components.vnTextfield, 'phone')}`,
+        mobileInput: `${checkElement(components.vnTextfield, 'mobile')}`,
+        faxInput: `${checkElement(components.vnTextfield, 'fax')}`,
+        emailInput: `${checkElement(components.vnTextfield, 'email')}`,
+        salesPersonInput: `${checkElement(components.vnAutocomplete, '$ctrl.client.salesPersonFk')}`,
        channelInput: 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-horizontal > vn-auto > vn-vertical > vn-client-basic-data > form > vn-card > div > vn-vertical > vn-horizontal:nth-child(4) > vn-autocomplete:nth-child(3) > vn-vertical > vn-textfield > div > input',
        channelMetropolisOption: 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-horizontal > vn-auto > vn-vertical > vn-client-basic-data > form > vn-card > div > vn-vertical > vn-horizontal:nth-child(4) > vn-autocomplete:nth-child(3) > vn-vertical > vn-drop-down > vn-vertical > vn-one:nth-child(2) > ul > li:nth-child(3)',
        saveButton: 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-horizontal > vn-auto > vn-vertical > vn-client-basic-data > form > vn-button-bar > vn-submit > input'
@ -48,9 +59,10 @@ export default {
    fiscalData: {
        fiscalDataButton: 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-horizontal > vn-empty > vn-left-menu > vn-card > div > vn-vertical > vn-actions > vn-horizontal > ul > vn-menu-item:nth-child(2) > li > a',
        addressInput: 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-horizontal > vn-auto > vn-vertical > vn-client-fiscal-data > form > vn-card > div > vn-vertical > vn-horizontal:nth-child(3) > vn-textfield:nth-child(1) > div > input',
-        hastToInvoiceCheckboxLabel: 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-horizontal > vn-auto > vn-vertical > vn-client-fiscal-data > form > vn-card > div > vn-vertical > vn-horizontal:nth-child(2) > vn-one:nth-child(1) > vn-check > label',
-        hastToInvoiceCheckboxInput: 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-horizontal > vn-auto > vn-vertical > vn-client-fiscal-data > form > vn-card > div > vn-vertical > vn-horizontal:nth-child(2) > vn-one:nth-child(1) > vn-check > label > input',
-        invoiceByMailCheckbox: 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-horizontal > vn-auto > vn-vertical > vn-client-fiscal-data > form > vn-card > div > vn-vertical > vn-horizontal:nth-child(2) > vn-check:nth-child(2) > label > span.mdl-checkbox__ripple-container.mdl-js-ripple-effect.mdl-ripple--center',
+        hasToInvoiceCheckboxLabel: 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-horizontal > vn-auto > vn-vertical > vn-client-fiscal-data > form > vn-card > div > vn-vertical > vn-horizontal:nth-child(2) > vn-one:nth-child(1) > vn-check > label',
+        hasToInvoiceCheckboxInput: 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-horizontal > vn-auto > vn-vertical > vn-client-fiscal-data > form > vn-card > div > vn-vertical > vn-horizontal:nth-child(2) > vn-one:nth-child(1) > vn-check > label > input',
+        // printToInvoiceCheckboxLabel: '',
+        // printInvoiceCheckboxInput: '',
        saveButton: 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-horizontal > vn-auto > vn-vertical > vn-client-fiscal-data > form > vn-button-bar > vn-submit > input'
    }
 };
--- a/e2e/paths/create_client_path.spec.js
+++ b/e2e/paths/create_client_path.spec.js
@ -114,7 +114,7 @@ describe('create client path', () => {
        nightmare
        .waitForSnackbarReset()
        .clearInput(selectors.createClientView.taxNumber)
-        .type(selectors.createClientView.businessName, 'Avengers team')
+        .type(selectors.createClientView.socialName, 'Avengers team')
        .click(selectors.createClientView.createButton)
        .wait(selectors.globalItems.snackbarIsActive)
        .getInnerText(selectors.globalItems.snackbarIsActive)
@ -128,7 +128,7 @@ describe('create client path', () => {
    it('should receive an error when clicking the create button having all the form fields empty but User Name', done => {
        nightmare
        .waitForSnackbarReset()
-        .clearInput(selectors.createClientView.businessName)
+        .clearInput(selectors.createClientView.socialName)
        .type(selectors.createClientView.userName, 'CaptainMarvel')
        .click(selectors.createClientView.createButton)
        .wait(selectors.globalItems.snackbarIsActive)
@ -177,7 +177,7 @@ describe('create client path', () => {
        .clearInput(selectors.createClientView.email)
        .type(selectors.createClientView.name, 'Carol Danvers')
        .type(selectors.createClientView.taxNumber, 'Avengers Tax Number')
-        .type(selectors.createClientView.businessName, 'AVG tax')
+        .type(selectors.createClientView.socialName, 'AVG tax')
        .type(selectors.createClientView.userName, 'CaptainMarvel')
        .type(selectors.createClientView.email, 'CarolDanvers@verdnatura.es')
        .click(selectors.createClientView.createButton)
--- a/e2e/paths/edit_fiscal_data.spec.js
+++ b/e2e/paths/edit_fiscal_data.spec.js
@ -75,7 +75,7 @@ describe('Edit fiscalData path', () => {

    it(`should uncheck the hasToInvoice checkbox`, done => {
        nightmare
-        .waitToClick(selectors.fiscalData.hastToInvoiceCheckboxLabel)
+        .waitToClick(selectors.fiscalData.hasToInvoiceCheckboxLabel)
        .waitToClick(selectors.fiscalData.saveButton)
        .wait(selectors.globalItems.snackbarIsActive)
        .getInnerText(selectors.globalItems.snackbarIsActive)
@ -92,10 +92,10 @@ describe('Edit fiscalData path', () => {
        .waitToClick(selectors.basicData.basicDataButton)
        .wait(selectors.basicData.nameInput)
        .waitToClick(selectors.fiscalData.fiscalDataButton)
-        .wait(selectors.fiscalData.hastToInvoiceCheckboxLabel)
+        .wait(selectors.fiscalData.hasToInvoiceCheckboxLabel)
        .evaluate(selector => {
            return document.querySelector(selector).checked;
-        }, selectors.fiscalData.hastToInvoiceCheckboxInput)
+        }, selectors.fiscalData.hasToInvoiceCheckboxInput)
        .then(value => {
            expect(value).toBeFalsy();
            done();