verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

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

This commit is contained in:
Juan Ferrer 2019-01-24 09:25:57 +01:00
parent 498ae5d4fe 79ee9bb0da
commit 1ccffd63a9
224 changed files with 2717 additions and 639 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,4 +3,5 @@ dist/*
npm-debug.log npm-debug.log
.eslintcache .eslintcache
datasources.*.json datasources.*.json
print.*.json
db.json db.json

3
Dockerfile
View File

@ -6,6 +6,7 @@ RUN apt-get update \
curl \ curl \
ca-certificates \ ca-certificates \
gnupg2 \ gnupg2 \
libfontconfig \
&& curl -sL https://deb.nodesource.com/setup_8.x | bash - \ && curl -sL https://deb.nodesource.com/setup_8.x | bash - \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
nodejs \ nodejs \
@ -18,12 +19,14 @@ RUN apt-get update \
WORKDIR /salix WORKDIR /salix
COPY package.json package-lock.json ./ COPY package.json package-lock.json ./
COPY loopback/package.json loopback/ COPY loopback/package.json loopback/
COPY print/package.json print/
RUN npm install --only=prod RUN npm install --only=prod
COPY loopback loopback COPY loopback loopback
COPY back back COPY back back
COPY modules modules COPY modules modules
COPY dist/webpack-assets.json dist/ COPY dist/webpack-assets.json dist/
COPY print print
COPY \ COPY \
modules.yml \ modules.yml \
LICENSE \ LICENSE \

3
Jenkinsfile vendored
View File

@ -2,6 +2,9 @@
pipeline { pipeline {
agent any agent any
options {
disableConcurrentBuilds()
}
environment { environment {
REGISTRY = 'registry.verdnatura.es' REGISTRY = 'registry.verdnatura.es'
DOCKER_HOST_1 = 'tcp://vch1.verdnatura.es:2376' DOCKER_HOST_1 = 'tcp://vch1.verdnatura.es:2376'

2
README.md
View File

@ -64,7 +64,7 @@ $ karma start
For server-side unit tests run from project's root. For server-side unit tests run from project's root.
``` ```
$ npm run test $ gulp backTest
``` ```
For end-to-end tests run from project's root. For end-to-end tests run from project's root.

2
back/methods/message/specs/send.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('message send()', () => { describe('message send()', () => {
it('should call the send method and return the response', async() => { it('should call the send method and return the response', async() => {

2
back/methods/user-config/specs/getUserConfig.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('userConfig getUserConfig()', () => { describe('userConfig getUserConfig()', () => {
it(`should return the configuration data of a given user`, async() => { it(`should return the configuration data of a given user`, async() => {

2
back/methods/worker-mana/specs/getCurrentWorkerMana.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('workerMana getCurrentWorkerMana()', () => { describe('workerMana getCurrentWorkerMana()', () => {
it('should get the mana of the logged worker', async() => { it('should get the mana of the logged worker', async() => {

2
back/models/specs/account.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('loopback model Account', () => { describe('loopback model Account', () => {
it('should return true if the user has the given role', async() => { it('should return true if the user has the given role', async() => {

2
back/tests.js
View File

@ -11,8 +11,6 @@ let verbose = false;
if (process.argv[2] === '--v') if (process.argv[2] === '--v')
verbose = true; verbose = true;
serviceRoot = `${__dirname}/../loopback`;
let Jasmine = require('jasmine'); let Jasmine = require('jasmine');
let jasmine = new Jasmine(); let jasmine = new Jasmine();
let SpecReporter = require('jasmine-spec-reporter').SpecReporter; let SpecReporter = require('jasmine-spec-reporter').SpecReporter;

1
docker-compose.yml
View File

@ -10,7 +10,6 @@ services:
- ${PORT}:80 - ${PORT}:80
links: links:
- api - api
- mailer
api: api:
image: registry.verdnatura.es/salix-api:${TAG} image: registry.verdnatura.es/salix-api:${TAG}
restart: unless-stopped restart: unless-stopped

31
e2e/helpers/extensions.js
View File

@ -3,6 +3,7 @@
import config from './config.js'; import config from './config.js';
import Nightmare from 'nightmare'; import Nightmare from 'nightmare';
import {URL} from 'url'; import {URL} from 'url';
let currentUser;
Nightmare.asyncAction = function(name, func) { Nightmare.asyncAction = function(name, func) {
@ -19,8 +20,7 @@ Nightmare.asyncAction('clearInput', async function(selector) {
for (let i = 0; i < 50; i += 1) for (let i = 0; i < 50; i += 1)
backSpaces.push('\u0008'); backSpaces.push('\u0008');
await this.wait(selector) await this.write(selector, backSpaces.join(''));
.type(selector, backSpaces.join(''));
}); });
let actions = { let actions = {
@ -32,7 +32,18 @@ let actions = {
.click(`vn-login input[type=submit]`) .click(`vn-login input[type=submit]`)
// FIXME: Wait for dom to be ready: https://github.com/segmentio/nightmare/issues/481 // FIXME: Wait for dom to be ready: https://github.com/segmentio/nightmare/issues/481
.wait(1000) .wait(1000)
.then(done) .then(() => {
currentUser = userName;
done();
})
.catch(done);
},
resetLogin: function(done) {
this.then(() => {
currentUser = undefined;
done();
})
.catch(done); .catch(done);
}, },
@ -55,7 +66,13 @@ let actions = {
}, },
waitForLogin: function(userName, done) { waitForLogin: function(userName, done) {
this.login(userName) if (currentUser === userName) {
return this.waitToClick('vn-topbar a[ui-sref="home"]')
.waitForURL('#!/')
.then(done)
.catch(done);
}
return this.login(userName)
.waitForURL('#!/') .waitForURL('#!/')
.url() .url()
.changeLanguageToEnglish() .changeLanguageToEnglish()
@ -284,9 +301,9 @@ let actions = {
}, },
accessToSearchResult: function(searchValue, done) { accessToSearchResult: function(searchValue, done) {
this.wait(`vn-searchbar input`) this.write(`vn-searchbar input`, searchValue)
.type(`vn-searchbar input`, searchValue)
.click(`vn-searchbar vn-icon[icon="search"]`) .click(`vn-searchbar vn-icon[icon="search"]`)
.waitForNumberOfElements('.searchResult', 1)
.evaluate(() => { .evaluate(() => {
return document.querySelector('ui-view vn-card vn-table') != null; return document.querySelector('ui-view vn-card vn-table') != null;
}) })
@ -320,7 +337,7 @@ let actions = {
autocompleteSearch: function(autocompleteSelector, searchValue, done) { autocompleteSearch: function(autocompleteSelector, searchValue, done) {
this.wait(autocompleteSelector) this.wait(autocompleteSelector)
.waitToClick(`${autocompleteSelector} input`) .waitToClick(`${autocompleteSelector} input`)
.type(`${autocompleteSelector} vn-drop-down input`, searchValue) .write(`${autocompleteSelector} vn-drop-down input`, searchValue)
.waitToClick(`${autocompleteSelector} li.active`) .waitToClick(`${autocompleteSelector} li.active`)
.wait((autocompleteSelector, searchValue) => { .wait((autocompleteSelector, searchValue) => {
return document.querySelector(`${autocompleteSelector} input`).value.toLowerCase().includes(searchValue.toLowerCase()); return document.querySelector(`${autocompleteSelector} input`).value.toLowerCase().includes(searchValue.toLowerCase());

13
e2e/helpers/nightmare.js
View File

@ -1,8 +1,12 @@
/* eslint no-console: 0 */ /* eslint no-console: 0 */
import Nightmare from 'nightmare'; import Nightmare from 'nightmare';
let nightmare;
export default function createNightmare(width = 1280, height = 720) { export default function createNightmare(width = 1280, height = 720) {
const nightmare = new Nightmare({ if (nightmare)
return nightmare;
nightmare = new Nightmare({
show: process.env.E2E_SHOW, show: process.env.E2E_SHOW,
typeInterval: 10, typeInterval: 10,
x: 0, x: 0,
@ -12,18 +16,13 @@ export default function createNightmare(width = 1280, height = 720) {
nightmare.on('console', (type, message, ...args) => { nightmare.on('console', (type, message, ...args) => {
if (type === 'error') if (type === 'error')
fail(message); throw new Error(message);
else else
console[type](message, ...args); console[type](message, ...args);
}); });
nightmare.header('Accept-Language', 'en'); nightmare.header('Accept-Language', 'en');
afterAll(() => {
return nightmare
.end();
});
return nightmare; return nightmare;
} }

28
e2e/helpers/selectors.js
View File

@ -115,7 +115,8 @@ export default {
secondObservationDescriptionInput: `vn-client-address-edit [name=observations] :nth-child(2) [model="observation.description"] input`, secondObservationDescriptionInput: `vn-client-address-edit [name=observations] :nth-child(2) [model="observation.description"] input`,
addObservationButton: `vn-client-address-edit vn-icon-button[icon="add_circle"]`, addObservationButton: `vn-client-address-edit vn-icon-button[icon="add_circle"]`,
saveButton: `${components.vnSubmit}`, saveButton: `${components.vnSubmit}`,
cancelButton: `button[ui-sref="client.card.address.index"]` cancelCreateAddressButton: `button[ui-sref="client.card.address.index"]`,
cancelEditAddressButton: 'vn-client-address-edit > form > vn-button-bar > vn-button > button'
}, },
clientWebAccess: { clientWebAccess: {
webAccessButton: `vn-left-menu a[ui-sref="client.card.webAccess"]`, webAccessButton: `vn-left-menu a[ui-sref="client.card.webAccess"]`,
@ -192,7 +193,7 @@ export default {
moreMenu: `vn-item-descriptor vn-icon-menu > div > vn-icon`, moreMenu: `vn-item-descriptor vn-icon-menu > div > vn-icon`,
moreMenuRegularizeButton: `vn-item-descriptor vn-icon-menu > div > vn-drop-down > vn-popover ul > li:nth-child(1)`, moreMenuRegularizeButton: `vn-item-descriptor vn-icon-menu > div > vn-drop-down > vn-popover ul > li:nth-child(1)`,
regularizeQuantityInput: `vn-item-descriptor > vn-dialog > div > form > div.body > tpl-body > div > vn-textfield > div > div > div.infix > input`, regularizeQuantityInput: `vn-item-descriptor > vn-dialog > div > form > div.body > tpl-body > div > vn-textfield > div > div > div.infix > input`,
regularizeWarehouseAutocomplete: `#warehouse`, regularizeWarehouseAutocomplete: 'vn-item-descriptor > vn-dialog vn-autocomplete[field="$ctrl.warehouseFk"]',
regularizeSaveButton: `vn-item-descriptor > vn-dialog > div > form > div.buttons > tpl-buttons > button` regularizeSaveButton: `vn-item-descriptor > vn-dialog > div > form > div.buttons > tpl-buttons > button`
}, },
itemBasicData: { itemBasicData: {
@ -385,8 +386,9 @@ export default {
ticketTracking: { ticketTracking: {
trackingButton: `vn-left-menu a[ui-sref="ticket.card.tracking.index"]`, trackingButton: `vn-left-menu a[ui-sref="ticket.card.tracking.index"]`,
createStateButton: `${components.vnFloatButton}`, createStateButton: `${components.vnFloatButton}`,
stateAutocomplete: 'vn-ticket-tracking-edit vn-autocomplete[field="$ctrl.ticket.stateFk"]', stateAutocomplete: 'vn-ticket-tracking-edit vn-autocomplete[field="$ctrl.stateFk"]',
saveButton: `${components.vnSubmit}` saveButton: `${components.vnSubmit}`,
cancelButton: `vn-ticket-tracking-edit vn-button[ui-sref="ticket.card.tracking.index"]`
}, },
ticketBasicData: { ticketBasicData: {
basicDataButton: `vn-left-menu a[ui-sref="ticket.card.data.stepOne"]`, basicDataButton: `vn-left-menu a[ui-sref="ticket.card.data.stepOne"]`,
@ -437,8 +439,9 @@ export default {
saveServiceButton: `${components.vnSubmit}` saveServiceButton: `${components.vnSubmit}`
}, },
createStateView: { createStateView: {
stateAutocomplete: `vn-autocomplete[field="$ctrl.ticket.stateFk"]`, stateAutocomplete: `vn-autocomplete[field="$ctrl.stateFk"]`,
clearStateInputButton: `vn-autocomplete[field="$ctrl.ticket.stateFk"] > div > div > div > vn-icon > i`, workerAutocomplete: `vn-autocomplete[field="$ctrl.workerFk"]`,
clearStateInputButton: `vn-autocomplete[field="$ctrl.stateFk"] > div > div > div > vn-icon > i`,
saveStateButton: `${components.vnSubmit}` saveStateButton: `${components.vnSubmit}`
}, },
claimsIndex: { claimsIndex: {
@ -449,14 +452,19 @@ export default {
claimBasicData: { claimBasicData: {
basicDataButton: `vn-left-menu a[ui-sref="claim.card.basicData"]`, basicDataButton: `vn-left-menu a[ui-sref="claim.card.basicData"]`,
claimStateAutocomplete: 'vn-claim-basic-data vn-autocomplete[field="$ctrl.claim.claimStateFk"]', claimStateAutocomplete: 'vn-claim-basic-data vn-autocomplete[field="$ctrl.claim.claimStateFk"]',
isPaidWithManaCheckbox: `vn-check[field="$ctrl.claim.isChargedToMana"] > label > input`, isPaidWithManaCheckbox: 'vn-check[field="$ctrl.claim.isChargedToMana"] > label > input',
responsabilityInputRange: `vn-input-range`, responsabilityInputRange: `vn-input-range`,
observationInput: `vn-textarea[label="Observation"] textarea`, observationInput: `vn-textarea[label="Observation"] textarea`,
saveButton: `${components.vnSubmit}` saveButton: `${components.vnSubmit}`
}, },
claimDetails: { claimDetail: {
detailsButton: `vn-left-menu a[ui-sref="claim.card.detail"]`, detailButton: `vn-left-menu a[ui-sref="claim.card.detail"]`,
addItemButton: `vn-claim-detail a vn-float-button` addItemButton: `vn-claim-detail a vn-float-button`,
firstClaimableSaleFromTicket: 'vn-claim-detail > vn-dialog vn-tbody > vn-tr',
claimDetailLine: 'vn-claim-detail > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr',
secondItemQuantityInput: 'vn-claim-detail vn-tr:nth-child(2) vn-textfield[model="saleClaimed.quantity"] input',
totalClaimed: 'vn-claim-detail > vn-vertical > vn-card > div > vn-vertical > vn-horizontal > div > vn-label-value:nth-child(2) > section > span',
secondItemDeleteButton: 'vn-claim-detail > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr:nth-child(2) > vn-td:nth-child(9) > vn-icon-button > button > vn-icon > i'
}, },
claimDevelopment: { claimDevelopment: {
developmentButton: 'vn-left-menu a[ui-sref="claim.card.development"]', developmentButton: 'vn-left-menu a[ui-sref="claim.card.development"]',

14
e2e/paths/claim-module/01_edit_basic_data.spec.js
View File

@ -16,8 +16,8 @@ describe('Claim edit basic data path', () => {
.autocompleteSearch(selectors.claimBasicData.claimStateAutocomplete, 'Gestionado') .autocompleteSearch(selectors.claimBasicData.claimStateAutocomplete, 'Gestionado')
.waitToClick(selectors.claimBasicData.isPaidWithManaCheckbox) .waitToClick(selectors.claimBasicData.isPaidWithManaCheckbox)
.clearInput(selectors.claimBasicData.observationInput) .clearInput(selectors.claimBasicData.observationInput)
.type(selectors.claimBasicData.observationInput, 'edited observation') .write(selectors.claimBasicData.observationInput, 'edited observation')
.click(selectors.claimBasicData.saveButton) .waitToClick(selectors.claimBasicData.saveButton)
.waitForSnackbar(); .waitForSnackbar();
expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); expect(result).toEqual(jasmine.arrayContaining(['Data saved!']));
@ -25,9 +25,9 @@ describe('Claim edit basic data path', () => {
it('should confirm the claim state was edited', async() => { it('should confirm the claim state was edited', async() => {
const result = await nightmare const result = await nightmare
.click(selectors.claimDetails.detailsButton) .waitToClick(selectors.claimDetail.detailButton)
.wait(selectors.claimDetails.addItemButton) .wait(selectors.claimDetail.addItemButton)
.click(selectors.claimBasicData.basicDataButton) .waitToClick(selectors.claimBasicData.basicDataButton)
.wait(selectors.claimBasicData.claimStateAutocomplete) .wait(selectors.claimBasicData.claimStateAutocomplete)
.waitToGetProperty(`${selectors.claimBasicData.claimStateAutocomplete} input`, 'value'); .waitToGetProperty(`${selectors.claimBasicData.claimStateAutocomplete} input`, 'value');
@ -55,8 +55,8 @@ describe('Claim edit basic data path', () => {
.autocompleteSearch(selectors.claimBasicData.claimStateAutocomplete, 'Pendiente') .autocompleteSearch(selectors.claimBasicData.claimStateAutocomplete, 'Pendiente')
.waitToClick(selectors.claimBasicData.isPaidWithManaCheckbox) .waitToClick(selectors.claimBasicData.isPaidWithManaCheckbox)
.clearInput(selectors.claimBasicData.observationInput) .clearInput(selectors.claimBasicData.observationInput)
.type(selectors.claimBasicData.observationInput, 'Observation one') .write(selectors.claimBasicData.observationInput, 'Observation one')
.click(selectors.claimBasicData.saveButton) .waitToClick(selectors.claimBasicData.saveButton)
.waitForSnackbar(); .waitForSnackbar();
expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); expect(result).toEqual(jasmine.arrayContaining(['Data saved!']));

2
e2e/paths/claim-module/02_create_development.spec.js
View File

@ -43,7 +43,7 @@ describe('Claim development', () => {
const reason = await nightmare const reason = await nightmare
.waitToClick(selectors.claimBasicData.basicDataButton) .waitToClick(selectors.claimBasicData.basicDataButton)
.wait(selectors.claimBasicData.claimStateAutocomplete) .wait(selectors.claimBasicData.claimStateAutocomplete)
.click(selectors.claimDevelopment.developmentButton) .waitToClick(selectors.claimDevelopment.developmentButton)
.waitToGetProperty(`${selectors.claimDevelopment.firstClaimReasonAutocomplete} input`, 'value'); .waitToGetProperty(`${selectors.claimDevelopment.firstClaimReasonAutocomplete} input`, 'value');
const result = await nightmare const result = await nightmare

64
e2e/paths/claim-module/03_detail.spec.js Normal file
View File

@ -0,0 +1,64 @@
import selectors from '../../helpers/selectors.js';
import createNightmare from '../../helpers/nightmare';
describe('Claim detail', () => {
const nightmare = createNightmare();
beforeAll(() => {
nightmare
.loginAndModule('salesPerson', 'claim')
.accessToSearchResult('4')
.accessToSection('claim.card.detail');
});
it('should add the first claimable item from ticket to the claim', async() => {
const result = await nightmare
.waitToClick(selectors.claimDetail.addItemButton)
.waitToClick(selectors.claimDetail.firstClaimableSaleFromTicket)
.waitForLastSnackbar();
expect(result).toEqual('Data saved!');
});
it('should confirm the claim contains now two items', async() => {
const result = await nightmare
.countElement(selectors.claimDetail.claimDetailLine);
expect(result).toEqual(2);
});
it('should edit de second item claimed quantity', async() => {
const result = await nightmare
.write(selectors.claimDetail.secondItemQuantityInput, 10)
.write('body', '\u000d') // simulates enter
.waitForLastSnackbar();
expect(result).toEqual('Data saved!');
});
it('should confirm the second item, and the claimed total were correctly edited', async() => {
const claimedQuantity = await nightmare
.waitToGetProperty(selectors.claimDetail.secondItemQuantityInput, 'value');
const totalClaimed = await nightmare
.waitToGetProperty(selectors.claimDetail.totalClaimed, 'innerText');
expect(claimedQuantity).toEqual('10');
expect(totalClaimed).toEqual('29.50 €');
});
it('should delete the second item from the claim', async() => {
const result = await nightmare
.waitToClick(selectors.claimDetail.secondItemDeleteButton)
.waitForLastSnackbar();
expect(result).toEqual('Data saved!');
});
it('should confirm the claim contains now one item', async() => {
const result = await nightmare
.countElement(selectors.claimDetail.claimDetailLine);
expect(result).toEqual(1);
});
});

34
e2e/paths/client-module/01_create_client.spec.js
View File

@ -11,9 +11,8 @@ describe('Client create path', () => {
it(`should search for the user Carol Danvers to confirm it isn't created yet`, async() => { it(`should search for the user Carol Danvers to confirm it isn't created yet`, async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.clientsIndex.searchClientInput) .write(selectors.clientsIndex.searchClientInput, 'Carol Danvers')
.type(selectors.clientsIndex.searchClientInput, 'Carol Danvers') .waitToClick(selectors.clientsIndex.searchButton)
.click(selectors.clientsIndex.searchButton)
.waitForNumberOfElements(selectors.clientsIndex.searchResult, 0) .waitForNumberOfElements(selectors.clientsIndex.searchResult, 0)
.countElement(selectors.clientsIndex.searchResult); .countElement(selectors.clientsIndex.searchResult);
@ -22,7 +21,7 @@ describe('Client create path', () => {
it('should now access to the create client view by clicking the create-client floating button', async() => { it('should now access to the create client view by clicking the create-client floating button', async() => {
const url = await nightmare const url = await nightmare
.click(selectors.clientsIndex.createClientButton) .waitToClick(selectors.clientsIndex.createClientButton)
.wait(selectors.createClientView.createButton) .wait(selectors.createClientView.createButton)
.parsedUrl(); .parsedUrl();
@ -31,7 +30,7 @@ describe('Client create path', () => {
it('should receive an error when clicking the create button having all the form fields empty', async() => { it('should receive an error when clicking the create button having all the form fields empty', async() => {
const result = await nightmare const result = await nightmare
.click(selectors.createClientView.createButton) .waitToClick(selectors.createClientView.createButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Some fields are invalid'); expect(result).toEqual('Some fields are invalid');
@ -39,11 +38,11 @@ describe('Client create path', () => {
it('should receive an error when clicking the create button having name and Business name fields empty', async() => { it('should receive an error when clicking the create button having name and Business name fields empty', async() => {
const result = await nightmare const result = await nightmare
.type(selectors.createClientView.taxNumber, '74451390E') .write(selectors.createClientView.taxNumber, '74451390E')
.type(selectors.createClientView.userName, 'CaptainMarvel') .write(selectors.createClientView.userName, 'CaptainMarvel')
.type(selectors.createClientView.email, 'CarolDanvers@verdnatura.es') .write(selectors.createClientView.email, 'CarolDanvers@verdnatura.es')
.autocompleteSearch(selectors.createClientView.salesPersonAutocomplete, 'Accessory') .autocompleteSearch(selectors.createClientView.salesPersonAutocomplete, 'Accessory')
.click(selectors.createClientView.createButton) .waitToClick(selectors.createClientView.createButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Some fields are invalid'); expect(result).toEqual('Some fields are invalid');
@ -51,11 +50,11 @@ describe('Client create path', () => {
it(`should attempt to create a new user with all it's data but wrong email`, async() => { it(`should attempt to create a new user with all it's data but wrong email`, async() => {
const result = await nightmare const result = await nightmare
.type(selectors.createClientView.name, 'Carol Danvers') .write(selectors.createClientView.name, 'Carol Danvers')
.type(selectors.createClientView.socialName, 'AVG tax') .write(selectors.createClientView.socialName, 'AVG tax')
.clearInput(selectors.createClientView.email) .clearInput(selectors.createClientView.email)
.type(selectors.createClientView.email, 'incorrect email format') .write(selectors.createClientView.email, 'incorrect email format')
.click(selectors.createClientView.createButton) .waitToClick(selectors.createClientView.createButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Some fields are invalid'); expect(result).toEqual('Some fields are invalid');
@ -64,8 +63,8 @@ describe('Client create path', () => {
it(`should create a new user with all correct data`, async() => { it(`should create a new user with all correct data`, async() => {
const result = await nightmare const result = await nightmare
.clearInput(selectors.createClientView.email) .clearInput(selectors.createClientView.email)
.type(selectors.createClientView.email, 'caroldanvers@verdnatura.es') .write(selectors.createClientView.email, 'caroldanvers@verdnatura.es')
.click(selectors.createClientView.createButton) .waitToClick(selectors.createClientView.createButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');
@ -84,9 +83,8 @@ describe('Client create path', () => {
it(`should search for the user Carol Danvers to confirm it exists`, async() => { it(`should search for the user Carol Danvers to confirm it exists`, async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.clientsIndex.searchClientInput) .write(selectors.clientsIndex.searchClientInput, 'Carol Danvers')
.type(selectors.clientsIndex.searchClientInput, 'Carol Danvers') .waitToClick(selectors.clientsIndex.searchButton)
.click(selectors.clientsIndex.searchButton)
.waitForNumberOfElements(selectors.clientsIndex.searchResult, 1) .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1)
.countElement(selectors.clientsIndex.searchResult); .countElement(selectors.clientsIndex.searchResult);

32
e2e/paths/client-module/02_edit_basic_data.spec.js
View File

@ -24,17 +24,17 @@ describe('Client Edit basicData path', () => {
it('should edit the client basic data but leave salesPerson untainted', async() => { it('should edit the client basic data but leave salesPerson untainted', async() => {
const result = await nightmare const result = await nightmare
.clearInput(selectors.clientBasicData.nameInput) .clearInput(selectors.clientBasicData.nameInput)
.type(selectors.clientBasicData.nameInput, 'Ptonomy Wallace') .write(selectors.clientBasicData.nameInput, 'Ptonomy Wallace')
.clearInput(selectors.clientBasicData.contactInput) .clearInput(selectors.clientBasicData.contactInput)
.type(selectors.clientBasicData.contactInput, 'David Haller') .write(selectors.clientBasicData.contactInput, 'David Haller')
.clearInput(selectors.clientBasicData.phoneInput) .clearInput(selectors.clientBasicData.phoneInput)
.type(selectors.clientBasicData.phoneInput, '987654321') .write(selectors.clientBasicData.phoneInput, '987654321')
.clearInput(selectors.clientBasicData.mobileInput) .clearInput(selectors.clientBasicData.mobileInput)
.type(selectors.clientBasicData.mobileInput, '123456789') .write(selectors.clientBasicData.mobileInput, '123456789')
.clearInput(selectors.clientBasicData.emailInput) .clearInput(selectors.clientBasicData.emailInput)
.type(selectors.clientBasicData.emailInput, 'PWallace@verdnatura.es') .write(selectors.clientBasicData.emailInput, 'PWallace@verdnatura.es')
.autocompleteSearch(selectors.clientBasicData.channelAutocomplete, 'Rumors on the streets') .autocompleteSearch(selectors.clientBasicData.channelAutocomplete, 'Rumors on the streets')
.click(selectors.clientBasicData.saveButton) .waitToClick(selectors.clientBasicData.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');
@ -42,9 +42,9 @@ describe('Client Edit basicData path', () => {
it('should confirm the name have been edited', async() => { it('should confirm the name have been edited', async() => {
const result = await nightmare const result = await nightmare
.click(selectors.clientFiscalData.fiscalDataButton) .waitToClick(selectors.clientFiscalData.fiscalDataButton)
.wait(selectors.clientFiscalData.addressInput) .wait(selectors.clientFiscalData.addressInput)
.click(selectors.clientBasicData.basicDataButton) .waitToClick(selectors.clientBasicData.basicDataButton)
.waitToGetProperty(selectors.clientBasicData.nameInput, 'value'); .waitToGetProperty(selectors.clientBasicData.nameInput, 'value');
expect(result).toEqual('Ptonomy Wallace'); expect(result).toEqual('Ptonomy Wallace');
@ -108,18 +108,18 @@ describe('Client Edit basicData path', () => {
it('should edit the client basic data including salesPerson', async() => { it('should edit the client basic data including salesPerson', async() => {
const result = await nightmare const result = await nightmare
.clearInput(selectors.clientBasicData.nameInput) .clearInput(selectors.clientBasicData.nameInput)
.type(selectors.clientBasicData.nameInput, 'Ororo Munroe') .write(selectors.clientBasicData.nameInput, 'Ororo Munroe')
.clearInput(selectors.clientBasicData.contactInput) .clearInput(selectors.clientBasicData.contactInput)
.type(selectors.clientBasicData.contactInput, 'Black Panther') .write(selectors.clientBasicData.contactInput, 'Black Panther')
.clearInput(selectors.clientBasicData.phoneInput) .clearInput(selectors.clientBasicData.phoneInput)
.type(selectors.clientBasicData.phoneInput, '123456789') .write(selectors.clientBasicData.phoneInput, '123456789')
.clearInput(selectors.clientBasicData.mobileInput) .clearInput(selectors.clientBasicData.mobileInput)
.type(selectors.clientBasicData.mobileInput, '987654321') .write(selectors.clientBasicData.mobileInput, '987654321')
.clearInput(selectors.clientBasicData.emailInput) .clearInput(selectors.clientBasicData.emailInput)
.type(selectors.clientBasicData.emailInput, 'Storm@verdnatura.es') .write(selectors.clientBasicData.emailInput, 'Storm@verdnatura.es')
.autocompleteSearch(selectors.clientBasicData.salesPersonAutocomplete, 'Accessory') .autocompleteSearch(selectors.clientBasicData.salesPersonAutocomplete, 'Accessory')
.autocompleteSearch(selectors.clientBasicData.channelAutocomplete, 'Metropolis newspaper') .autocompleteSearch(selectors.clientBasicData.channelAutocomplete, 'Metropolis newspaper')
.click(selectors.clientBasicData.saveButton) .waitToClick(selectors.clientBasicData.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');
@ -127,9 +127,9 @@ describe('Client Edit basicData path', () => {
it('should now confirm the name have been edited', async() => { it('should now confirm the name have been edited', async() => {
const result = await nightmare const result = await nightmare
.click(selectors.clientFiscalData.fiscalDataButton) .waitToClick(selectors.clientFiscalData.fiscalDataButton)
.wait(selectors.clientFiscalData.addressInput) .wait(selectors.clientFiscalData.addressInput)
.click(selectors.clientBasicData.basicDataButton) .waitToClick(selectors.clientBasicData.basicDataButton)
.waitToGetProperty(selectors.clientBasicData.nameInput, 'value'); .waitToGetProperty(selectors.clientBasicData.nameInput, 'value');
expect(result).toEqual('Ororo Munroe'); expect(result).toEqual('Ororo Munroe');

16
e2e/paths/client-module/03_edit_fiscal_data.spec.js
View File

@ -67,15 +67,15 @@ describe('Client Edit fiscalData path', () => {
const result = await nightmare const result = await nightmare
.wait(selectors.clientFiscalData.socialNameInput) .wait(selectors.clientFiscalData.socialNameInput)
.clearInput(selectors.clientFiscalData.socialNameInput) .clearInput(selectors.clientFiscalData.socialNameInput)
.type(selectors.clientFiscalData.socialNameInput, 'SMASH!') .write(selectors.clientFiscalData.socialNameInput, 'SMASH!')
.clearInput(selectors.clientFiscalData.fiscalIdInput) .clearInput(selectors.clientFiscalData.fiscalIdInput)
.type(selectors.clientFiscalData.fiscalIdInput, '94980061C') .write(selectors.clientFiscalData.fiscalIdInput, '94980061C')
.clearInput(selectors.clientFiscalData.addressInput) .clearInput(selectors.clientFiscalData.addressInput)
.type(selectors.clientFiscalData.addressInput, 'Somewhere edited') .write(selectors.clientFiscalData.addressInput, 'Somewhere edited')
.clearInput(selectors.clientFiscalData.postcodeInput) .clearInput(selectors.clientFiscalData.postcodeInput)
.type(selectors.clientFiscalData.postcodeInput, '12345') .write(selectors.clientFiscalData.postcodeInput, '12345')
.clearInput(selectors.clientFiscalData.cityInput) .clearInput(selectors.clientFiscalData.cityInput)
.type(selectors.clientFiscalData.cityInput, 'N/A') .write(selectors.clientFiscalData.cityInput, 'N/A')
.autocompleteSearch(selectors.clientFiscalData.countryAutocomplete, 'Francia') .autocompleteSearch(selectors.clientFiscalData.countryAutocomplete, 'Francia')
.autocompleteSearch(selectors.clientFiscalData.provinceAutocomplete, 'Province two') .autocompleteSearch(selectors.clientFiscalData.provinceAutocomplete, 'Province two')
.waitToClick(selectors.clientFiscalData.activeCheckboxLabel) .waitToClick(selectors.clientFiscalData.activeCheckboxLabel)
@ -96,7 +96,7 @@ describe('Client Edit fiscalData path', () => {
const result = await nightmare const result = await nightmare
.waitToClick(selectors.clientFiscalData.viesCheckboxInput) .waitToClick(selectors.clientFiscalData.viesCheckboxInput)
.clearInput(selectors.clientFiscalData.fiscalIdInput) .clearInput(selectors.clientFiscalData.fiscalIdInput)
.type(selectors.clientFiscalData.fiscalIdInput, 'A94980061C') .write(selectors.clientFiscalData.fiscalIdInput, 'A94980061C')
.waitToClick(selectors.clientFiscalData.saveButton) .waitToClick(selectors.clientFiscalData.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
@ -106,7 +106,7 @@ describe('Client Edit fiscalData path', () => {
it('should finally edit the fixcal data correctly as VIES isnt checked and fiscal id is valid for EQtax', async() => { it('should finally edit the fixcal data correctly as VIES isnt checked and fiscal id is valid for EQtax', async() => {
const result = await nightmare const result = await nightmare
.clearInput(selectors.clientFiscalData.fiscalIdInput) .clearInput(selectors.clientFiscalData.fiscalIdInput)
.type(selectors.clientFiscalData.fiscalIdInput, '94980061C') .write(selectors.clientFiscalData.fiscalIdInput, '94980061C')
.waitToClick(selectors.clientFiscalData.saveButton) .waitToClick(selectors.clientFiscalData.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
@ -312,7 +312,7 @@ describe('Client Edit fiscalData path', () => {
const result = await nightmare const result = await nightmare
.waitToClick(selectors.clientAddresses.firstEditButton) .waitToClick(selectors.clientAddresses.firstEditButton)
.waitToClick(selectors.clientAddresses.equalizationTaxCheckboxLabel) .waitToClick(selectors.clientAddresses.equalizationTaxCheckboxLabel)
.click(selectors.clientAddresses.saveButton) .waitToClick(selectors.clientAddresses.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');

14
e2e/paths/client-module/04_edit_pay_method.spec.js
View File

@ -16,7 +16,7 @@ describe('Client Edit pay method path', () => {
.autocompleteSearch(selectors.clientPayMethod.payMethodAutocomplete, 'PayMethod with IBAN') .autocompleteSearch(selectors.clientPayMethod.payMethodAutocomplete, 'PayMethod with IBAN')
.autocompleteSearch(selectors.clientPayMethod.swiftBicAutocomplete, 'BBKKESMMMMM') .autocompleteSearch(selectors.clientPayMethod.swiftBicAutocomplete, 'BBKKESMMMMM')
.clearInput(selectors.clientPayMethod.dueDayInput) .clearInput(selectors.clientPayMethod.dueDayInput)
.type(selectors.clientPayMethod.dueDayInput, '60') .write(selectors.clientPayMethod.dueDayInput, '60')
.waitForTextInInput(selectors.clientPayMethod.dueDayInput, '60') .waitForTextInInput(selectors.clientPayMethod.dueDayInput, '60')
.waitToClick(selectors.clientPayMethod.receivedCoreLCRCheckbox) .waitToClick(selectors.clientPayMethod.receivedCoreLCRCheckbox)
.waitToClick(selectors.clientPayMethod.receivedCoreVNLCheckbox) .waitToClick(selectors.clientPayMethod.receivedCoreVNLCheckbox)
@ -31,7 +31,7 @@ describe('Client Edit pay method path', () => {
const snackbarMessage = await nightmare const snackbarMessage = await nightmare
.waitToClick(selectors.clientPayMethod.clearswiftBicButton) .waitToClick(selectors.clientPayMethod.clearswiftBicButton)
.clearInput(selectors.clientPayMethod.IBANInput) .clearInput(selectors.clientPayMethod.IBANInput)
.type(selectors.clientPayMethod.IBANInput, 'FR9121000418450200051332') .write(selectors.clientPayMethod.IBANInput, 'FR9121000418450200051332')
.waitForTextInInput(selectors.clientPayMethod.IBANInput, 'FR9121000418450200051332') .waitForTextInInput(selectors.clientPayMethod.IBANInput, 'FR9121000418450200051332')
.wait(1000) .wait(1000)
.waitToClick(selectors.clientPayMethod.saveButton) .waitToClick(selectors.clientPayMethod.saveButton)
@ -42,10 +42,10 @@ describe('Client Edit pay method path', () => {
it(`should create a new BIC code`, async() => { it(`should create a new BIC code`, async() => {
const newcode = await nightmare const newcode = await nightmare
.click(selectors.clientPayMethod.newBankEntityButton) .waitToClick(selectors.clientPayMethod.newBankEntityButton)
.type(selectors.clientPayMethod.newBankEntityName, 'Gotham City Bank') .write(selectors.clientPayMethod.newBankEntityName, 'Gotham City Bank')
.type(selectors.clientPayMethod.newBankEntityBIC, 'GTHMCT') .write(selectors.clientPayMethod.newBankEntityBIC, 'GTHMCT')
.click(selectors.clientPayMethod.acceptBankEntityButton) .waitToClick(selectors.clientPayMethod.acceptBankEntityButton)
.waitToGetProperty(`${selectors.clientPayMethod.swiftBicAutocomplete} input`, 'value'); .waitToGetProperty(`${selectors.clientPayMethod.swiftBicAutocomplete} input`, 'value');
expect(newcode).toEqual('GTHMCT Gotham City Bank'); expect(newcode).toEqual('GTHMCT Gotham City Bank');
@ -62,7 +62,7 @@ describe('Client Edit pay method path', () => {
const AutomaticCode = await nightmare const AutomaticCode = await nightmare
.clearInput(selectors.clientPayMethod.IBANInput) .clearInput(selectors.clientPayMethod.IBANInput)
.waitToClick(selectors.clientPayMethod.clearswiftBicButton) .waitToClick(selectors.clientPayMethod.clearswiftBicButton)
.type(selectors.clientPayMethod.IBANInput, 'ES9121000418450200051332') .write(selectors.clientPayMethod.IBANInput, 'ES9121000418450200051332')
.waitToGetProperty(`${selectors.clientPayMethod.swiftBicAutocomplete} input`, 'value'); .waitToGetProperty(`${selectors.clientPayMethod.swiftBicAutocomplete} input`, 'value');
expect(AutomaticCode).toEqual('CAIXESBB Caixa Bank'); expect(AutomaticCode).toEqual('CAIXESBB Caixa Bank');

43
e2e/paths/client-module/05_add_address.spec.js
View File

@ -20,33 +20,15 @@ describe('Client Add address path', () => {
expect(url.hash).toContain('address/create'); expect(url.hash).toContain('address/create');
}); });
it(`should return to the addreses section by clicking the cancel button`, async() => {
const url = await nightmare
.waitToClick(selectors.clientAddresses.cancelButton)
.waitForURL('address/index')
.parsedUrl();
expect(url.hash).toContain('address/index');
});
it(`should now click on the add new address button to access to the new address form`, async() => {
const url = await nightmare
.waitToClick(selectors.clientAddresses.createAddress)
.waitForURL('address/create')
.parsedUrl();
expect(url.hash).toContain('address/create');
});
it('should receive an error after clicking save button as consignee, street and town fields are empty', async() => { it('should receive an error after clicking save button as consignee, street and town fields are empty', async() => {
const result = await nightmare const result = await nightmare
.waitToClick(selectors.clientAddresses.defaultCheckboxInput) .waitToClick(selectors.clientAddresses.defaultCheckboxInput)
.clearInput(selectors.clientAddresses.streetAddressInput) .clearInput(selectors.clientAddresses.streetAddressInput)
.type(selectors.clientAddresses.postcodeInput, '10022') .write(selectors.clientAddresses.postcodeInput, '10022')
.autocompleteSearch(selectors.clientAddresses.provinceAutocomplete, 'Province four') .autocompleteSearch(selectors.clientAddresses.provinceAutocomplete, 'Province four')
.autocompleteSearch(selectors.clientAddresses.agencyAutocomplete, 'Entanglement') .autocompleteSearch(selectors.clientAddresses.agencyAutocomplete, 'Entanglement')
.type(selectors.clientAddresses.phoneInput, '999887744') .write(selectors.clientAddresses.phoneInput, '999887744')
.type(selectors.clientAddresses.mobileInput, '999887744') .write(selectors.clientAddresses.mobileInput, '999887744')
.waitToClick(selectors.clientFiscalData.saveButton) .waitToClick(selectors.clientFiscalData.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
@ -55,10 +37,10 @@ describe('Client Add address path', () => {
it(`should create a new address with all it's data`, async() => { it(`should create a new address with all it's data`, async() => {
const result = await nightmare const result = await nightmare
.type(selectors.clientAddresses.consigneeInput, 'Bruce Bunner') .write(selectors.clientAddresses.consigneeInput, 'Bruce Bunner')
.type(selectors.clientAddresses.streetAddressInput, '320 Park Avenue New York') .write(selectors.clientAddresses.streetAddressInput, '320 Park Avenue New York')
.type(selectors.clientAddresses.cityInput, 'New York') .write(selectors.clientAddresses.cityInput, 'New York')
.click(selectors.clientAddresses.saveButton) .waitToClick(selectors.clientAddresses.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');
@ -99,4 +81,15 @@ describe('Client Add address path', () => {
expect(result).toEqual('The default consignee can not be unchecked'); expect(result).toEqual('The default consignee can not be unchecked');
}); });
// this "it" should be removed if the watcher doesn't prevent the navigation upon state changes
it(`should go back to the addreses section by clicking the cancel button`, async() => {
const url = await nightmare
.waitToClick(selectors.clientAddresses.cancelEditAddressButton)
.waitToClick('vn-confirm button[response="ACCEPT"]')
.waitForURL('address/index')
.parsedUrl();
expect(url.hash).toContain('address/index');
});
}); });

7
e2e/paths/client-module/06_add_address_notes.spec.js
View File

@ -24,8 +24,7 @@ describe('Client add address notes path', () => {
it('should not save a description without observation type', async() => { it('should not save a description without observation type', async() => {
const result = await nightmare const result = await nightmare
.waitToClick(selectors.clientAddresses.addObservationButton) .waitToClick(selectors.clientAddresses.addObservationButton)
.wait(selectors.clientAddresses.firstObservationDescriptionInput) .write(selectors.clientAddresses.firstObservationDescriptionInput, 'first description')
.type(selectors.clientAddresses.firstObservationDescriptionInput, 'first description')
.waitToClick(selectors.clientAddresses.saveButton) .waitToClick(selectors.clientAddresses.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
@ -44,10 +43,10 @@ describe('Client add address notes path', () => {
it('should create two new observations', async() => { it('should create two new observations', async() => {
const result = await nightmare const result = await nightmare
.type(selectors.clientAddresses.firstObservationDescriptionInput, 'first description') .write(selectors.clientAddresses.firstObservationDescriptionInput, 'first description')
.waitToClick(selectors.clientAddresses.addObservationButton) .waitToClick(selectors.clientAddresses.addObservationButton)
.autocompleteSearch(selectors.clientAddresses.secondObservationTypeAutocomplete, 'observation one') .autocompleteSearch(selectors.clientAddresses.secondObservationTypeAutocomplete, 'observation one')
.type(selectors.clientAddresses.secondObservationDescriptionInput, 'second description') .write(selectors.clientAddresses.secondObservationDescriptionInput, 'second description')
.waitToClick(selectors.clientAddresses.saveButton) .waitToClick(selectors.clientAddresses.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();

2
e2e/paths/client-module/07_edit_web_access.spec.js
View File

@ -15,7 +15,7 @@ describe('Client Edit web access path', () => {
const result = await nightmare const result = await nightmare
.waitToClick(selectors.clientWebAccess.enableWebAccessCheckbox) .waitToClick(selectors.clientWebAccess.enableWebAccessCheckbox)
.clearInput(selectors.clientWebAccess.userNameInput) .clearInput(selectors.clientWebAccess.userNameInput)
.type(selectors.clientWebAccess.userNameInput, 'Hulk') .write(selectors.clientWebAccess.userNameInput, 'Hulk')
.waitToClick(selectors.clientWebAccess.saveButton) .waitToClick(selectors.clientWebAccess.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();

4
e2e/paths/client-module/08_add_notes.spec.js
View File

@ -22,8 +22,8 @@ describe('Client Add notes path', () => {
it(`should create a note`, async() => { it(`should create a note`, async() => {
const result = await nightmare const result = await nightmare
.type(selectors.clientNotes.noteInput, 'Meeting with Black Widow 21st 9am') .write(selectors.clientNotes.noteInput, 'Meeting with Black Widow 21st 9am')
.click(selectors.clientNotes.saveButton) .waitToClick(selectors.clientNotes.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');

4
e2e/paths/client-module/09_add_credit.spec.js
View File

@ -23,8 +23,8 @@ describe('Client Add credit path', () => {
it(`should edit the credit`, async() => { it(`should edit the credit`, async() => {
const result = await nightmare const result = await nightmare
.clearInput(selectors.clientCredit.creditInput) .clearInput(selectors.clientCredit.creditInput)
.type(selectors.clientCredit.creditInput, 999) .write(selectors.clientCredit.creditInput, 999)
.click(selectors.clientCredit.saveButton) .waitToClick(selectors.clientCredit.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');

8
e2e/paths/client-module/10_add_greuge.spec.js
View File

@ -23,7 +23,7 @@ describe('Client Add greuge path', () => {
it(`should receive an error if all fields are empty but date and type on submit`, async() => { it(`should receive an error if all fields are empty but date and type on submit`, async() => {
const result = await nightmare const result = await nightmare
.autocompleteSearch(selectors.clientGreuge.typeAutocomplete, 'Diff') .autocompleteSearch(selectors.clientGreuge.typeAutocomplete, 'Diff')
.click(selectors.clientGreuge.saveButton) .waitToClick(selectors.clientGreuge.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Some fields are invalid'); expect(result).toEqual('Some fields are invalid');
@ -31,10 +31,10 @@ describe('Client Add greuge path', () => {
it(`should create a new greuge with all its data`, async() => { it(`should create a new greuge with all its data`, async() => {
const result = await nightmare const result = await nightmare
.type(selectors.clientGreuge.amountInput, 999) .write(selectors.clientGreuge.amountInput, 999)
.waitForTextInInput(selectors.clientGreuge.amountInput, '999') .waitForTextInInput(selectors.clientGreuge.amountInput, '999')
.type(selectors.clientGreuge.descriptionInput, 'new armor for Batman!') .write(selectors.clientGreuge.descriptionInput, 'new armor for Batman!')
.click(selectors.clientGreuge.saveButton) .waitToClick(selectors.clientGreuge.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');

38
e2e/paths/client-module/12_lock_of_verified_data.spec.js
View File

@ -27,8 +27,8 @@ describe('Client lock verified data path', () => {
const result = await nightmare const result = await nightmare
.wait(selectors.clientFiscalData.socialNameInput) .wait(selectors.clientFiscalData.socialNameInput)
.clearInput(selectors.clientFiscalData.socialNameInput) .clearInput(selectors.clientFiscalData.socialNameInput)
.type(selectors.clientFiscalData.socialNameInput, 'salesPerson was here') .write(selectors.clientFiscalData.socialNameInput, 'salesPerson was here')
.click(selectors.clientFiscalData.saveButton) .waitToClick(selectors.clientFiscalData.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');
@ -65,9 +65,8 @@ describe('Client lock verified data path', () => {
it('should search again for the user Petter Parker', async() => { it('should search again for the user Petter Parker', async() => {
const resultCount = await nightmare const resultCount = await nightmare
.wait(selectors.clientsIndex.searchClientInput) .write(selectors.clientsIndex.searchClientInput, 'Petter Parker')
.type(selectors.clientsIndex.searchClientInput, 'Petter Parker') .waitToClick(selectors.clientsIndex.searchButton)
.click(selectors.clientsIndex.searchButton)
.waitForNumberOfElements(selectors.clientsIndex.searchResult, 1) .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1)
.countElement(selectors.clientsIndex.searchResult); .countElement(selectors.clientsIndex.searchResult);
@ -130,8 +129,8 @@ describe('Client lock verified data path', () => {
const result = await nightmare const result = await nightmare
.wait(selectors.clientFiscalData.socialNameInput) .wait(selectors.clientFiscalData.socialNameInput)
.clearInput(selectors.clientFiscalData.socialNameInput) .clearInput(selectors.clientFiscalData.socialNameInput)
.type(selectors.clientFiscalData.socialNameInput, 'administrative was here') .write(selectors.clientFiscalData.socialNameInput, 'administrative was here')
.click(selectors.clientFiscalData.saveButton) .waitToClick(selectors.clientFiscalData.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');
@ -168,9 +167,8 @@ describe('Client lock verified data path', () => {
it('should again search for the user Petter Parker', async() => { it('should again search for the user Petter Parker', async() => {
const resultCount = await nightmare const resultCount = await nightmare
.wait(selectors.clientsIndex.searchClientInput) .write(selectors.clientsIndex.searchClientInput, 'Petter Parker')
.type(selectors.clientsIndex.searchClientInput, 'Petter Parker') .waitToClick(selectors.clientsIndex.searchButton)
.click(selectors.clientsIndex.searchButton)
.waitForNumberOfElements(selectors.clientsIndex.searchResult, 1) .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1)
.countElement(selectors.clientsIndex.searchResult); .countElement(selectors.clientsIndex.searchResult);
@ -209,10 +207,9 @@ describe('Client lock verified data path', () => {
it('should not be able to save change throwing a verified data error', async() => { it('should not be able to save change throwing a verified data error', async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.clientFiscalData.socialNameInput)
.clearInput(selectors.clientFiscalData.socialNameInput) .clearInput(selectors.clientFiscalData.socialNameInput)
.type(selectors.clientFiscalData.socialNameInput, 'salesPerson was here') .write(selectors.clientFiscalData.socialNameInput, 'salesPerson was here')
.click(selectors.clientFiscalData.saveButton) .waitToClick(selectors.clientFiscalData.saveButton)
.waitForSnackbar(); .waitForSnackbar();
expect(result).toEqual(jasmine.arrayContaining([`You can't make changes on a client with verified data`])); expect(result).toEqual(jasmine.arrayContaining([`You can't make changes on a client with verified data`]));
@ -239,9 +236,8 @@ describe('Client lock verified data path', () => {
it('should now search again for the user Petter Parker', async() => { it('should now search again for the user Petter Parker', async() => {
const resultCount = await nightmare const resultCount = await nightmare
.wait(selectors.clientsIndex.searchClientInput) .write(selectors.clientsIndex.searchClientInput, 'Petter Parker')
.type(selectors.clientsIndex.searchClientInput, 'Petter Parker') .waitToClick(selectors.clientsIndex.searchButton)
.click(selectors.clientsIndex.searchButton)
.waitForNumberOfElements(selectors.clientsIndex.searchResult, 1) .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1)
.countElement(selectors.clientsIndex.searchResult); .countElement(selectors.clientsIndex.searchResult);
@ -280,10 +276,9 @@ describe('Client lock verified data path', () => {
it('should now edit the social name', async() => { it('should now edit the social name', async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.clientFiscalData.socialNameInput)
.clearInput(selectors.clientFiscalData.socialNameInput) .clearInput(selectors.clientFiscalData.socialNameInput)
.type(selectors.clientFiscalData.socialNameInput, 'salesAssistant was here') .write(selectors.clientFiscalData.socialNameInput, 'salesAssistant was here')
.click(selectors.clientFiscalData.saveButton) .waitToClick(selectors.clientFiscalData.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');
@ -320,9 +315,8 @@ describe('Client lock verified data path', () => {
it('should once again search for the user Petter Parker', async() => { it('should once again search for the user Petter Parker', async() => {
const resultCount = await nightmare const resultCount = await nightmare
.wait(selectors.clientsIndex.searchClientInput) .write(selectors.clientsIndex.searchClientInput, 'Petter Parker')
.type(selectors.clientsIndex.searchClientInput, 'Petter Parker') .waitToClick(selectors.clientsIndex.searchButton)
.click(selectors.clientsIndex.searchButton)
.waitForNumberOfElements(selectors.clientsIndex.searchResult, 1) .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1)
.countElement(selectors.clientsIndex.searchResult); .countElement(selectors.clientsIndex.searchResult);

3
e2e/paths/client-module/13_log.spec.js
View File

@ -13,9 +13,8 @@ describe('Client log path', () => {
it('should update the clients name', async() => { it('should update the clients name', async() => {
let result = await nightmare let result = await nightmare
.wait(selectors.clientBasicData.nameInput)
.clearInput(selectors.clientBasicData.nameInput) .clearInput(selectors.clientBasicData.nameInput)
.type(selectors.clientBasicData.nameInput, 'this is a test') .write(selectors.clientBasicData.nameInput, 'this is a test')
.waitToClick(selectors.clientBasicData.saveButton) .waitToClick(selectors.clientBasicData.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();

11
e2e/paths/client-module/14_risk.spec.js
View File

@ -23,7 +23,7 @@ describe('Client risk path', () => {
it('should create a new payment that clears the debt', async() => { it('should create a new payment that clears the debt', async() => {
let result = await nightmare let result = await nightmare
.clearInput(selectors.clientRisk.newPaymentBankInut) .clearInput(selectors.clientRisk.newPaymentBankInut)
.type(selectors.clientRisk.newPaymentBankInut, '2') .write(selectors.clientRisk.newPaymentBankInut, '2')
.waitToClick(selectors.clientRisk.saveButton) .waitToClick(selectors.clientRisk.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
@ -49,7 +49,7 @@ describe('Client risk path', () => {
it('should create a new payment that sets the balance to positive value', async() => { it('should create a new payment that sets the balance to positive value', async() => {
let result = await nightmare let result = await nightmare
.clearInput(selectors.clientRisk.newPaymentAmountInput) .clearInput(selectors.clientRisk.newPaymentAmountInput)
.type(selectors.clientRisk.newPaymentAmountInput, '100') .write(selectors.clientRisk.newPaymentAmountInput, '100')
.waitToClick(selectors.clientRisk.saveButton) .waitToClick(selectors.clientRisk.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
@ -75,7 +75,7 @@ describe('Client risk path', () => {
it('should create a new payment that sets the balance back to the original negative value', async() => { it('should create a new payment that sets the balance back to the original negative value', async() => {
let result = await nightmare let result = await nightmare
.clearInput(selectors.clientRisk.newPaymentAmountInput) .clearInput(selectors.clientRisk.newPaymentAmountInput)
.type(selectors.clientRisk.newPaymentAmountInput, '-150') .write(selectors.clientRisk.newPaymentAmountInput, '-150')
.waitToClick(selectors.clientRisk.saveButton) .waitToClick(selectors.clientRisk.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
@ -103,9 +103,8 @@ describe('Client risk path', () => {
it('should now search for the user Petter Parker', async() => { it('should now search for the user Petter Parker', async() => {
let resultCount = await nightmare let resultCount = await nightmare
.wait(selectors.clientsIndex.searchClientInput) .write(selectors.clientsIndex.searchClientInput, 'Petter Parker')
.type(selectors.clientsIndex.searchClientInput, 'Petter Parker') .waitToClick(selectors.clientsIndex.searchButton)
.click(selectors.clientsIndex.searchButton)
.waitForNumberOfElements(selectors.clientsIndex.searchResult, 1) .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1)
.countElement(selectors.clientsIndex.searchResult); .countElement(selectors.clientsIndex.searchResult);

11
e2e/paths/item-module/01_item_summary.spec.js
View File

@ -11,9 +11,8 @@ describe('Item summary path', () => {
it('should search for an item', async() => { it('should search for an item', async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.itemsIndex.searchItemInput) .write(selectors.itemsIndex.searchItemInput, 'Object1 Gem1 5')
.type(selectors.itemsIndex.searchItemInput, 'Object1 Gem1 5') .waitToClick(selectors.itemsIndex.searchButton)
.click(selectors.itemsIndex.searchButton)
.waitForNumberOfElements(selectors.itemsIndex.searchResult, 1) .waitForNumberOfElements(selectors.itemsIndex.searchResult, 1)
.countElement(selectors.itemsIndex.searchResult); .countElement(selectors.itemsIndex.searchResult);
@ -84,9 +83,9 @@ describe('Item summary path', () => {
it('should search for other item', async() => { it('should search for other item', async() => {
const result = await nightmare const result = await nightmare
.clearInput('vn-item-index vn-searchbar input') .clearInput('vn-item-index vn-searchbar input')
.click(selectors.itemsIndex.searchButton) .waitToClick(selectors.itemsIndex.searchButton)
.type(selectors.itemsIndex.searchItemInput, 'Object2 Gem2 3') .write(selectors.itemsIndex.searchItemInput, 'Object2 Gem2 3')
.click(selectors.itemsIndex.searchButton) .waitToClick(selectors.itemsIndex.searchButton)
.waitForNumberOfElements(selectors.itemsIndex.searchResult, 1) .waitForNumberOfElements(selectors.itemsIndex.searchResult, 1)
.countElement(selectors.itemsIndex.searchResult); .countElement(selectors.itemsIndex.searchResult);

9
e2e/paths/item-module/02_edit_item_basic_data.spec.js
View File

@ -13,17 +13,16 @@ describe('Item Edit basic data path', () => {
it(`should edit the item basic data`, async() => { it(`should edit the item basic data`, async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.itemBasicData.nameInput)
.clearInput(selectors.itemBasicData.nameInput) .clearInput(selectors.itemBasicData.nameInput)
.type(selectors.itemBasicData.nameInput, 'Rose of Purity') .write(selectors.itemBasicData.nameInput, 'Rose of Purity')
.autocompleteSearch(selectors.itemBasicData.typeAutocomplete, 'Crisantemo') .autocompleteSearch(selectors.itemBasicData.typeAutocomplete, 'Crisantemo')
.autocompleteSearch(selectors.itemBasicData.intrastatAutocomplete, 'Coral y materiales similares') .autocompleteSearch(selectors.itemBasicData.intrastatAutocomplete, 'Coral y materiales similares')
.clearInput(selectors.itemBasicData.relevancyInput) .clearInput(selectors.itemBasicData.relevancyInput)
.type(selectors.itemBasicData.relevancyInput, '1') .write(selectors.itemBasicData.relevancyInput, '1')
.autocompleteSearch(selectors.itemBasicData.originAutocomplete, 'Spain') .autocompleteSearch(selectors.itemBasicData.originAutocomplete, 'Spain')
.autocompleteSearch(selectors.itemBasicData.expenceAutocomplete, 'Alquiler VNH') .autocompleteSearch(selectors.itemBasicData.expenceAutocomplete, 'Alquiler VNH')
.clearInput(selectors.itemBasicData.longNameInput) .clearInput(selectors.itemBasicData.longNameInput)
.type(selectors.itemBasicData.longNameInput, 'RS Rose of Purity') .write(selectors.itemBasicData.longNameInput, 'RS Rose of Purity')
.waitToClick(selectors.itemBasicData.isActiveCheckbox) .waitToClick(selectors.itemBasicData.isActiveCheckbox)
.waitToClick(selectors.itemBasicData.submitBasicDataButton) .waitToClick(selectors.itemBasicData.submitBasicDataButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
@ -33,7 +32,7 @@ describe('Item Edit basic data path', () => {
it(`should confirm the item name was edited`, async() => { it(`should confirm the item name was edited`, async() => {
const result = await nightmare const result = await nightmare
.click(selectors.itemNiches.nicheButton) .waitToClick(selectors.itemNiches.nicheButton)
.wait(selectors.itemNiches.firstWarehouseDisabled) .wait(selectors.itemNiches.firstWarehouseDisabled)
.waitToClick(selectors.itemBasicData.basicDataButton) .waitToClick(selectors.itemBasicData.basicDataButton)
.waitToGetProperty(selectors.itemBasicData.nameInput, 'value'); .waitToGetProperty(selectors.itemBasicData.nameInput, 'value');

6
e2e/paths/item-module/03_edit_item_tax.spec.js
View File

@ -16,7 +16,7 @@ describe('Item edit tax path', () => {
.autocompleteSearch(selectors.itemTax.firstClassAutocomplete, 'Reduced VAT') .autocompleteSearch(selectors.itemTax.firstClassAutocomplete, 'Reduced VAT')
.autocompleteSearch(selectors.itemTax.secondClassAutocomplete, 'General VAT') .autocompleteSearch(selectors.itemTax.secondClassAutocomplete, 'General VAT')
.autocompleteSearch(selectors.itemTax.thirdClassAutocomplete, 'Reduced VAT') .autocompleteSearch(selectors.itemTax.thirdClassAutocomplete, 'Reduced VAT')
.click(selectors.itemTax.submitTaxButton) .waitToClick(selectors.itemTax.submitTaxButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');
@ -24,9 +24,9 @@ describe('Item edit tax path', () => {
it(`should confirm the first item tax class was edited`, async() => { it(`should confirm the first item tax class was edited`, async() => {
const firstVatType = await nightmare const firstVatType = await nightmare
.click(selectors.itemTags.tagsButton) .waitToClick(selectors.itemTags.tagsButton)
.wait(selectors.itemTags.firstTagDisabled) .wait(selectors.itemTags.firstTagDisabled)
.click(selectors.itemTax.taxButton) .waitToClick(selectors.itemTax.taxButton)
.waitToClick(selectors.itemTax.taxButton) .waitToClick(selectors.itemTax.taxButton)
.waitToGetProperty(`${selectors.itemTax.firstClassAutocomplete} input`, 'value'); .waitToGetProperty(`${selectors.itemTax.firstClassAutocomplete} input`, 'value');

10
e2e/paths/item-module/04_create_item_tags.spec.js
View File

@ -16,10 +16,10 @@ describe('Item create tags path', () => {
.waitToClick(selectors.itemTags.fourthRemoveTagButton) .waitToClick(selectors.itemTags.fourthRemoveTagButton)
.waitToClick(selectors.itemTags.addItemTagButton) .waitToClick(selectors.itemTags.addItemTagButton)
.autocompleteSearch(selectors.itemTags.seventhTagAutocomplete, 'Ancho de la base') .autocompleteSearch(selectors.itemTags.seventhTagAutocomplete, 'Ancho de la base')
.type(selectors.itemTags.seventhValueInput, '50') .write(selectors.itemTags.seventhValueInput, '50')
.clearInput(selectors.itemTags.seventhRelevancyInput) .clearInput(selectors.itemTags.seventhRelevancyInput)
.type(selectors.itemTags.seventhRelevancyInput, '4') .write(selectors.itemTags.seventhRelevancyInput, '4')
.click(selectors.itemTags.submitItemTagsButton) .waitToClick(selectors.itemTags.submitItemTagsButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');
@ -27,9 +27,9 @@ describe('Item create tags path', () => {
it(`should confirm the fourth row data is the expected one`, async() => { it(`should confirm the fourth row data is the expected one`, async() => {
let result = await nightmare let result = await nightmare
.click(selectors.itemBasicData.basicDataButton) .waitToClick(selectors.itemBasicData.basicDataButton)
.wait(selectors.itemBasicData.nameInput) .wait(selectors.itemBasicData.nameInput)
.click(selectors.itemTags.tagsButton) .waitToClick(selectors.itemTags.tagsButton)
.wait('vn-item-tags') .wait('vn-item-tags')
.waitToGetProperty(`${selectors.itemTags.fourthTagAutocomplete} input`, 'value'); .waitToGetProperty(`${selectors.itemTags.fourthTagAutocomplete} input`, 'value');

8
e2e/paths/item-module/05_create_item_niche.spec.js
View File

@ -16,8 +16,8 @@ describe('Item create niche path', () => {
.waitToClick(selectors.itemNiches.addNicheButton) .waitToClick(selectors.itemNiches.addNicheButton)
.waitToClick(selectors.itemNiches.secondNicheRemoveButton) .waitToClick(selectors.itemNiches.secondNicheRemoveButton)
.autocompleteSearch(selectors.itemNiches.thirdWarehouseAutocomplete, 'Warehouse Two') .autocompleteSearch(selectors.itemNiches.thirdWarehouseAutocomplete, 'Warehouse Two')
.type(selectors.itemNiches.thirdCodeInput, 'A4') .write(selectors.itemNiches.thirdCodeInput, 'A4')
.click(selectors.itemNiches.submitNichesButton) .waitToClick(selectors.itemNiches.submitNichesButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');
@ -25,9 +25,9 @@ describe('Item create niche path', () => {
it(`should confirm the first niche is the expected one`, async() => { it(`should confirm the first niche is the expected one`, async() => {
let result = await nightmare let result = await nightmare
.click(selectors.itemBasicData.basicDataButton) .waitToClick(selectors.itemBasicData.basicDataButton)
.wait(selectors.itemBasicData.nameInput) .wait(selectors.itemBasicData.nameInput)
.click(selectors.itemNiches.nicheButton) .waitToClick(selectors.itemNiches.nicheButton)
.waitForTextInInput(`${selectors.itemNiches.firstWarehouseAutocomplete} input`, 'Warehouse One') .waitForTextInInput(`${selectors.itemNiches.firstWarehouseAutocomplete} input`, 'Warehouse One')
.waitToGetProperty(`${selectors.itemNiches.firstWarehouseAutocomplete} input`, 'value'); .waitToGetProperty(`${selectors.itemNiches.firstWarehouseAutocomplete} input`, 'value');

13
e2e/paths/item-module/06_create_item_botanical.spec.js
View File

@ -13,8 +13,7 @@ describe('Item Create botanical path', () => {
it(`should create a new botanical for the item`, async() => { it(`should create a new botanical for the item`, async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.itemBotanical.botanicalInput) .write(selectors.itemBotanical.botanicalInput, 'Cicuta maculata')
.type(selectors.itemBotanical.botanicalInput, 'Cicuta maculata')
.autocompleteSearch(selectors.itemBotanical.genusAutocomplete, 'Abelia') .autocompleteSearch(selectors.itemBotanical.genusAutocomplete, 'Abelia')
.autocompleteSearch(selectors.itemBotanical.speciesAutocomplete, 'dealbata') .autocompleteSearch(selectors.itemBotanical.speciesAutocomplete, 'dealbata')
.waitToClick(selectors.itemBotanical.submitBotanicalButton) .waitToClick(selectors.itemBotanical.submitBotanicalButton)
@ -25,9 +24,9 @@ describe('Item Create botanical path', () => {
it(`should confirm the botanical for the item was created`, async() => { it(`should confirm the botanical for the item was created`, async() => {
const result = await nightmare const result = await nightmare
.click(selectors.itemBasicData.basicDataButton) .waitToClick(selectors.itemBasicData.basicDataButton)
.wait(selectors.itemBasicData.nameInput) .wait(selectors.itemBasicData.nameInput)
.click(selectors.itemBotanical.botanicalButton) .waitToClick(selectors.itemBotanical.botanicalButton)
.waitForTextInInput(selectors.itemBotanical.botanicalInput, 'Cicuta maculata') .waitForTextInInput(selectors.itemBotanical.botanicalInput, 'Cicuta maculata')
.waitToGetProperty(selectors.itemBotanical.botanicalInput, 'value'); .waitToGetProperty(selectors.itemBotanical.botanicalInput, 'value');
@ -52,7 +51,7 @@ describe('Item Create botanical path', () => {
it(`should edit botanical for the item`, async() => { it(`should edit botanical for the item`, async() => {
const result = await nightmare const result = await nightmare
.clearInput(selectors.itemBotanical.botanicalInput) .clearInput(selectors.itemBotanical.botanicalInput)
.type(selectors.itemBotanical.botanicalInput, 'Herp Derp') .write(selectors.itemBotanical.botanicalInput, 'Herp Derp')
.autocompleteSearch(selectors.itemBotanical.genusAutocomplete, 'Abies') .autocompleteSearch(selectors.itemBotanical.genusAutocomplete, 'Abies')
.autocompleteSearch(selectors.itemBotanical.speciesAutocomplete, 'decurrens') .autocompleteSearch(selectors.itemBotanical.speciesAutocomplete, 'decurrens')
.waitToClick(selectors.itemBotanical.submitBotanicalButton) .waitToClick(selectors.itemBotanical.submitBotanicalButton)
@ -63,9 +62,9 @@ describe('Item Create botanical path', () => {
it(`should confirm the botanical for the item was edited`, async() => { it(`should confirm the botanical for the item was edited`, async() => {
const result = await nightmare const result = await nightmare
.click(selectors.itemBasicData.basicDataButton) .waitToClick(selectors.itemBasicData.basicDataButton)
.wait(selectors.itemBasicData.nameInput) .wait(selectors.itemBasicData.nameInput)
.click(selectors.itemBotanical.botanicalButton) .waitToClick(selectors.itemBotanical.botanicalButton)
.waitForTextInInput(selectors.itemBotanical.botanicalInput, 'Herp Derp') .waitForTextInInput(selectors.itemBotanical.botanicalInput, 'Herp Derp')
.waitToGetProperty(selectors.itemBotanical.botanicalInput, 'value'); .waitToGetProperty(selectors.itemBotanical.botanicalInput, 'value');

8
e2e/paths/item-module/07_create_item_barcode.spec.js
View File

@ -15,8 +15,7 @@ describe('Item Create barcodes path', () => {
const result = await nightmare const result = await nightmare
.waitToClick(selectors.itemBarcodes.firstCodeRemoveButton) .waitToClick(selectors.itemBarcodes.firstCodeRemoveButton)
.waitToClick(selectors.itemBarcodes.addBarcodeButton) .waitToClick(selectors.itemBarcodes.addBarcodeButton)
.wait(selectors.itemBarcodes.thirdCodeInput) .write(selectors.itemBarcodes.thirdCodeInput, '5')
.type(selectors.itemBarcodes.thirdCodeInput, '5')
.waitToClick(selectors.itemBarcodes.submitBarcodesButton) .waitToClick(selectors.itemBarcodes.submitBarcodesButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
@ -25,9 +24,8 @@ describe('Item Create barcodes path', () => {
it(`should confirm the barcode 5 is created and it is now the third barcode as the first was deleted`, async() => { it(`should confirm the barcode 5 is created and it is now the third barcode as the first was deleted`, async() => {
const result = await nightmare const result = await nightmare
.click(selectors.itemBasicData.basicDataButton) .waitToClick(selectors.itemBasicData.basicDataButton)
.wait(selectors.itemBasicData.nameInput) .waitToClick(selectors.itemBarcodes.barcodeButton)
.click(selectors.itemBarcodes.barcodeButton)
.waitForTextInInput(selectors.itemBarcodes.thirdCodeInput, '5') .waitForTextInInput(selectors.itemBarcodes.thirdCodeInput, '5')
.waitToGetProperty(selectors.itemBarcodes.thirdCodeInput, 'value'); .waitToGetProperty(selectors.itemBarcodes.thirdCodeInput, 'value');

29
e2e/paths/item-module/08_item_create_and_clone.spec.js
View File

@ -11,9 +11,8 @@ describe('Item Create/Clone path', () => {
it(`should search for the item Infinity Gauntlet to confirm it isn't created yet`, async() => { it(`should search for the item Infinity Gauntlet to confirm it isn't created yet`, async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.itemsIndex.searchItemInput) .write(selectors.itemsIndex.searchItemInput, 'Infinity Gauntlet')
.type(selectors.itemsIndex.searchItemInput, 'Infinity Gauntlet') .waitToClick(selectors.itemsIndex.searchButton)
.click(selectors.itemsIndex.searchButton)
.waitForNumberOfElements(selectors.itemsIndex.searchResult, 0) .waitForNumberOfElements(selectors.itemsIndex.searchResult, 0)
.countElement(selectors.itemsIndex.searchResult); .countElement(selectors.itemsIndex.searchResult);
@ -22,7 +21,7 @@ describe('Item Create/Clone path', () => {
it('should access to the create item view by clicking the create floating button', async() => { it('should access to the create item view by clicking the create floating button', async() => {
const url = await nightmare const url = await nightmare
.click(selectors.itemsIndex.createItemButton) .waitToClick(selectors.itemsIndex.createItemButton)
.wait(selectors.itemCreateView.createButton) .wait(selectors.itemCreateView.createButton)
.parsedUrl(); .parsedUrl();
@ -31,7 +30,7 @@ describe('Item Create/Clone path', () => {
it('should return to the item index by clickig the cancel button', async() => { it('should return to the item index by clickig the cancel button', async() => {
const url = await nightmare const url = await nightmare
.click(selectors.itemCreateView.cancelButton) .waitToClick(selectors.itemCreateView.cancelButton)
.wait(selectors.itemsIndex.createItemButton) .wait(selectors.itemsIndex.createItemButton)
.parsedUrl(); .parsedUrl();
@ -40,7 +39,7 @@ describe('Item Create/Clone path', () => {
it('should now access to the create item view by clicking the create floating button', async() => { it('should now access to the create item view by clicking the create floating button', async() => {
const url = await nightmare const url = await nightmare
.click(selectors.itemsIndex.createItemButton) .waitToClick(selectors.itemsIndex.createItemButton)
.wait(selectors.itemCreateView.createButton) .wait(selectors.itemCreateView.createButton)
.parsedUrl(); .parsedUrl();
@ -49,11 +48,11 @@ describe('Item Create/Clone path', () => {
it('should create the Infinity Gauntlet item', async() => { it('should create the Infinity Gauntlet item', async() => {
const result = await nightmare const result = await nightmare
.type(selectors.itemCreateView.temporalName, 'Infinity Gauntlet') .write(selectors.itemCreateView.temporalName, 'Infinity Gauntlet')
.autocompleteSearch(selectors.itemCreateView.typeAutocomplete, 'Crisantemo') .autocompleteSearch(selectors.itemCreateView.typeAutocomplete, 'Crisantemo')
.autocompleteSearch(selectors.itemCreateView.intrastatAutocomplete, 'Coral y materiales similares') .autocompleteSearch(selectors.itemCreateView.intrastatAutocomplete, 'Coral y materiales similares')
.autocompleteSearch(selectors.itemCreateView.originAutocomplete, 'Holand') .autocompleteSearch(selectors.itemCreateView.originAutocomplete, 'Holand')
.click(selectors.itemCreateView.createButton) .waitToClick(selectors.itemCreateView.createButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');
@ -86,7 +85,7 @@ describe('Item Create/Clone path', () => {
describe('clone', () => { describe('clone', () => {
it('should return to the items index by clicking the return to items button', async() => { it('should return to the items index by clicking the return to items button', async() => {
const url = await nightmare const url = await nightmare
.click(selectors.itemBasicData.goToItemIndexButton) .waitToClick(selectors.itemBasicData.goToItemIndexButton)
.wait(selectors.itemsIndex.createItemButton) .wait(selectors.itemsIndex.createItemButton)
.waitForURL('#!/item/index') .waitForURL('#!/item/index')
.parsedUrl(); .parsedUrl();
@ -96,9 +95,8 @@ describe('Item Create/Clone path', () => {
it(`should search for the item Infinity Gauntlet`, async() => { it(`should search for the item Infinity Gauntlet`, async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.itemsIndex.searchItemInput) .write(selectors.itemsIndex.searchItemInput, 'Infinity Gauntlet')
.type(selectors.itemsIndex.searchItemInput, 'Infinity Gauntlet') .waitToClick(selectors.itemsIndex.searchButton)
.click(selectors.itemsIndex.searchButton)
.waitForNumberOfElements(selectors.itemsIndex.searchResult, 1) .waitForNumberOfElements(selectors.itemsIndex.searchResult, 1)
.countElement(selectors.itemsIndex.searchResult); .countElement(selectors.itemsIndex.searchResult);
@ -108,7 +106,7 @@ describe('Item Create/Clone path', () => {
it(`should clone the Infinity Gauntlet`, async() => { it(`should clone the Infinity Gauntlet`, async() => {
const url = await nightmare const url = await nightmare
.waitForTextInElement(selectors.itemsIndex.searchResult, 'Infinity Gauntlet') .waitForTextInElement(selectors.itemsIndex.searchResult, 'Infinity Gauntlet')
.click(selectors.itemsIndex.searchResultCloneButton) .waitToClick(selectors.itemsIndex.searchResultCloneButton)
.waitToClick(selectors.itemsIndex.acceptClonationAlertButton) .waitToClick(selectors.itemsIndex.acceptClonationAlertButton)
.waitForURL('tags') .waitForURL('tags')
.parsedUrl(); .parsedUrl();
@ -119,9 +117,8 @@ describe('Item Create/Clone path', () => {
it('should search for the item Infinity Gauntlet and find two', async() => { it('should search for the item Infinity Gauntlet and find two', async() => {
const result = await nightmare const result = await nightmare
.waitToClick(selectors.itemTags.goToItemIndexButton) .waitToClick(selectors.itemTags.goToItemIndexButton)
.wait(selectors.itemsIndex.searchItemInput) .write(selectors.itemsIndex.searchItemInput, 'Infinity Gauntlet')
.type(selectors.itemsIndex.searchItemInput, 'Infinity Gauntlet') .waitToClick(selectors.itemsIndex.searchButton)
.click(selectors.itemsIndex.searchButton)
.waitForNumberOfElements(selectors.itemsIndex.searchResult, 2) .waitForNumberOfElements(selectors.itemsIndex.searchResult, 2)
.countElement(selectors.itemsIndex.searchResult); .countElement(selectors.itemsIndex.searchResult);

26
e2e/paths/item-module/09_regularize_item.spec.js
View File

@ -10,9 +10,8 @@ describe('Item regularize path', () => {
it('should search for the item', async() => { it('should search for the item', async() => {
const resultCount = await nightmare const resultCount = await nightmare
.wait(selectors.itemsIndex.searchItemInput) .write(selectors.itemsIndex.searchItemInput, 'Object5 Weapon 50')
.type(selectors.itemsIndex.searchItemInput, 'Object5 Weapon 50') .waitToClick(selectors.itemsIndex.searchButton)
.click(selectors.itemsIndex.searchButton)
.waitForNumberOfElements(selectors.itemsIndex.searchResult, 1) .waitForNumberOfElements(selectors.itemsIndex.searchResult, 1)
.countElement(selectors.itemsIndex.searchResult); .countElement(selectors.itemsIndex.searchResult);
@ -33,8 +32,7 @@ describe('Item regularize path', () => {
const result = await nightmare const result = await nightmare
.waitToClick(selectors.itemDescriptor.moreMenu) .waitToClick(selectors.itemDescriptor.moreMenu)
.waitToClick(selectors.itemDescriptor.moreMenuRegularizeButton) .waitToClick(selectors.itemDescriptor.moreMenuRegularizeButton)
.wait(selectors.itemDescriptor.regularizeQuantityInput) .write(selectors.itemDescriptor.regularizeQuantityInput, 100)
.type(selectors.itemDescriptor.regularizeQuantityInput, 100)
.autocompleteSearch(selectors.itemDescriptor.regularizeWarehouseAutocomplete, 'Warehouse One') .autocompleteSearch(selectors.itemDescriptor.regularizeWarehouseAutocomplete, 'Warehouse One')
.waitToClick(selectors.itemDescriptor.regularizeSaveButton) .waitToClick(selectors.itemDescriptor.regularizeSaveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
@ -55,9 +53,8 @@ describe('Item regularize path', () => {
it('should search for the ticket with alias missing', async() => { it('should search for the ticket with alias missing', async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.ticketsIndex.searchTicketInput) .write(selectors.ticketsIndex.searchTicketInput, 'missing')
.type(selectors.ticketsIndex.searchTicketInput, 'missing') .waitToClick(selectors.ticketsIndex.searchButton)
.click(selectors.ticketsIndex.searchButton)
.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1) .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1)
.countElement(selectors.ticketsIndex.searchResult); .countElement(selectors.ticketsIndex.searchResult);
@ -102,9 +99,8 @@ describe('Item regularize path', () => {
it('should search for the item once again', async() => { it('should search for the item once again', async() => {
const resultCount = await nightmare const resultCount = await nightmare
.wait(selectors.itemsIndex.searchItemInput) .write(selectors.itemsIndex.searchItemInput, 'Object5 Weapon 50')
.type(selectors.itemsIndex.searchItemInput, 'Object5 Weapon 50') .waitToClick(selectors.itemsIndex.searchButton)
.click(selectors.itemsIndex.searchButton)
.waitForNumberOfElements(selectors.itemsIndex.searchResult, 1) .waitForNumberOfElements(selectors.itemsIndex.searchResult, 1)
.countElement(selectors.itemsIndex.searchResult); .countElement(selectors.itemsIndex.searchResult);
@ -125,8 +121,7 @@ describe('Item regularize path', () => {
const result = await nightmare const result = await nightmare
.waitToClick(selectors.itemDescriptor.moreMenu) .waitToClick(selectors.itemDescriptor.moreMenu)
.waitToClick(selectors.itemDescriptor.moreMenuRegularizeButton) .waitToClick(selectors.itemDescriptor.moreMenuRegularizeButton)
.wait(selectors.itemDescriptor.regularizeQuantityInput) .write(selectors.itemDescriptor.regularizeQuantityInput, 100)
.type(selectors.itemDescriptor.regularizeQuantityInput, 100)
.autocompleteSearch(selectors.itemDescriptor.regularizeWarehouseAutocomplete, 'Warehouse One') .autocompleteSearch(selectors.itemDescriptor.regularizeWarehouseAutocomplete, 'Warehouse One')
.waitToClick(selectors.itemDescriptor.regularizeSaveButton) .waitToClick(selectors.itemDescriptor.regularizeSaveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
@ -147,9 +142,8 @@ describe('Item regularize path', () => {
it('should search for the ticket with id 23 once again', async() => { it('should search for the ticket with id 23 once again', async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.ticketsIndex.searchTicketInput) .write(selectors.ticketsIndex.searchTicketInput, 'id:23')
.type(selectors.ticketsIndex.searchTicketInput, 'id:23') .waitToClick(selectors.ticketsIndex.searchButton)
.click(selectors.ticketsIndex.searchButton)
.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1) .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1)
.countElement(selectors.ticketsIndex.searchResult); .countElement(selectors.ticketsIndex.searchResult);

26
e2e/paths/order-module/01_edit_basic_data.spec.js
View File

@ -14,7 +14,7 @@ describe('Order edit basic data path', () => {
it('should not be able to change the client', async() => { it('should not be able to change the client', async() => {
const result = await nightmare const result = await nightmare
.autocompleteSearch(selectors.orderBasicData.clientAutocomplete, 'Tony Stark') .autocompleteSearch(selectors.orderBasicData.clientAutocomplete, 'Tony Stark')
.click(selectors.orderBasicData.saveButton) .waitToClick(selectors.orderBasicData.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual(`You can't make changes on the basic data of an confirmed order or with rows`); expect(result).toEqual(`You can't make changes on the basic data of an confirmed order or with rows`);
@ -38,7 +38,7 @@ describe('Order edit basic data path', () => {
it('should not be able to change the company', async() => { it('should not be able to change the company', async() => {
const result = await nightmare const result = await nightmare
.autocompleteSearch(selectors.orderBasicData.companyAutocomplete, 'CCs') .autocompleteSearch(selectors.orderBasicData.companyAutocomplete, 'CCs')
.click(selectors.orderBasicData.saveButton) .waitToClick(selectors.orderBasicData.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual(`You can't make changes on the basic data of an confirmed order or with rows`); expect(result).toEqual(`You can't make changes on the basic data of an confirmed order or with rows`);
@ -46,11 +46,17 @@ describe('Order edit basic data path', () => {
}); });
describe('when new order', () => { describe('when new order', () => {
beforeAll(() => { it('should once more navigate to order index', async() => {
nightmare const url = await nightmare
.loginAndModule('employee', 'order') .waitToClick(selectors.globalItems.returnToModuleIndexButton)
.waitToClick(selectors.globalItems.acceptVnConfirm)
.wait(selectors.ordersIndex.createOrderButton)
.accessToSearchResult('18') .accessToSearchResult('18')
.accessToSection('order.card.basicData'); .accessToSection('order.card.basicData')
.wait(selectors.orderBasicData.companyAutocomplete)
.parsedUrl();
expect(url.hash).toEqual('#!/order/18/basic-data');
}); });
it('should be able to modify all the properties', async() => { it('should be able to modify all the properties', async() => {
@ -58,8 +64,8 @@ describe('Order edit basic data path', () => {
.autocompleteSearch(selectors.orderBasicData.clientAutocomplete, 'Tony Stark') .autocompleteSearch(selectors.orderBasicData.clientAutocomplete, 'Tony Stark')
.autocompleteSearch(selectors.orderBasicData.companyAutocomplete, 'CCs') .autocompleteSearch(selectors.orderBasicData.companyAutocomplete, 'CCs')
.clearInput(selectors.orderBasicData.observationInput) .clearInput(selectors.orderBasicData.observationInput)
.type(selectors.orderBasicData.observationInput, 'Observation modified') .write(selectors.orderBasicData.observationInput, 'Observation modified')
.click(selectors.orderBasicData.saveButton) .waitToClick(selectors.orderBasicData.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');
@ -67,9 +73,9 @@ describe('Order edit basic data path', () => {
it('should now confirm the client have been edited', async() => { it('should now confirm the client have been edited', async() => {
const result = await nightmare const result = await nightmare
.click(selectors.orderCatalog.catalogButton) .waitToClick(selectors.orderCatalog.catalogButton)
.wait(selectors.orderCatalog.orderByAutocomplete) .wait(selectors.orderCatalog.orderByAutocomplete)
.click(selectors.orderBasicData.basicDataButton) .waitToClick(selectors.orderBasicData.basicDataButton)
.waitToGetProperty(`${selectors.orderBasicData.clientAutocomplete} input`, 'value'); .waitToGetProperty(`${selectors.orderBasicData.clientAutocomplete} input`, 'value');
expect(result).toEqual('104: Tony Stark'); expect(result).toEqual('104: Tony Stark');

8
e2e/paths/ticket-module/01_create_ticket_observations.spec.js
View File

@ -16,8 +16,8 @@ describe('Ticket Create notes path', () => {
.waitToClick(selectors.ticketNotes.firstNoteRemoveButton) .waitToClick(selectors.ticketNotes.firstNoteRemoveButton)
.waitToClick(selectors.ticketNotes.addNoteButton) .waitToClick(selectors.ticketNotes.addNoteButton)
.autocompleteSearch(selectors.ticketNotes.firstNoteTypeAutocomplete, 'observation one') .autocompleteSearch(selectors.ticketNotes.firstNoteTypeAutocomplete, 'observation one')
.type(selectors.ticketNotes.firstDescriptionInput, 'description') .write(selectors.ticketNotes.firstDescriptionInput, 'description')
.click(selectors.ticketNotes.submitNotesButton) .waitToClick(selectors.ticketNotes.submitNotesButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');
@ -25,9 +25,9 @@ describe('Ticket Create notes path', () => {
it(`should confirm the note is the expected one`, async() => { it(`should confirm the note is the expected one`, async() => {
let result = await nightmare let result = await nightmare
.click(selectors.ticketPackages.packagesButton) .waitToClick(selectors.ticketPackages.packagesButton)
.wait(selectors.ticketPackages.firstPackageAutocomplete) .wait(selectors.ticketPackages.firstPackageAutocomplete)
.click(selectors.ticketNotes.notesButton) .waitToClick(selectors.ticketNotes.notesButton)
.waitToGetProperty(`${selectors.ticketNotes.firstNoteTypeAutocomplete} input`, 'value'); .waitToGetProperty(`${selectors.ticketNotes.firstNoteTypeAutocomplete} input`, 'value');
expect(result).toEqual('observation one'); expect(result).toEqual('observation one');

4
e2e/paths/ticket-module/02_ticket_expeditions_and_log.spec.js
View File

@ -16,9 +16,9 @@ xdescribe('Ticket expeditions and log path', () => {
const result = await nightmare const result = await nightmare
.waitToClick(selectors.ticketExpedition.secondExpeditionRemoveButton) .waitToClick(selectors.ticketExpedition.secondExpeditionRemoveButton)
.waitToClick(selectors.ticketExpedition.acceptDeleteRowButton) .waitToClick(selectors.ticketExpedition.acceptDeleteRowButton)
.click(selectors.ticketPackages.packagesButton) .waitToClick(selectors.ticketPackages.packagesButton)
.wait(selectors.ticketPackages.firstPackageAutocomplete) .wait(selectors.ticketPackages.firstPackageAutocomplete)
.click(selectors.ticketExpedition.expeditionButton) .waitToClick(selectors.ticketExpedition.expeditionButton)
.wait(selectors.ticketExpedition.expeditionRow) .wait(selectors.ticketExpedition.expeditionRow)
.countElement(selectors.ticketExpedition.expeditionRow); .countElement(selectors.ticketExpedition.expeditionRow);

18
e2e/paths/ticket-module/04_create_ticket_packages.spec.js
View File

@ -16,7 +16,7 @@ describe('Ticket Create packages path', () => {
.waitToClick(selectors.ticketPackages.firstRemovePackageButton) .waitToClick(selectors.ticketPackages.firstRemovePackageButton)
.waitToClick(selectors.ticketPackages.addPackageButton) .waitToClick(selectors.ticketPackages.addPackageButton)
.autocompleteSearch(selectors.ticketPackages.firstPackageAutocomplete, 'Legendary Box') .autocompleteSearch(selectors.ticketPackages.firstPackageAutocomplete, 'Legendary Box')
.click(selectors.ticketPackages.savePackagesButton) .waitToClick(selectors.ticketPackages.savePackagesButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Some fields are invalid'); expect(result).toEqual('Some fields are invalid');
@ -24,8 +24,8 @@ describe('Ticket Create packages path', () => {
it(`should attempt create a new package but receive an error if quantity is a string`, async() => { it(`should attempt create a new package but receive an error if quantity is a string`, async() => {
const result = await nightmare const result = await nightmare
.type(selectors.ticketPackages.firstQuantityInput, 'ninety 9') .write(selectors.ticketPackages.firstQuantityInput, 'ninety 9')
.click(selectors.ticketPackages.savePackagesButton) .waitToClick(selectors.ticketPackages.savePackagesButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Some fields are invalid'); expect(result).toEqual('Some fields are invalid');
@ -34,8 +34,8 @@ describe('Ticket Create packages path', () => {
it(`should attempt create a new package but receive an error if quantity is 0`, async() => { it(`should attempt create a new package but receive an error if quantity is 0`, async() => {
const result = await nightmare const result = await nightmare
.clearInput(selectors.ticketPackages.firstQuantityInput) .clearInput(selectors.ticketPackages.firstQuantityInput)
.type(selectors.ticketPackages.firstQuantityInput, 0) .write(selectors.ticketPackages.firstQuantityInput, 0)
.click(selectors.ticketPackages.savePackagesButton) .waitToClick(selectors.ticketPackages.savePackagesButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Some fields are invalid'); expect(result).toEqual('Some fields are invalid');
@ -44,9 +44,9 @@ describe('Ticket Create packages path', () => {
it(`should attempt create a new package but receive an error if package is blank`, async() => { it(`should attempt create a new package but receive an error if package is blank`, async() => {
const result = await nightmare const result = await nightmare
.clearInput(selectors.ticketPackages.firstQuantityInput) .clearInput(selectors.ticketPackages.firstQuantityInput)
.type(selectors.ticketPackages.firstQuantityInput, 99) .write(selectors.ticketPackages.firstQuantityInput, 99)
.click(selectors.ticketPackages.clearPackageAutocompleteButton) .waitToClick(selectors.ticketPackages.clearPackageAutocompleteButton)
.click(selectors.ticketPackages.savePackagesButton) .waitToClick(selectors.ticketPackages.savePackagesButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Package cannot be blank'); expect(result).toEqual('Package cannot be blank');
@ -55,7 +55,7 @@ describe('Ticket Create packages path', () => {
it(`should create a new package with correct data`, async() => { it(`should create a new package with correct data`, async() => {
const result = await nightmare const result = await nightmare
.autocompleteSearch(selectors.ticketPackages.firstPackageAutocomplete, 'Legendary Box') .autocompleteSearch(selectors.ticketPackages.firstPackageAutocomplete, 'Legendary Box')
.click(selectors.ticketPackages.savePackagesButton) .waitToClick(selectors.ticketPackages.savePackagesButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');

53
e2e/paths/ticket-module/05_create_new_tracking_state.spec.js
View File

@ -4,6 +4,7 @@ import createNightmare from '../../helpers/nightmare';
describe('Ticket Create new tracking state path', () => { describe('Ticket Create new tracking state path', () => {
const nightmare = createNightmare(); const nightmare = createNightmare();
describe('as production', () => {
beforeAll(() => { beforeAll(() => {
return nightmare return nightmare
.loginAndModule('production', 'ticket') .loginAndModule('production', 'ticket')
@ -22,37 +23,75 @@ describe('Ticket Create new tracking state path', () => {
it(`should attempt create a new state but receive an error if state is empty`, async() => { it(`should attempt create a new state but receive an error if state is empty`, async() => {
let result = await nightmare let result = await nightmare
.click(selectors.createStateView.saveStateButton) .waitToClick(selectors.createStateView.saveStateButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('No changes to save'); expect(result).toEqual('State cannot be blank');
}); });
it(`should attempt create a new state then clear and save it`, async() => { it(`should attempt create a new state then clear and save it`, async() => {
let result = await nightmare let result = await nightmare
.autocompleteSearch(selectors.createStateView.stateAutocomplete, '¿Fecha?') .autocompleteSearch(selectors.createStateView.stateAutocomplete, '¿Fecha?')
.waitToClick(selectors.createStateView.clearStateInputButton) .waitToClick(selectors.createStateView.clearStateInputButton)
.click(selectors.createStateView.saveStateButton) .waitToClick(selectors.createStateView.saveStateButton)
.waitForLastSnackbar();
expect(result).toEqual('State cannot be blank');
});
it(`should create a new state`, async() => {
let result = await nightmare
.autocompleteSearch(selectors.createStateView.stateAutocomplete, '¿Fecha?')
.waitToClick(selectors.createStateView.saveStateButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');
}); });
});
it('should again access to the create state view by clicking the create floating button', async() => { describe('as salesPerson', () => {
beforeAll(() => {
return nightmare
.loginAndModule('salesPerson', 'ticket')
.accessToSearchResult('id:1')
.accessToSection('ticket.card.tracking.index');
});
it('should now access to the create state view by clicking the create floating button', async() => {
let url = await nightmare let url = await nightmare
.click(selectors.ticketTracking.createStateButton) .waitToClick(selectors.ticketTracking.createStateButton)
.wait(selectors.createStateView.stateAutocomplete) .wait(selectors.createStateView.stateAutocomplete)
.parsedUrl(); .parsedUrl();
expect(url.hash).toContain('tracking/edit'); expect(url.hash).toContain('tracking/edit');
}); });
it(`should create a new state`, async() => { it(`should attemp to create an state for which salesPerson doesn't have permissions`, async() => {
let result = await nightmare let result = await nightmare
.autocompleteSearch(selectors.createStateView.stateAutocomplete, '¿Fecha?') .autocompleteSearch(selectors.createStateView.stateAutocomplete, '¿Fecha?')
.click(selectors.createStateView.saveStateButton) .waitToClick(selectors.createStateView.saveStateButton)
.waitForLastSnackbar();
expect(result).toEqual(`You don't have enough privileges to change the state of this ticket`);
});
it(`should attempt to create an state for the type salesPerson has rights but fail as worker is blank`, async() => {
let result = await nightmare
.autocompleteSearch(selectors.createStateView.stateAutocomplete, 'asignado')
.waitToClick(selectors.createStateView.saveStateButton)
.waitForLastSnackbar();
expect(result).toEqual(`Worker cannot be blank`);
});
it(`should create a new state with all it's data`, async() => {
let result = await nightmare
.autocompleteSearch(selectors.createStateView.workerAutocomplete, 'accessory')
.waitToClick(selectors.createStateView.saveStateButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');
}); });
}); });
});

10
e2e/paths/ticket-module/06_edit_basic_data_steps.spec.js
View File

@ -16,7 +16,7 @@ describe('Ticket Edit basic data path', () => {
.autocompleteSearch(selectors.ticketBasicData.clientAutocomplete, 'Charles Xavier') .autocompleteSearch(selectors.ticketBasicData.clientAutocomplete, 'Charles Xavier')
.wait(500) .wait(500)
.autocompleteSearch(selectors.ticketBasicData.addressAutocomplete, 'Charles Xavier') .autocompleteSearch(selectors.ticketBasicData.addressAutocomplete, 'Charles Xavier')
.click(selectors.ticketBasicData.nextStepButton) .waitToClick(selectors.ticketBasicData.nextStepButton)
.waitForURL('data/step-two') .waitForURL('data/step-two')
.parsedUrl(); .parsedUrl();
@ -32,7 +32,7 @@ describe('Ticket Edit basic data path', () => {
it(`should click next to move on to step three`, async() => { it(`should click next to move on to step three`, async() => {
let url = await nightmare let url = await nightmare
.click(selectors.ticketBasicData.nextStepButton) .waitToClick(selectors.ticketBasicData.nextStepButton)
.waitForURL('data/step-three') .waitForURL('data/step-three')
.parsedUrl(); .parsedUrl();
@ -61,7 +61,7 @@ describe('Ticket Edit basic data path', () => {
it(`should edit the ticket agency then click next`, async() => { it(`should edit the ticket agency then click next`, async() => {
let url = await nightmare let url = await nightmare
.autocompleteSearch(selectors.ticketBasicData.agencyAutocomplete, 'Silla247Expensive') .autocompleteSearch(selectors.ticketBasicData.agencyAutocomplete, 'Silla247Expensive')
.click(selectors.ticketBasicData.nextStepButton) .waitToClick(selectors.ticketBasicData.nextStepButton)
.waitForURL('data/step-two') .waitForURL('data/step-two')
.parsedUrl(); .parsedUrl();
@ -77,7 +77,7 @@ describe('Ticket Edit basic data path', () => {
it(`should then click next to move on to step three`, async() => { it(`should then click next to move on to step three`, async() => {
let url = await nightmare let url = await nightmare
.click(selectors.ticketBasicData.nextStepButton) .waitToClick(selectors.ticketBasicData.nextStepButton)
.waitForURL('data/step-three') .waitForURL('data/step-three')
.parsedUrl(); .parsedUrl();
@ -87,7 +87,7 @@ describe('Ticket Edit basic data path', () => {
it(`should select a new reason for the changes made then click on finalize`, async() => { it(`should select a new reason for the changes made then click on finalize`, async() => {
let url = await nightmare let url = await nightmare
.autocompleteSearch(selectors.ticketBasicData.chargesReasonAutocomplete, 'Cambiar los precios en el ticket') .autocompleteSearch(selectors.ticketBasicData.chargesReasonAutocomplete, 'Cambiar los precios en el ticket')
.click(selectors.ticketBasicData.finalizeButton) .waitToClick(selectors.ticketBasicData.finalizeButton)
.waitForURL('summary') .waitForURL('summary')
.parsedUrl(); .parsedUrl();

81
e2e/paths/ticket-module/07_edit_sale.spec.js
View File

@ -11,7 +11,7 @@ describe('Ticket Edit sale path', () => {
.accessToSection('ticket.card.sale'); .accessToSection('ticket.card.sale');
}); });
it(`should click on the first claim id to navigate over there`, async() => { it(`should click on the second claim id to navigate over there`, async() => {
const url = await nightmare const url = await nightmare
.waitToClick(selectors.ticketSales.secondSaleClaimId) .waitToClick(selectors.ticketSales.secondSaleClaimId)
.wait(selectors.claimBasicData.claimStateAutocomplete) .wait(selectors.claimBasicData.claimStateAutocomplete)
@ -34,9 +34,8 @@ describe('Ticket Edit sale path', () => {
it('should again search for a specific ticket', async() => { it('should again search for a specific ticket', async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.ticketsIndex.searchTicketInput) .write(selectors.ticketsIndex.searchTicketInput, 'id:16')
.type(selectors.ticketsIndex.searchTicketInput, 'id:16') .waitToClick(selectors.ticketsIndex.searchButton)
.click(selectors.ticketsIndex.searchButton)
.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1) .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1)
.countElement(selectors.ticketsIndex.searchResult); .countElement(selectors.ticketsIndex.searchResult);
@ -123,9 +122,8 @@ describe('Ticket Edit sale path', () => {
.waitToClick(selectors.globalItems.applicationsMenuButton) .waitToClick(selectors.globalItems.applicationsMenuButton)
.wait(selectors.globalItems.applicationsMenuVisible) .wait(selectors.globalItems.applicationsMenuVisible)
.waitToClick(selectors.globalItems.ticketsButton) .waitToClick(selectors.globalItems.ticketsButton)
.wait(selectors.ticketsIndex.searchTicketInput) .write(selectors.ticketsIndex.searchTicketInput, 'id:16')
.type(selectors.ticketsIndex.searchTicketInput, 'id:16') .waitToClick(selectors.ticketsIndex.searchButton)
.click(selectors.ticketsIndex.searchButton)
.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1) .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1)
.waitForTextInElement(selectors.ticketsIndex.searchResult, 'address 21') .waitForTextInElement(selectors.ticketsIndex.searchResult, 'address 21')
.waitToClick(selectors.ticketsIndex.searchResult) .waitToClick(selectors.ticketsIndex.searchResult)
@ -139,7 +137,7 @@ describe('Ticket Edit sale path', () => {
it('should try to add a higher quantity value and then receive an error', async() => { it('should try to add a higher quantity value and then receive an error', async() => {
const result = await nightmare const result = await nightmare
.waitToClick(selectors.ticketSales.firstSaleQuantityClearInput) .waitToClick(selectors.ticketSales.firstSaleQuantityClearInput)
.type(selectors.ticketSales.firstSaleQuantity, '9\u000d') .write(selectors.ticketSales.firstSaleQuantity, '9\u000d')
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('The new quantity should be smaller than the old one'); expect(result).toEqual('The new quantity should be smaller than the old one');
@ -148,7 +146,7 @@ describe('Ticket Edit sale path', () => {
it('should remove 1 from quantity', async() => { it('should remove 1 from quantity', async() => {
const result = await nightmare const result = await nightmare
.waitToClick(selectors.ticketSales.firstSaleQuantityClearInput) .waitToClick(selectors.ticketSales.firstSaleQuantityClearInput)
.type(selectors.ticketSales.firstSaleQuantity, '4\u000d') .write(selectors.ticketSales.firstSaleQuantity, '4\u000d')
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');
@ -157,9 +155,8 @@ describe('Ticket Edit sale path', () => {
it('should update the price', async() => { it('should update the price', async() => {
const result = await nightmare const result = await nightmare
.waitToClick(selectors.ticketSales.firstSalePrice) .waitToClick(selectors.ticketSales.firstSalePrice)
.wait(selectors.ticketSales.firstSalePriceInput) .write(selectors.ticketSales.firstSalePriceInput, 5)
.type(selectors.ticketSales.firstSalePriceInput, 5) .write('body', '\u000d') // simulates enter
.type('body', '\u000d') // simulates enter
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');
@ -183,8 +180,8 @@ describe('Ticket Edit sale path', () => {
const result = await nightmare const result = await nightmare
.waitToClick(selectors.ticketSales.firstSaleDiscount) .waitToClick(selectors.ticketSales.firstSaleDiscount)
.wait('vn-textfield[label="Discount"] > div[class="container selected"]') // a function selects the text after it's loaded .wait('vn-textfield[label="Discount"] > div[class="container selected"]') // a function selects the text after it's loaded
.type(selectors.ticketSales.firstSaleDiscountInput, 50) .write(selectors.ticketSales.firstSaleDiscountInput, 50)
.type('body', '\u000d') // simulates enter .write('body', '\u000d') // simulates enter
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('Data saved!');
@ -230,9 +227,8 @@ describe('Ticket Edit sale path', () => {
it('should search for the claim with id 4', async() => { it('should search for the claim with id 4', async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.claimsIndex.searchResult) .write(selectors.claimsIndex.searchClaimInput, 4)
.type(selectors.claimsIndex.searchClaimInput, 4) .waitToClick(selectors.claimsIndex.searchButton)
.click(selectors.claimsIndex.searchButton)
.waitForNumberOfElements(selectors.claimsIndex.searchResult, 1) .waitForNumberOfElements(selectors.claimsIndex.searchResult, 1)
.countElement(selectors.claimsIndex.searchResult); .countElement(selectors.claimsIndex.searchResult);
@ -252,9 +248,8 @@ describe('Ticket Edit sale path', () => {
it('should search the ticket', async() => { it('should search the ticket', async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.ticketsIndex.searchTicketInput) .write(selectors.ticketsIndex.searchTicketInput, 'id:16')
.type(selectors.ticketsIndex.searchTicketInput, 'id:16') .waitToClick(selectors.ticketsIndex.searchButton)
.click(selectors.ticketsIndex.searchButton)
.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1) .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1)
.countElement(selectors.ticketsIndex.searchResult); .countElement(selectors.ticketsIndex.searchResult);
@ -293,8 +288,7 @@ describe('Ticket Edit sale path', () => {
const result = await nightmare const result = await nightmare
.waitToClick(selectors.ticketSales.thirdSaleCheckbox) .waitToClick(selectors.ticketSales.thirdSaleCheckbox)
.waitToClick(selectors.ticketSales.transferSaleButton) .waitToClick(selectors.ticketSales.transferSaleButton)
.wait(selectors.ticketSales.moveToTicketInput) .write(selectors.ticketSales.moveToTicketInput, 2)
.type(selectors.ticketSales.moveToTicketInput, 2)
.waitToClick(selectors.ticketSales.moveToTicketButton) .waitToClick(selectors.ticketSales.moveToTicketButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
@ -304,7 +298,7 @@ describe('Ticket Edit sale path', () => {
it('should transfer the sale to a valid ticket', async() => { it('should transfer the sale to a valid ticket', async() => {
const result = await nightmare const result = await nightmare
.waitToClick(selectors.ticketSales.moveToTicketInputClearButton) .waitToClick(selectors.ticketSales.moveToTicketInputClearButton)
.type(selectors.ticketSales.moveToTicketInput, 12) .write(selectors.ticketSales.moveToTicketInput, 12)
.waitToClick(selectors.ticketSales.moveToTicketButton) .waitToClick(selectors.ticketSales.moveToTicketButton)
.waitForURL('ticket/12/sale') .waitForURL('ticket/12/sale')
.parsedUrl(); .parsedUrl();
@ -323,9 +317,8 @@ describe('Ticket Edit sale path', () => {
it('should go back to the original ticket sales section', async() => { it('should go back to the original ticket sales section', async() => {
const url = await nightmare const url = await nightmare
.waitToClick(selectors.itemsIndex.goBackToModuleIndexButton) .waitToClick(selectors.itemsIndex.goBackToModuleIndexButton)
.wait(selectors.ticketsIndex.searchTicketInput) .write(selectors.ticketsIndex.searchTicketInput, 'id:16')
.type(selectors.ticketsIndex.searchTicketInput, 'id:16') .waitToClick(selectors.ticketsIndex.searchButton)
.click(selectors.ticketsIndex.searchButton)
.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1) .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1)
.waitForTextInElement(selectors.ticketsIndex.searchResult, 'address 21') .waitForTextInElement(selectors.ticketsIndex.searchResult, 'address 21')
.waitToClick(selectors.ticketsIndex.searchResult) .waitToClick(selectors.ticketsIndex.searchResult)
@ -347,9 +340,8 @@ describe('Ticket Edit sale path', () => {
it('should go back to the receiver ticket sales section', async() => { it('should go back to the receiver ticket sales section', async() => {
const url = await nightmare const url = await nightmare
.waitToClick(selectors.itemsIndex.goBackToModuleIndexButton) .waitToClick(selectors.itemsIndex.goBackToModuleIndexButton)
.wait(selectors.ticketsIndex.searchTicketInput) .write(selectors.ticketsIndex.searchTicketInput, 'id:12')
.type(selectors.ticketsIndex.searchTicketInput, 'id:12') .waitToClick(selectors.ticketsIndex.searchButton)
.click(selectors.ticketsIndex.searchButton)
.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1) .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1)
.waitForTextInElement(selectors.ticketsIndex.searchResult, 'address 21') .waitForTextInElement(selectors.ticketsIndex.searchResult, 'address 21')
.waitToClick(selectors.ticketsIndex.searchResult) .waitToClick(selectors.ticketsIndex.searchResult)
@ -364,8 +356,7 @@ describe('Ticket Edit sale path', () => {
const result = await nightmare const result = await nightmare
.waitToClick(selectors.ticketSales.firstSaleCheckbox) .waitToClick(selectors.ticketSales.firstSaleCheckbox)
.waitToClick(selectors.ticketSales.transferSaleButton) .waitToClick(selectors.ticketSales.transferSaleButton)
.wait(selectors.ticketSales.moveToTicketInput) .write(selectors.ticketSales.moveToTicketInput, 16)
.type(selectors.ticketSales.moveToTicketInput, 16)
.waitToClick(selectors.ticketSales.moveToTicketButton) .waitToClick(selectors.ticketSales.moveToTicketButton)
.waitForURL('ticket/16/sale') .waitForURL('ticket/16/sale')
.parsedUrl(); .parsedUrl();
@ -384,9 +375,8 @@ describe('Ticket Edit sale path', () => {
it('should now go back to the original ticket sales section', async() => { it('should now go back to the original ticket sales section', async() => {
const url = await nightmare const url = await nightmare
.waitToClick(selectors.itemsIndex.goBackToModuleIndexButton) .waitToClick(selectors.itemsIndex.goBackToModuleIndexButton)
.wait(selectors.ticketsIndex.searchTicketInput) .write(selectors.ticketsIndex.searchTicketInput, 'id:8')
.type(selectors.ticketsIndex.searchTicketInput, 'id:8') .waitToClick(selectors.ticketsIndex.searchButton)
.click(selectors.ticketsIndex.searchButton)
.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1) .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1)
.waitForTextInElement(selectors.ticketsIndex.searchResult, 'address 24') .waitForTextInElement(selectors.ticketsIndex.searchResult, 'address 24')
.waitToClick(selectors.ticketsIndex.searchResult) .waitToClick(selectors.ticketsIndex.searchResult)
@ -402,6 +392,7 @@ describe('Ticket Edit sale path', () => {
.waitToClick(selectors.ticketSales.firstSaleCheckbox) .waitToClick(selectors.ticketSales.firstSaleCheckbox)
.waitToClick(selectors.ticketSales.transferSaleButton) .waitToClick(selectors.ticketSales.transferSaleButton)
.waitToClick(selectors.ticketSales.moveToNewTicketButton) .waitToClick(selectors.ticketSales.moveToNewTicketButton)
.resetLogin()
.waitForLogin('salesPerson') .waitForLogin('salesPerson')
.waitToClick(selectors.globalItems.applicationsMenuButton) .waitToClick(selectors.globalItems.applicationsMenuButton)
.wait(selectors.globalItems.applicationsMenuVisible) .wait(selectors.globalItems.applicationsMenuVisible)
@ -414,9 +405,8 @@ describe('Ticket Edit sale path', () => {
it('should search for a specific created ticket', async() => { it('should search for a specific created ticket', async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.ticketsIndex.searchTicketInput) .write(selectors.ticketsIndex.searchTicketInput, 'nickname:(address 24) stateFk:2')
.type(selectors.ticketsIndex.searchTicketInput, 'nickname:(address 24) stateFk:2') .waitToClick(selectors.ticketsIndex.searchButton)
.click(selectors.ticketsIndex.searchButton)
.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1) .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1)
.countElement(selectors.ticketsIndex.searchResult); .countElement(selectors.ticketsIndex.searchResult);
@ -475,9 +465,8 @@ describe('Ticket Edit sale path', () => {
.waitToClick(selectors.ticketSales.selectAllSalesCheckbox) .waitToClick(selectors.ticketSales.selectAllSalesCheckbox)
.waitToClick(selectors.ticketSales.moreMenuButton) .waitToClick(selectors.ticketSales.moreMenuButton)
.waitToClick(selectors.ticketSales.moreMenuUpdateDiscount) .waitToClick(selectors.ticketSales.moreMenuUpdateDiscount)
.wait(selectors.ticketSales.moreMenuUpdateDiscountInput) .write(selectors.ticketSales.moreMenuUpdateDiscountInput, 100)
.type(selectors.ticketSales.moreMenuUpdateDiscountInput, 100) .write('body', '\u000d') // simulates enter
.type('body', '\u000d') // simulates enter
.waitForTextInElement(selectors.ticketSales.totalImport, '0.00') .waitForTextInElement(selectors.ticketSales.totalImport, '0.00')
.waitToGetProperty(selectors.ticketSales.totalImport, 'innerText'); .waitToGetProperty(selectors.ticketSales.totalImport, 'innerText');
@ -499,9 +488,8 @@ describe('Ticket Edit sale path', () => {
it('should now search for a specific ticket', async() => { it('should now search for a specific ticket', async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.ticketsIndex.searchTicketInput) .write(selectors.ticketsIndex.searchTicketInput, 'id:16')
.type(selectors.ticketsIndex.searchTicketInput, 'id:16') .waitToClick(selectors.ticketsIndex.searchButton)
.click(selectors.ticketsIndex.searchButton)
.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1) .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1)
.countElement(selectors.ticketsIndex.searchResult); .countElement(selectors.ticketsIndex.searchResult);
@ -531,7 +519,7 @@ describe('Ticket Edit sale path', () => {
it(`should set the state of the ticket to preparation`, async() => { it(`should set the state of the ticket to preparation`, async() => {
const url = await nightmare const url = await nightmare
.autocompleteSearch(selectors.ticketTracking.stateAutocomplete, 'Preparación') .autocompleteSearch(selectors.ticketTracking.stateAutocomplete, 'Preparación')
.click(selectors.ticketTracking.saveButton) .waitToClick(selectors.ticketTracking.saveButton)
.waitForURL('/tracking/index') .waitForURL('/tracking/index')
.parsedUrl(); .parsedUrl();
@ -587,9 +575,8 @@ describe('Ticket Edit sale path', () => {
it('should once again search for a specific ticket', async() => { it('should once again search for a specific ticket', async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.ticketsIndex.searchTicketInput) .write(selectors.ticketsIndex.searchTicketInput, 'id:16')
.type(selectors.ticketsIndex.searchTicketInput, 'id:16') .waitToClick(selectors.ticketsIndex.searchButton)
.click(selectors.ticketsIndex.searchButton)
.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1) .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1)
.countElement(selectors.ticketsIndex.searchResult); .countElement(selectors.ticketsIndex.searchResult);

10
e2e/paths/ticket-module/09_ticket_weekly.spec.js
View File

@ -32,9 +32,8 @@ describe('Ticket descriptor path', () => {
it('should search for the ticket 11', async() => { it('should search for the ticket 11', async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.ticketsIndex.searchTicketInput) .write(selectors.ticketsIndex.searchTicketInput, 'id:11')
.type(selectors.ticketsIndex.searchTicketInput, 'id:11') .waitToClick(selectors.ticketsIndex.searchButton)
.click(selectors.ticketsIndex.searchButton)
.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1) .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1)
.countElement(selectors.ticketsIndex.searchResult); .countElement(selectors.ticketsIndex.searchResult);
@ -93,9 +92,8 @@ describe('Ticket descriptor path', () => {
it('should now search for the ticket 11', async() => { it('should now search for the ticket 11', async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.ticketsIndex.searchTicketInput) .write(selectors.ticketsIndex.searchTicketInput, 'id:11')
.type(selectors.ticketsIndex.searchTicketInput, 'id:11') .waitToClick(selectors.ticketsIndex.searchButton)
.click(selectors.ticketsIndex.searchButton)
.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1) .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1)
.countElement(selectors.ticketsIndex.searchResult); .countElement(selectors.ticketsIndex.searchResult);

7
e2e/paths/ticket-module/10_ticket_request.spec.js
View File

@ -14,12 +14,11 @@ describe('Ticket purchase request path', () => {
it(`should add a new request`, async() => { it(`should add a new request`, async() => {
const result = await nightmare const result = await nightmare
.waitToClick(selectors.ticketRequests.addRequestButton) .waitToClick(selectors.ticketRequests.addRequestButton)
.wait(selectors.ticketRequests.descriptionInput) .write(selectors.ticketRequests.descriptionInput, 'New stuff')
.type(selectors.ticketRequests.descriptionInput, 'New stuff') .write(selectors.ticketRequests.quantityInput, 99)
.type(selectors.ticketRequests.quantityInput, 99)
.waitToClick(selectors.ticketRequests.atenderSelect) .waitToClick(selectors.ticketRequests.atenderSelect)
.waitToClick(selectors.ticketRequests.atenderSelectSecondOption) .waitToClick(selectors.ticketRequests.atenderSelectSecondOption)
.type(selectors.ticketRequests.priceInput, 999) .write(selectors.ticketRequests.priceInput, 999)
.waitToClick(selectors.ticketRequests.saveButton) .waitToClick(selectors.ticketRequests.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();

5
e2e/paths/ticket-module/11_ticket_diary.spec.js
View File

@ -12,9 +12,8 @@ describe('Ticket diary path', () => {
it('should search for a specific ticket', async() => { it('should search for a specific ticket', async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.ticketsIndex.searchTicketInput) .write(selectors.ticketsIndex.searchTicketInput, 'id:1')
.type(selectors.ticketsIndex.searchTicketInput, 'id:1') .waitToClick(selectors.ticketsIndex.searchButton)
.click(selectors.ticketsIndex.searchButton)
.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1) .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1)
.countElement(selectors.ticketsIndex.searchResult); .countElement(selectors.ticketsIndex.searchResult);

10
e2e/paths/ticket-module/12_delete_ticket_from_descriptor.spec.js
View File

@ -11,9 +11,8 @@ describe('Ticket descriptor path', () => {
it('should search for a specific ticket', async() => { it('should search for a specific ticket', async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.ticketsIndex.searchTicketInput) .write(selectors.ticketsIndex.searchTicketInput, 'id:17')
.type(selectors.ticketsIndex.searchTicketInput, 'id:17') .waitToClick(selectors.ticketsIndex.searchButton)
.click(selectors.ticketsIndex.searchButton)
.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1) .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1)
.countElement(selectors.ticketsIndex.searchResult); .countElement(selectors.ticketsIndex.searchResult);
@ -49,9 +48,8 @@ describe('Ticket descriptor path', () => {
it(`should search for the deleted ticket and check it's date`, async() => { it(`should search for the deleted ticket and check it's date`, async() => {
const result = await nightmare const result = await nightmare
.wait(selectors.ticketsIndex.searchTicketInput) .write(selectors.ticketsIndex.searchTicketInput, 'id:17')
.type(selectors.ticketsIndex.searchTicketInput, 'id:17') .waitToClick(selectors.ticketsIndex.searchButton)
.click(selectors.ticketsIndex.searchButton)
.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1) .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1)
.wait(selectors.ticketsIndex.searchResultDate) .wait(selectors.ticketsIndex.searchResultDate)
.waitToGetProperty(selectors.ticketsIndex.searchResultDate, 'innerText'); .waitToGetProperty(selectors.ticketsIndex.searchResultDate, 'innerText');

14
e2e/paths/ticket-module/13_create_ticket_services.spec.js
View File

@ -24,14 +24,17 @@ describe('Ticket services path', () => {
.waitToClick(selectors.ticketService.saveServiceButton) .waitToClick(selectors.ticketService.saveServiceButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('¡Datos guardados!');
// #1051 Traducciones que fallan
// expect(result).toEqual('Data saved!');
}); });
it('should confirm the service description was edited correctly', async() => { it('should confirm the service description was edited correctly', async() => {
const result = await nightmare const result = await nightmare
.waitToClick(selectors.ticketBasicData.basicDataButton) .waitToClick(selectors.ticketBasicData.basicDataButton)
.wait(selectors.ticketBasicData.clientAutocomplete) .wait(selectors.ticketBasicData.clientAutocomplete)
.click(selectors.ticketService.serviceButton) .waitToClick(selectors.ticketService.serviceButton)
.waitToGetProperty(selectors.ticketService.firstDescriptionInput, 'value'); .waitToGetProperty(selectors.ticketService.firstDescriptionInput, 'value');
expect(result).toEqual('my service'); expect(result).toEqual('my service');
@ -64,14 +67,17 @@ describe('Ticket services path', () => {
.waitToClick(selectors.ticketService.saveServiceButton) .waitToClick(selectors.ticketService.saveServiceButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('¡Datos guardados!');
// #1051 Traducciones que fallan
// expect(result).toEqual('Data saved!');
}); });
it('should confirm the service was sucessfully removed', async() => { it('should confirm the service was sucessfully removed', async() => {
const result = await nightmare const result = await nightmare
.waitToClick(selectors.ticketBasicData.basicDataButton) .waitToClick(selectors.ticketBasicData.basicDataButton)
.wait(selectors.ticketBasicData.clientAutocomplete) .wait(selectors.ticketBasicData.clientAutocomplete)
.click(selectors.ticketService.serviceButton) .waitToClick(selectors.ticketService.serviceButton)
.waitForNumberOfElements(selectors.ticketService.serviceLine, 0) .waitForNumberOfElements(selectors.ticketService.serviceLine, 0)
.countElement(selectors.ticketService.serviceLine); .countElement(selectors.ticketService.serviceLine);

7
e2e/paths/ticket-module/14_create_ticket.spec.js
View File

@ -31,7 +31,7 @@ describe('Ticket create path', () => {
expect(result).toEqual(`You can't create a ticket for a inactive client`); expect(result).toEqual(`You can't create a ticket for a inactive client`);
}); });
it('should suceed to create a ticket for a valid client', async() => { it('should succeed to create a ticket for a valid client', async() => {
const result = await nightmare const result = await nightmare
.autocompleteSearch(selectors.createTicketView.clientAutocomplete, 'Tony Stark') .autocompleteSearch(selectors.createTicketView.clientAutocomplete, 'Tony Stark')
.autocompleteSearch(selectors.createTicketView.addressAutocomplete, 'Tony Stark') .autocompleteSearch(selectors.createTicketView.addressAutocomplete, 'Tony Stark')
@ -41,7 +41,10 @@ describe('Ticket create path', () => {
.waitToClick(selectors.createTicketView.createButton) .waitToClick(selectors.createTicketView.createButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('Data saved!'); expect(result).toEqual('¡Datos guardados!');
// #1051 Traducciones que fallan
// expect(result).toEqual('Data saved!');
}); });
it('should check the url is now the summary of the ticket', async() => { it('should check the url is now the summary of the ticket', async() => {

2
e2e/smokes/01_client_path.spec.js
View File

@ -11,7 +11,7 @@ describe('create client path', () => {
it('should access to the create client view by clicking the create-client floating button', async() => { it('should access to the create client view by clicking the create-client floating button', async() => {
let url = await nightmare let url = await nightmare
.click(selectors.clientsIndex.createClientButton) .waitToClick(selectors.clientsIndex.createClientButton)
.wait(selectors.createClientView.createButton) .wait(selectors.createClientView.createButton)
.parsedUrl(); .parsedUrl();

12
front/core/components/dialog/style.scss
View File

@ -33,17 +33,12 @@
display: block; display: block;
width: 20em; width: 20em;
} }
button, & > button.close {
input[type="button"],
input[type="submit"],
input[type="reset"] {
@extend %clickable; @extend %clickable;
text-transform: uppercase; text-transform: uppercase;
background-color: transparent; background-color: transparent;
border: none; border: none;
border-radius: .1em; border-radius: .1em;
}
& > button.close {
position: absolute; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
@ -62,6 +57,11 @@
input[type="button"], input[type="button"],
input[type="submit"], input[type="submit"],
input[type="reset"] { input[type="reset"] {
@extend %clickable;
text-transform: uppercase;
background-color: transparent;
border: none;
border-radius: .1em;
color: $main-01; color: $main-01;
font-family: vn-font-bold; font-family: vn-font-bold;
padding: .7em; padding: .7em;

2
front/core/components/fetched-tags/index.html
View File

@ -1,5 +1,5 @@
<vn-horizontal> <vn-horizontal>
<vn-one>{{::$ctrl.item.name}}</vn-one> <vn-one>{{::$ctrl.title}}</vn-one>
<vn-auto> <vn-auto>
<section <section
class="inline-tag ellipsize" class="inline-tag ellipsize"

3
front/core/components/fetched-tags/index.js
View File

@ -49,6 +49,7 @@ ngModule.component('vnFetchedTags', {
controller: FetchedTags, controller: FetchedTags,
bindings: { bindings: {
maxLength: '<', maxLength: '<',
item: '<' item: '<',
title: '<'
} }
}); });

38
gulpfile.js
View File

@ -59,7 +59,9 @@ function backOnly(done) {
} }
backOnly.description = `Starts backend service`; backOnly.description = `Starts backend service`;
function backTestsOnly() { // backend tests
function backTestOnly() {
serviceRoot = 'vn-loopback'; serviceRoot = 'vn-loopback';
let app = require(`./loopback/server/server`); let app = require(`./loopback/server/server`);
@ -71,16 +73,30 @@ function backTestsOnly() {
specFiles.push(`./modules/${mod}/back/**/*.spec.js`); specFiles.push(`./modules/${mod}/back/**/*.spec.js`);
const jasmine = require('gulp-jasmine'); const jasmine = require('gulp-jasmine');
const reporters = require('jasmine-reporters');
let options = {errorOnFail: false};
if (argv.junit || argv.j)
options.reporter = new reporters.JUnitXmlReporter();
return gulp.src(specFiles) return gulp.src(specFiles)
.pipe(jasmine({errorOnFail: false})) .pipe(jasmine(options))
.on('jasmineDone', function() { .on('jasmineDone', function() {
app.disconnect(); app.disconnect();
}); });
} }
backTestsOnly.description = `Runs the backend tests only`; backTestOnly.description = `Runs the backend tests only, can receive args --junit or -j to save reports on a xml file`;
const backTests = gulp.series(docker, backTestsOnly); const backendTest = gulp.series(docker, backTestOnly);
backTests.description = `Restarts database and runs the backend tests`; backendTest.description = `Restarts database and runs the backend tests`;
const backTest = gulp.parallel(backendTest, done => {
gulp.watch('modules', gulp.series(backendTest));
done();
});
backTest.description = `Watches for changes in modules to execute backendTest task`;
// end to end tests
function e2eOnly() { function e2eOnly() {
const jasmine = require('gulp-jasmine'); const jasmine = require('gulp-jasmine');
@ -113,13 +129,7 @@ function install() {
const install = require('gulp-install'); const install = require('gulp-install');
const print = require('gulp-print'); const print = require('gulp-print');
let packageFiles = ['front/package.json']; let packageFiles = ['front/package.json', 'print/package.json'];
let services = fs.readdirSync(servicesDir);
services.forEach(service => {
let packageJson = `${servicesDir}/${service}/package.json`;
if (fs.existsSync(packageJson))
packageFiles.push(packageJson);
});
return gulp.src(packageFiles) return gulp.src(packageFiles)
.pipe(print(filepath => { .pipe(print(filepath => {
return `Installing packages in ${filepath}`; return `Installing packages in ${filepath}`;
@ -467,8 +477,8 @@ module.exports = {
front, front,
back, back,
backOnly, backOnly,
backTestsOnly, backTestOnly,
backTests, backTest,
e2eOnly, e2eOnly,
e2e, e2e,
smokesOnly, smokesOnly,

2
loopback/common/methods/vn-model/specs/crud.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('Model crud()', () => { describe('Model crud()', () => {
let insertId; let insertId;

2
loopback/common/methods/vn-model/specs/getSetValues.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('Model getSetValues()', () => { describe('Model getSetValues()', () => {
it('should extend getSetValues properties to any model passed', () => { it('should extend getSetValues properties to any model passed', () => {

2
loopback/common/methods/vn-model/specs/rewriteDbError.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('Model rewriteDbError()', () => { describe('Model rewriteDbError()', () => {
it('should extend rewriteDbError properties to any model passed', () => { it('should extend rewriteDbError properties to any model passed', () => {

4
loopback/locale/en.json
View File

@ -27,5 +27,7 @@
"Agency cannot be blank": "Agency cannot be blank", "Agency cannot be blank": "Agency cannot be blank",
"The IBAN does not have the correct format": "The IBAN does not have the correct format", "The IBAN does not have the correct format": "The IBAN does not have the correct format",
"You can't make changes on the basic data of an confirmed order or with rows": "You can't make changes on the basic data of an confirmed order or with rows", "You can't make changes on the basic data of an confirmed order or with rows": "You can't make changes on the basic data of an confirmed order or with rows",
"You can't create a ticket for a inactive client": "You can't create a ticket for a inactive client" "You can't create a ticket for a inactive client": "You can't create a ticket for a inactive client",
"Worker cannot be blank": "Worker cannot be blank",
"You don't have enough privileges to change the state of this ticket": "You don't have enough privileges to change the state of this ticket"
} }

5
loopback/locale/es.json
View File

@ -18,6 +18,7 @@
"That payment method requires an IBAN": "El método de pago seleccionado requiere un IBAN", "That payment method requires an IBAN": "El método de pago seleccionado requiere un IBAN",
"That payment method requires a BIC": "El método de pago seleccionado requiere un BIC", "That payment method requires a BIC": "El método de pago seleccionado requiere un BIC",
"State cannot be blank": "El estado no puede estar en blanco", "State cannot be blank": "El estado no puede estar en blanco",
"Worker cannot be blank": "El trabajador no puede estar en blanco",
"Cannot change the payment method if no salesperson": "No se puede cambiar la forma de pago si no hay comercial asignado", "Cannot change the payment method if no salesperson": "No se puede cambiar la forma de pago si no hay comercial asignado",
"can't be blank": "El campo no puede estar vacío", "can't be blank": "El campo no puede estar vacío",
"Observation type cannot be blank": "El tipo de observación no puede estar en blanco", "Observation type cannot be blank": "El tipo de observación no puede estar en blanco",
@ -62,5 +63,7 @@
"Cannot check VIES and Equalization Tax": "No puedes marcar VIES y RE al mismo", "Cannot check VIES and Equalization Tax": "No puedes marcar VIES y RE al mismo",
"Cannot check Equalization Tax in this NIF/CIF": "No se puede marcar RE en este NIF/CIF", "Cannot check Equalization Tax in this NIF/CIF": "No se puede marcar RE en este NIF/CIF",
"You can't make changes on the basic data of an confirmed order or with rows": "No puedes cambiar los datos basicos de una orden con artículos", "You can't make changes on the basic data of an confirmed order or with rows": "No puedes cambiar los datos basicos de una orden con artículos",
"INVALID_USER_NAME": "El nombre de usuario solo debe contener letras minúsculas o, a partir del segundo carácter, números o subguiones, no esta permitido el uso de la letra ñ" "INVALID_USER_NAME": "El nombre de usuario solo debe contener letras minúsculas o, a partir del segundo carácter, números o subguiones, no esta permitido el uso de la letra ñ",
"You can't create a ticket for a frozen client": "No puedes crear un ticket para un cliente congelado",
"You can't create a ticket for a inactive client": "No puedes crear un ticket para un cliente inactivo"
} }

3
loopback/server/boot/print.js Normal file
View File

@ -0,0 +1,3 @@
module.exports = function(app) {
require('../../../print/server.js')(app);
};

2
modules/agency/front/index/index.html
View File

@ -31,7 +31,7 @@
</vn-tr> </vn-tr>
</vn-thead> </vn-thead>
<vn-tbody> <vn-tbody>
<vn-tr ng-repeat="zone in zones" ui-sref="zone.card.location({id: zone.id})" class=clickable> <vn-tr ng-repeat="zone in zones" ui-sref="zone.card.location({id: zone.id})" class="clickable searchResult">
<vn-td number>{{::zone.id}}</vn-td> <vn-td number>{{::zone.id}}</vn-td>
<vn-td>{{::zone.name}}</vn-td> <vn-td>{{::zone.name}}</vn-td>
<vn-td>{{::zone.agencyMode.name}}</vn-td> <vn-td>{{::zone.agencyMode.name}}</vn-td>

2
modules/claim/back/methods/claim-beginning/importToNewRefundTicket.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
// xcluded waiting for fixtures // xcluded waiting for fixtures
xdescribe('claimBeginning', () => { xdescribe('claimBeginning', () => {
let ticket; let ticket;

2
modules/claim/back/methods/claim-end/specs/importTicketSales.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('Claim importTicketSales()', () => { describe('Claim importTicketSales()', () => {
let claimEnds; let claimEnds;

2
modules/claim/back/methods/claim/specs/createFromSales.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('Claim Create', () => { describe('Claim Create', () => {
let newDate = new Date(); let newDate = new Date();

2
modules/claim/back/methods/claim/specs/getSummary.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('claim getSummary()', () => { describe('claim getSummary()', () => {
it('should return summary with claim, salesClaimed, developments and actions defined ', async() => { it('should return summary with claim, salesClaimed, developments and actions defined ', async() => {

2
modules/claim/back/methods/claim/specs/regularizeClaim.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
// xcluded waiting for fixtures // xcluded waiting for fixtures
xdescribe('regularizeClaim()', () => { xdescribe('regularizeClaim()', () => {
const claimFk = 1; const claimFk = 1;

2
modules/claim/back/methods/claim/specs/updateClaim.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('Update Claim', () => { describe('Update Claim', () => {
let newDate = new Date(); let newDate = new Date();

11
modules/claim/front/detail/index.html
View File

@ -47,7 +47,6 @@
<vn-td number> <vn-td number>
<vn-textfield <vn-textfield
vn-focus vn-focus
id="claimedQuantity"
model="saleClaimed.quantity" model="saleClaimed.quantity"
on-change="$ctrl.setClaimedQuantity(saleClaimed.id, saleClaimed.quantity)" on-change="$ctrl.setClaimedQuantity(saleClaimed.id, saleClaimed.quantity)"
type="text"> type="text">
@ -82,9 +81,12 @@
</a> </a>
</vn-vertical> </vn-vertical>
<!-- Add Lines Dialog --> <!-- Add Lines Dialog -->
<vn-dialog vn-id="add-sales"> <vn-dialog vn-id="add-sales" class="modal-form">
<tpl-body> <tpl-body>
<h3><span translate>Claimable sales from ticket</span> {{$ctrl.claim.ticketFk}}</h3> <vn-horizontal pad-medium class="header">
<h5><span translate>Claimable sales from ticket</span> {{$ctrl.claim.ticketFk}}</h5>
</vn-horizontal>
<vn-horizontal pad-medium>
<vn-table> <vn-table>
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>
@ -99,7 +101,7 @@
</vn-thead> </vn-thead>
<vn-tbody> <vn-tbody>
<vn-tr ng-repeat="sale in $ctrl.salesToClaim" class="clickable" ng-click="$ctrl.addClaimedSale($index)"> <vn-tr ng-repeat="sale in $ctrl.salesToClaim" class="clickable" ng-click="$ctrl.addClaimedSale($index)">
<vn-td number>{{sale.saleFk}} {{$index}}</vn-td> <vn-td number>{{sale.saleFk}}</vn-td>
<vn-td number>{{sale.landed | dateTime: 'dd/MM/yyyy'}}</vn-td> <vn-td number>{{sale.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
<vn-td number>{{sale.quantity}}</vn-td> <vn-td number>{{sale.quantity}}</vn-td>
<vn-td number>{{sale.concept}}</vn-td> <vn-td number>{{sale.concept}}</vn-td>
@ -114,6 +116,7 @@
No results No results
</vn-empty-rows> </vn-empty-rows>
</vn-table> </vn-table>
</vn-horizontal>
</tpl-body> </tpl-body>
</vn-dialog> </vn-dialog>
<vn-item-descriptor-popover <vn-item-descriptor-popover

19
modules/claim/front/detail/index.js
View File

@ -24,6 +24,17 @@ class Controller {
}; };
} }
set salesClaimed(value) {
this._salesClaimed = value;
if (value)
this.calculateTotals();
}
get salesClaimed() {
return this._salesClaimed;
}
openAddSalesDialog() { openAddSalesDialog() {
this.getClaimableFromTicket(); this.getClaimableFromTicket();
this.$.addSales.show(); this.$.addSales.show();
@ -71,9 +82,9 @@ class Controller {
calculateTotals() { calculateTotals() {
this.paidTotal = 0.0; this.paidTotal = 0.0;
this.claimedTotal = 0.0; this.claimedTotal = 0.0;
if (!this.salesClaimed) return; if (!this._salesClaimed) return;
this.salesClaimed.forEach(sale => { this._salesClaimed.forEach(sale => {
let orgSale = sale.sale; let orgSale = sale.sale;
this.paidTotal += this.getSaleTotal(orgSale); this.paidTotal += this.getSaleTotal(orgSale);
this.claimedTotal += sale.quantity * orgSale.price - ((orgSale.discount * (sale.quantity * orgSale.price)) / 100); this.claimedTotal += sale.quantity * orgSale.price - ((orgSale.discount * (sale.quantity * orgSale.price)) / 100);
@ -81,7 +92,9 @@ class Controller {
} }
getSaleTotal(sale) { getSaleTotal(sale) {
return sale.quantity * sale.price - ((100 - sale.discount) / 100); let total = 0.0;
total += sale.quantity * sale.price - ((sale.discount * (sale.quantity * sale.price)) / 100);
return total;
} }
// Item Descriptor // Item Descriptor

2
modules/claim/front/index/index.html
View File

@ -33,7 +33,7 @@
<vn-tbody> <vn-tbody>
<a <a
ng-repeat="claim in claims" ng-repeat="claim in claims"
class="{{::$ctrl.compareDate(ticket.shipped)}} clickable vn-tr" class="{{::$ctrl.compareDate(ticket.shipped)}} clickable vn-tr searchResult"
ui-sref="claim.card.summary({id: claim.id})"> ui-sref="claim.card.summary({id: claim.id})">
<vn-td number>{{::claim.id}}</vn-td> <vn-td number>{{::claim.id}}</vn-td>
<vn-td> <vn-td>

2
modules/client/back/methods/client/specs/activeWorkersWithRole.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('Client activeWorkersWithRole', () => { describe('Client activeWorkersWithRole', () => {
it('should return the sales people as result', async() => { it('should return the sales people as result', async() => {

2
modules/client/back/methods/client/specs/addressesPropagateRe.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('Client addressesPropagateRe', () => { describe('Client addressesPropagateRe', () => {
let client; let client;

2
modules/client/back/methods/client/specs/confirmTransaction.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('Client confirmTransaction', () => { describe('Client confirmTransaction', () => {
const transactionId = 2; const transactionId = 2;

2
modules/client/back/methods/client/specs/createWithUser.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('Client Create', () => { describe('Client Create', () => {
const clientName = 'Wade'; const clientName = 'Wade';

2
modules/client/back/methods/client/specs/getAverageInvoiced.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('client getAverageInvoiced()', () => { describe('client getAverageInvoiced()', () => {
it('should call the getAverageInvoiced method', done => { it('should call the getAverageInvoiced method', done => {

2
modules/client/back/methods/client/specs/getCard.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('Client card', () => { describe('Client card', () => {
it('should call the card() method to receive a formated card of Bruce Wayne', async() => { it('should call the card() method to receive a formated card of Bruce Wayne', async() => {

2
modules/client/back/methods/client/specs/getDebt.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
xdescribe('client getDebt()', () => { xdescribe('client getDebt()', () => {
it('should return the client debt', async () => { it('should return the client debt', async () => {

2
modules/client/back/methods/client/specs/getMana.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('client getMana()', () => { describe('client getMana()', () => {
it('should call the getMana method', async() => { it('should call the getMana method', async() => {

2
modules/client/back/methods/client/specs/getTransactions.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('Client getTransations', () => { describe('Client getTransations', () => {
it('should call getTransations() method to receive a list of Web Payments from Bruce Wayne', async() => { it('should call getTransations() method to receive a list of Web Payments from Bruce Wayne', async() => {

2
modules/client/back/methods/client/specs/hasCustomerRole.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('Client hasCustomerRole', () => { describe('Client hasCustomerRole', () => {
it('should call the hasCustomerRole() method with a customer id', done => { it('should call the hasCustomerRole() method with a customer id', done => {

2
modules/client/back/methods/client/specs/isValidClient.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('Client isValidClient', () => { describe('Client isValidClient', () => {
it('should call the isValidClient() method with a client id and receive true', done => { it('should call the isValidClient() method with a client id and receive true', done => {

2
modules/client/back/methods/client/specs/listWorkers.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('Client listWorkers', () => { describe('Client listWorkers', () => {
it('should call the listWorkers()', done => { it('should call the listWorkers()', done => {

2
modules/client/back/methods/client/specs/summary.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('client summary()', () => { describe('client summary()', () => {
it('should return a summary object containing data', async() => { it('should return a summary object containing data', async() => {

2
modules/client/back/methods/client/specs/updateFiscalData.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('Client updateFiscalData', () => { describe('Client updateFiscalData', () => {
afterAll(async() => { afterAll(async() => {

2
modules/client/back/methods/credit-classification/createWithInsurance.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('Client createWithInsurance', () => { describe('Client createWithInsurance', () => {
let classificationId; let classificationId;

2
modules/client/back/methods/receipt/specs/filter.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('receipt filter()', () => { describe('receipt filter()', () => {
it('should call the filter method', async () => { it('should call the filter method', async () => {

2
modules/client/back/models/specs/address.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('loopback model address', () => { describe('loopback model address', () => {
let createdAddressId; let createdAddressId;

2
modules/client/front/billing-data/index.js
View File

@ -35,7 +35,7 @@ export default class Controller {
} }
notifyChanges() { notifyChanges() {
this.$http.get(`/mailer/notification/payment-update/${this.client.id}`).then( this.$http.post(`/email/payment-update`, {clientFk: this.client.id}).then(
() => this.vnApp.showMessage(this.$translate.instant('Notification sent!')) () => this.vnApp.showMessage(this.$translate.instant('Notification sent!'))
); );
} }

4
modules/client/front/billing-data/index.spec.js
View File

@ -30,8 +30,8 @@ describe('Client', () => {
expect(controller.notifyChanges).toHaveBeenCalledWith(); expect(controller.notifyChanges).toHaveBeenCalledWith();
}); });
}); });
// Excluded due mailer changes #1001
describe('notifyChanges()', () => { xdescribe('notifyChanges()', () => {
it(`should perform a GET query`, () => { it(`should perform a GET query`, () => {
$httpBackend.when('GET', `/mailer/notification/payment-update/101`).respond(true); $httpBackend.when('GET', `/mailer/notification/payment-update/101`).respond(true);
$httpBackend.expect('GET', `/mailer/notification/payment-update/101`); $httpBackend.expect('GET', `/mailer/notification/payment-update/101`);

1
modules/client/front/index/index.html
View File

@ -18,6 +18,7 @@
</vn-card> </vn-card>
<vn-card margin-medium-v> <vn-card margin-medium-v>
<vn-item-client <vn-item-client
class="searchResult"
ng-repeat="client in clients track by client.id" ng-repeat="client in clients track by client.id"
client="::client"> client="::client">
</vn-item-client> </vn-item-client>

2
modules/item/back/methods/item-tag/specs/filterItemTags.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('item filterItemTags()', () => { describe('item filterItemTags()', () => {
it('should filter ItemTags table', async () => { it('should filter ItemTags table', async () => {

2
modules/item/back/methods/item/specs/clone.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('item clone()', () => { describe('item clone()', () => {
let nextItemId; let nextItemId;

2
modules/item/back/methods/item/specs/filter.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('item filter()', () => { describe('item filter()', () => {
it('should return 1 result using filter and tags', async() => { it('should return 1 result using filter and tags', async() => {

2
modules/item/back/methods/item/specs/getDiary.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('item getShipped()', () => { describe('item getShipped()', () => {
it('should return 3 entries, the first one with the property balance -100', async() => { it('should return 3 entries, the first one with the property balance -100', async() => {

2
modules/item/back/methods/item/specs/getLastEntries.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('item getLastEntries()', () => { describe('item getLastEntries()', () => {
it('should return one entry for a given item', async () => { it('should return one entry for a given item', async () => {

2
modules/item/back/methods/item/specs/getSummary.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('item getSummary()', () => { describe('item getSummary()', () => {
it('should return summary with item, tags, botanical, niches, available and visible defined ', async() => { it('should return summary with item, tags, botanical, niches, available and visible defined ', async() => {

2
modules/item/back/methods/item/specs/new.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('item new()', () => { describe('item new()', () => {
let item; let item;

2
modules/item/back/methods/item/specs/regularize.spec.js
View File

@ -1,4 +1,4 @@
const app = require(`${serviceRoot}/server/server`); const app = require('vn-loopback/server/server');
describe('regularize()', () => { describe('regularize()', () => {
const itemFk = 1; const itemFk = 1;

Some files were not shown because too many files have changed in this diff Show More