From e7cf060e12287d76b0300cac95dc124c57afb0e0 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 19 May 2020 10:51:50 +0200 Subject: [PATCH] Merge fixes --- e2e/helpers/selectors.js | 2 +- e2e/paths/07-order/03_lines.spec.js | 2 +- front/core/directives/acl.js | 1 - front/core/filters/specs/id.spec.js | 21 +++++++++++ modules/claim/front/action/index.html | 2 +- modules/claim/front/action/index.js | 42 ++++++++++------------ modules/claim/front/action/index.spec.js | 41 +++++++-------------- modules/client/front/descriptor/index.html | 3 +- package-lock.json | 2 +- 9 files changed, 58 insertions(+), 58 deletions(-) create mode 100644 front/core/filters/specs/id.spec.js diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 0a5e307e6..6945d82b8 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -479,7 +479,7 @@ export default { secondSaleIdInput: 'vn-ticket-sale vn-table vn-tbody > vn-tr:nth-child(2) > vn-td:nth-child(4) > vn-autocomplete', secondSaleIdAutocomplete: 'vn-ticket-sale vn-table vn-tbody > vn-tr:nth-child(2) > vn-td:nth-child(4) > vn-autocomplete', secondSaleQuantity: 'vn-ticket-sale vn-table vn-tr:nth-child(2) vn-input-number', - secondSaleConceptCell: 'vn-ticket-sale > vn-vertical > vn-card > vn-vertical > vn-table > div > vn-tbody > vn-tr:nth-child(2) > vn-td-editable:nth-child(6)', + secondSaleConceptCell: 'vn-ticket-sale vn-tbody > :nth-child(2) > :nth-child(6)', secondSaleConceptInput: 'vn-ticket-sale vn-table vn-tr:nth-child(2) > vn-td-editable.ng-isolate-scope.selected vn-textfield', totalImport: 'vn-ticket-sale > vn-vertical > vn-card > vn-vertical > vn-horizontal > vn-one > p:nth-child(3) > strong', selectAllSalesCheckbox: 'vn-ticket-sale vn-thead vn-check', diff --git a/e2e/paths/07-order/03_lines.spec.js b/e2e/paths/07-order/03_lines.spec.js index 9a214cfeb..021164934 100644 --- a/e2e/paths/07-order/03_lines.spec.js +++ b/e2e/paths/07-order/03_lines.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import getBrowser from '../../helpers/puppeteer'; -describe('Order lines', () => { +fdescribe('Order lines', () => { let browser; let page; beforeAll(async() => { diff --git a/front/core/directives/acl.js b/front/core/directives/acl.js index 03de54fa1..9b7328524 100644 --- a/front/core/directives/acl.js +++ b/front/core/directives/acl.js @@ -14,7 +14,6 @@ function vnAcl(aclService) { let action = $attrs.vnAclAction || 'disable'; if (aclService.hasAny(acls)) return; - console.log('acls', acls, action); if (action === 'disable') { let element = $element[0]; diff --git a/front/core/filters/specs/id.spec.js b/front/core/filters/specs/id.spec.js new file mode 100644 index 000000000..f18337793 --- /dev/null +++ b/front/core/filters/specs/id.spec.js @@ -0,0 +1,21 @@ +describe('Id filter', () => { + let idFilter; + + beforeEach(ngModule('vnCore')); + + beforeEach(inject(_idFilter_ => { + idFilter = _idFilter_; + })); + + it('should return empty string for input null', () => { + expect(idFilter(null)).toBe(''); + }); + + it('should return empty stringfor input empty', () => { + expect(idFilter('')).toBe(''); + }); + + it('should prefix a pad character', () => { + expect(idFilter('123')).toBe('#123'); + }); +}); diff --git a/modules/claim/front/action/index.html b/modules/claim/front/action/index.html index 692a1f4d2..69dfd255b 100644 --- a/modules/claim/front/action/index.html +++ b/modules/claim/front/action/index.html @@ -167,5 +167,5 @@ vn-id="update-greuge" question="Insert greuges on client card" message="Do you want to insert greuges?" - on-response="$ctrl.onUpdateGreugeResponse($response)"> + on-accept="$ctrl.onUpdateGreugeAccept()"> \ No newline at end of file diff --git a/modules/claim/front/action/index.js b/modules/claim/front/action/index.js index bada1ea2d..2ba010ef2 100644 --- a/modules/claim/front/action/index.js +++ b/modules/claim/front/action/index.js @@ -76,8 +76,7 @@ export default class Controller extends Section { }; this.$.lastTicketsModel.filter = filter; this.$.lastTicketsModel.refresh(); - this.$.lastTicketsPopover.parent = event.target; - this.$.lastTicketsPopover.show(); + this.$.lastTicketsPopover.show(event); } importTicketLines(ticketFk) { @@ -122,29 +121,26 @@ export default class Controller extends Section { }); } - onUpdateGreugeResponse(response) { - if (response == 'accept') { - const promises = []; - promises.push(this.getGreugeTypeId()); - promises.push(this.getGreugeConfig()); + onUpdateGreugeAccept() { + const promises = []; + promises.push(this.getGreugeTypeId()); + promises.push(this.getGreugeConfig()); - return Promise.all(promises).then(() => { - const data = { - clientFk: this.claim.clientFk, - description: this.$t('ClaimGreugeDescription', { - claimId: this.claim.id - }).toUpperCase(), - amount: this.freightPickUpPrice, - greugeTypeFk: this.greugeTypeFreightId, - ticketFk: this.claim.ticketFk - }; - return this.$http.post(`Greuges/`, data).then(() => { - this.vnApp.showSuccess(this.$t('Data saved!')); - this.vnApp.showMessage(this.$t('Greuge inserted')); - }); + return Promise.all(promises).then(() => { + const data = { + clientFk: this.claim.clientFk, + description: this.$t('ClaimGreugeDescription', { + claimId: this.claim.id + }).toUpperCase(), + amount: this.freightPickUpPrice, + greugeTypeFk: this.greugeTypeFreightId, + ticketFk: this.claim.ticketFk + }; + return this.$http.post(`Greuges`, data).then(() => { + this.vnApp.showSuccess(this.$t('Data saved!')); + this.vnApp.showMessage(this.$t('Greuge inserted')); }); - } else - this.vnApp.showSuccess(this.$t('Data saved!')); + }); } save(data) { diff --git a/modules/claim/front/action/index.spec.js b/modules/claim/front/action/index.spec.js index 503571f5b..c477984d9 100644 --- a/modules/claim/front/action/index.spec.js +++ b/modules/claim/front/action/index.spec.js @@ -6,20 +6,15 @@ describe('claim', () => { let controller; let $httpBackend; let $state; - let $httpParamSerializer; - let $scope; beforeEach(ngModule('claim')); - beforeEach(angular.mock.inject(($rootScope, $componentController, _$state_, _$httpBackend_, _$httpParamSerializer_) => { - $scope = $rootScope.$new(); + beforeEach(angular.mock.inject(($componentController, _$state_, _$httpBackend_) => { $httpBackend = _$httpBackend_; - $httpParamSerializer = _$httpParamSerializer_; $state = _$state_; $state.params.id = 1; - const $element = angular.element(''); - controller = $componentController('vnClaimAction', {$element, $scope}); + controller = $componentController('vnClaimAction', {$element: null}); controller.claim = {ticketFk: 1}; controller.$.model = {refresh: () => {}}; controller.$.addSales = { @@ -67,8 +62,8 @@ describe('claim', () => { controller.importToNewRefundTicket(); $httpBackend.flush(); - expect(controller.$.model.refresh).toHaveBeenCalledWith(); - expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!'); + expect(controller.$.model.refresh).toHaveBeenCalled(); + expect(controller.vnApp.showSuccess).toHaveBeenCalled(); }); }); @@ -79,8 +74,8 @@ describe('claim', () => { controller.showLastTickets({}); - expect(controller.$.lastTicketsModel.refresh).toHaveBeenCalledWith(); - expect(controller.$.lastTicketsPopover.show).toHaveBeenCalledWith(); + expect(controller.$.lastTicketsModel.refresh).toHaveBeenCalled(); + expect(controller.$.lastTicketsPopover.show).toHaveBeenCalled(); }); }); @@ -124,33 +119,21 @@ describe('claim', () => { controller.save(data); $httpBackend.flush(); - expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!'); + expect(controller.vnApp.showSuccess).toHaveBeenCalled(); }); }); - describe('onUpdateGreugeResponse()', () => { + describe('onUpdateGreugeAccept()', () => { const greugeTypeId = 7; const freightPickUpPrice = 11; - it('should do nothing', () => { - jest.spyOn(controller.$http, 'post'); - jest.spyOn(controller.card, 'reload'); - jest.spyOn(controller.vnApp, 'showSuccess'); - - controller.onUpdateGreugeResponse('cancel'); - - expect(controller.$http.post).not.toHaveBeenCalledWith(); - expect(controller.card.reload).not.toHaveBeenCalledWith(); - expect(controller.vnApp.showSuccess).not.toHaveBeenCalledWith('Greuge inserted!'); - }); it('should make a query and get the greugeTypeId and greuge config', () => { jest.spyOn(controller.card, 'reload'); jest.spyOn(controller.vnApp, 'showSuccess'); - const greugeTypeParams = $httpParamSerializer({filter: {where: {code: 'freightPickUp'}}}); - $httpBackend.expect('GET', `GreugeTypes/findOne?${greugeTypeParams}`).respond({id: greugeTypeId}); - $httpBackend.expect('GET', `GreugeConfigs/findOne`).respond({freightPickUpPrice}); - controller.onUpdateGreugeResponse('accept'); + $httpBackend.expectRoute('GET', `GreugeTypes/findOne`).respond({id: greugeTypeId}); + $httpBackend.expectGET(`GreugeConfigs/findOne`).respond({freightPickUpPrice}); + controller.onUpdateGreugeAccept(); $httpBackend.flush(); expect(controller.greugeTypeFreightId).toEqual(greugeTypeId); @@ -181,7 +164,7 @@ describe('claim', () => { $httpBackend.expect('POST', `Greuges/`, data).respond(new Promise(resolve => { return resolve({id: freightPickUpPrice}); })); - controller.onUpdateGreugeResponse('accept').then(res => { + controller.onUpdateGreugeAccept().then(res => { }).catch(error => { diff --git a/modules/client/front/descriptor/index.html b/modules/client/front/descriptor/index.html index 112bfca26..44563aed6 100644 --- a/modules/client/front/descriptor/index.html +++ b/modules/client/front/descriptor/index.html @@ -39,7 +39,8 @@ ng-class="{alert: $ctrl.client.debt > $ctrl.client.credit}" info="Invoices minus payments plus orders not yet invoiced"> - diff --git a/package-lock.json b/package-lock.json index 6affdde84..b46d40dcc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17888,7 +17888,7 @@ }, "xmlbuilder": { "version": "9.0.7", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", + "resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=" }, "xmlcreate": {