From 92b916580e2d59382f57b055ba53af41638d5368 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 26 Oct 2021 10:20:35 +0200 Subject: [PATCH 1/3] feat(description): concat bank with tickets --- modules/client/front/balance/create/index.js | 4 +++- modules/client/front/balance/create/index.spec.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/client/front/balance/create/index.js b/modules/client/front/balance/create/index.js index e78a9c1b2..5b5866732 100644 --- a/modules/client/front/balance/create/index.js +++ b/modules/client/front/balance/create/index.js @@ -45,6 +45,7 @@ class Controller extends Dialog { set description(value) { this.receipt.description = value; + this.originalDescription = value; } get description() { @@ -60,7 +61,8 @@ class Controller extends Dialog { if (value) { const accountingType = value.accountingType; - this.receipt.description = accountingType && accountingType.receiptDescription; + this.receipt.description = + `${accountingType && accountingType.receiptDescription}, ${this.originalDescription}`; } } diff --git a/modules/client/front/balance/create/index.spec.js b/modules/client/front/balance/create/index.spec.js index bd0607a79..3aade58c6 100644 --- a/modules/client/front/balance/create/index.spec.js +++ b/modules/client/front/balance/create/index.spec.js @@ -36,7 +36,7 @@ describe('Client', () => { } }; - expect(controller.receipt.description).toEqual('Cash'); + expect(controller.receipt.description).toContain('Cash'); }); }); From 21686b4a9222cc8d10a59adc6e484840119ddab6 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 27 Oct 2021 09:55:35 +0200 Subject: [PATCH 2/3] feat(test): modify jest test --- modules/client/front/balance/create/index.spec.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/client/front/balance/create/index.spec.js b/modules/client/front/balance/create/index.spec.js index 3aade58c6..a2e3e2015 100644 --- a/modules/client/front/balance/create/index.spec.js +++ b/modules/client/front/balance/create/index.spec.js @@ -27,6 +27,7 @@ describe('Client', () => { describe('bankSelection() setter', () => { it('should set the receipt description property', () => { + controller.originalDescription = 'Albaran: 1, 2'; controller.bankSelection = { id: 1, bank: 'Cash', @@ -36,7 +37,7 @@ describe('Client', () => { } }; - expect(controller.receipt.description).toContain('Cash'); + expect(controller.receipt.description).toEqual('Cash, Albaran: 1, 2'); }); }); From 13aa96d6a8d651c8d58a5b229b5cb07eb166859a Mon Sep 17 00:00:00 2001 From: carlosjr Date: Thu, 28 Oct 2021 13:30:07 +0200 Subject: [PATCH 3/3] test(payout): e2e path updated for ticket payout --- e2e/helpers/selectors.js | 3 +++ e2e/paths/05-ticket/18_index_payout.spec.js | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 4b5629c3c..08a21f838 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -1,3 +1,4 @@ +/* eslint max-len: ["error", { "ignoreStrings": true }]*/ export default { globalItems: { @@ -273,6 +274,7 @@ export default { deliveredAmount: '.vn-dialog vn-input-number[ng-model="$ctrl.deliveredAmount"]', refundAmount: '.vn-dialog vn-input-number[ng-model="$ctrl.amountToReturn"]', saveButton: '.vn-dialog.shown [response="accept"]', + anyBalanceLine: 'vn-client-balance-index vn-tbody > vn-tr', firstLineBalance: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(8)', firstLineReference: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td-editable', firstLineReferenceInput: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td-editable > div > field > vn-textfield' @@ -470,6 +472,7 @@ export default { firstTicketCheckbox: 'vn-ticket-index vn-tbody > a:nth-child(1) > vn-td:nth-child(1) > vn-check', secondTicketCheckbox: 'vn-ticket-index vn-tbody > a:nth-child(2) > vn-td:nth-child(1) > vn-check', thirdTicketCheckbox: 'vn-ticket-index vn-tbody > a:nth-child(3) > vn-td:nth-child(1) > vn-check', + fifthTicketCheckbox: 'vn-ticket-index vn-tbody > a:nth-child(5) > vn-td:nth-child(1) > vn-check', sixthTicketCheckbox: 'vn-ticket-index vn-tbody > a:nth-child(6) > vn-td:nth-child(1) > vn-check', payoutButton: 'vn-ticket-index vn-button[icon="icon-recovery"]', payoutCompany: '.vn-dialog vn-autocomplete[ng-model="$ctrl.companyFk"]', diff --git a/e2e/paths/05-ticket/18_index_payout.spec.js b/e2e/paths/05-ticket/18_index_payout.spec.js index 343ec1f43..c3325360a 100644 --- a/e2e/paths/05-ticket/18_index_payout.spec.js +++ b/e2e/paths/05-ticket/18_index_payout.spec.js @@ -21,8 +21,8 @@ describe('Ticket index payout path', () => { it('should check the second ticket from a client and 1 of another', async() => { await page.waitToClick(selectors.globalItems.searchButton); - await page.waitToClick(selectors.ticketsIndex.secondTicketCheckbox); await page.waitToClick(selectors.ticketsIndex.thirdTicketCheckbox); + await page.waitToClick(selectors.ticketsIndex.fifthTicketCheckbox); await page.waitToClick(selectors.ticketsIndex.payoutButton); const message = await page.waitForSnackbar(); @@ -58,9 +58,11 @@ describe('Ticket index payout path', () => { await page.selectModule('client'); await page.accessToSearchResult('1101'); await page.accessToSection('client.card.balance.index'); - await page.waitForSelector('vn-client-balance-index vn-tbody > vn-tr'); - let result = await page.countElement('vn-client-balance-index vn-tbody > vn-tr'); + await page.waitForSelector(selectors.clientBalance.anyBalanceLine); + const count = await page.countElement(selectors.clientBalance.anyBalanceLine); + const reference = await page.waitToGetProperty(selectors.clientBalance.firstLineReference, 'innerText'); - expect(result).toEqual(4); + expect(count).toEqual(4); + expect(reference).toContain('Cash, Albaran: 7, 8Payment'); }); });