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

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

This commit is contained in:
Bernat 2019-01-24 14:15:16 +01:00
parent 6f316d54b4 f33587a0b7
commit 31dc2bd5e2
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,8 @@
import selectors from '../../helpers/selectors.js'; import selectors from '../../helpers/selectors.js';
import createNightmare from '../../helpers/nightmare'; import createNightmare from '../../helpers/nightmare';
describe('Ticket services path', () => { // #1051 Traducciones que fallan
xdescribe('Ticket services path', () => {
const nightmare = createNightmare(); const nightmare = createNightmare();
beforeAll(() => { beforeAll(() => {
@ -24,10 +25,7 @@ describe('Ticket services path', () => {
.waitToClick(selectors.ticketService.saveServiceButton) .waitToClick(selectors.ticketService.saveServiceButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('¡Datos guardados!'); expect(result).toEqual('Data saved!');
// #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() => {
@ -67,10 +65,7 @@ describe('Ticket services path', () => {
.waitToClick(selectors.ticketService.saveServiceButton) .waitToClick(selectors.ticketService.saveServiceButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('¡Datos guardados!'); expect(result).toEqual('Data saved!');
// #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() => {

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

@ -1,6 +1,7 @@
import selectors from '../../helpers/selectors.js'; import selectors from '../../helpers/selectors.js';
import createNightmare from '../../helpers/nightmare'; import createNightmare from '../../helpers/nightmare';
// #1051 Traducciones que fallan
describe('Ticket create path', () => { describe('Ticket create path', () => {
const nightmare = createNightmare(); const nightmare = createNightmare();
@ -18,7 +19,7 @@ describe('Ticket create path', () => {
expect(url.hash).toEqual('#!/ticket/create'); expect(url.hash).toEqual('#!/ticket/create');
}); });
it('should atempt to create a ticket for a frozen client but fail', async() => { it('should attempt to create a ticket for a frozen client but fail', async() => {
const result = await nightmare const result = await nightmare
.autocompleteSearch(selectors.createTicketView.clientAutocomplete, 'Bruce Banner') .autocompleteSearch(selectors.createTicketView.clientAutocomplete, 'Bruce Banner')
.autocompleteSearch(selectors.createTicketView.addressAutocomplete, 'Bruce Banner') .autocompleteSearch(selectors.createTicketView.addressAutocomplete, 'Bruce Banner')
@ -41,10 +42,7 @@ describe('Ticket create path', () => {
.waitToClick(selectors.createTicketView.createButton) .waitToClick(selectors.createTicketView.createButton)
.waitForLastSnackbar(); .waitForLastSnackbar();
expect(result).toEqual('¡Datos guardados!'); expect(result).toEqual('Data saved!');
// #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
modules/ticket/front/index/index.html
View File

@ -3,7 +3,7 @@
url="/ticket/api/Tickets/filter" url="/ticket/api/Tickets/filter"
limit="20" limit="20"
data="tickets" data="tickets"
order="shipped DESC" order="shipped ASC"
auto-load="false"> auto-load="false">
</vn-crud-model> </vn-crud-model>
<div margin-medium> <div margin-medium>