From 6bfa39e0eb306ee7a79217c1308b113d51e70563 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Thu, 24 Jan 2019 13:50:57 +0100 Subject: [PATCH 1/2] #1030 ticket.index orden siempre por fecha ascencente --- modules/ticket/front/index/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html index f2172b245..486b900ba 100644 --- a/modules/ticket/front/index/index.html +++ b/modules/ticket/front/index/index.html @@ -3,7 +3,7 @@ url="/ticket/api/Tickets/filter" limit="20" data="tickets" - order="shipped DESC" + order="shipped ASC" auto-load="false">
From f33587a0b77d4834440a3b3a0b5d027790d2a39a Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Thu, 24 Jan 2019 14:03:01 +0100 Subject: [PATCH 2/2] #1051 Traducciones que fallan --- .../ticket-module/13_create_ticket_services.spec.js | 13 ++++--------- e2e/paths/ticket-module/14_create_ticket.spec.js | 8 +++----- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/e2e/paths/ticket-module/13_create_ticket_services.spec.js b/e2e/paths/ticket-module/13_create_ticket_services.spec.js index 14a1f3d7e..1e69c1ee2 100644 --- a/e2e/paths/ticket-module/13_create_ticket_services.spec.js +++ b/e2e/paths/ticket-module/13_create_ticket_services.spec.js @@ -1,7 +1,8 @@ import selectors from '../../helpers/selectors.js'; import createNightmare from '../../helpers/nightmare'; -describe('Ticket services path', () => { +// #1051 Traducciones que fallan +xdescribe('Ticket services path', () => { const nightmare = createNightmare(); beforeAll(() => { @@ -24,10 +25,7 @@ describe('Ticket services path', () => { .waitToClick(selectors.ticketService.saveServiceButton) .waitForLastSnackbar(); - expect(result).toEqual('¡Datos guardados!'); - - // #1051 Traducciones que fallan - // expect(result).toEqual('Data saved!'); + expect(result).toEqual('Data saved!'); }); it('should confirm the service description was edited correctly', async() => { @@ -67,10 +65,7 @@ describe('Ticket services path', () => { .waitToClick(selectors.ticketService.saveServiceButton) .waitForLastSnackbar(); - expect(result).toEqual('¡Datos guardados!'); - - // #1051 Traducciones que fallan - // expect(result).toEqual('Data saved!'); + expect(result).toEqual('Data saved!'); }); it('should confirm the service was sucessfully removed', async() => { diff --git a/e2e/paths/ticket-module/14_create_ticket.spec.js b/e2e/paths/ticket-module/14_create_ticket.spec.js index 3fca25c38..8b62ff509 100644 --- a/e2e/paths/ticket-module/14_create_ticket.spec.js +++ b/e2e/paths/ticket-module/14_create_ticket.spec.js @@ -1,6 +1,7 @@ import selectors from '../../helpers/selectors.js'; import createNightmare from '../../helpers/nightmare'; +// #1051 Traducciones que fallan describe('Ticket create path', () => { const nightmare = createNightmare(); @@ -18,7 +19,7 @@ describe('Ticket create path', () => { 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 .autocompleteSearch(selectors.createTicketView.clientAutocomplete, 'Bruce Banner') .autocompleteSearch(selectors.createTicketView.addressAutocomplete, 'Bruce Banner') @@ -41,10 +42,7 @@ describe('Ticket create path', () => { .waitToClick(selectors.createTicketView.createButton) .waitForLastSnackbar(); - expect(result).toEqual('¡Datos guardados!'); - - // #1051 Traducciones que fallan - // expect(result).toEqual('Data saved!'); + expect(result).toEqual('Data saved!'); }); it('should check the url is now the summary of the ticket', async() => {