From bf976a3e8f78c2dde82adb624e5b175dae13354c Mon Sep 17 00:00:00 2001 From: joan Date: Thu, 15 Apr 2021 14:30:30 +0200 Subject: [PATCH 1/6] 2729 - Prices popover refactor --- modules/order/front/catalog-view/index.html | 6 +- modules/order/front/prices-popover/index.html | 121 +++++++----------- modules/order/front/prices-popover/index.js | 111 ++++++++-------- .../order/front/prices-popover/locale/es.yml | 5 +- modules/order/front/prices-popover/style.scss | 29 ----- .../ticket/front/descriptor-menu/index.html | 1 - 6 files changed, 107 insertions(+), 166 deletions(-) diff --git a/modules/order/front/catalog-view/index.html b/modules/order/front/catalog-view/index.html index 39285a78d..f247c9b6b 100644 --- a/modules/order/front/catalog-view/index.html +++ b/modules/order/front/catalog-view/index.html @@ -13,7 +13,8 @@ on-error-src/>
-

+

{{::item.name}}

@@ -65,3 +66,6 @@ vn-id="pricesPopover" order="$ctrl.order"> + + \ No newline at end of file diff --git a/modules/order/front/prices-popover/index.html b/modules/order/front/prices-popover/index.html index 61d8bb1a7..2551853e6 100644 --- a/modules/order/front/prices-popover/index.html +++ b/modules/order/front/prices-popover/index.html @@ -1,75 +1,52 @@ - - -
- - - - -
-
- - -
- - -
- - - - - - {{::price.warehouse}} - - - -
- {{::price.grouping}} - x {{::price.price | currency: 'EUR': 2}} -
-
- {{price.priceKg | currency: 'EUR'}}/Kg -
- - - - - - - - -
-
- Wrong quantity + + + + + + + {{::price.warehouse}} + + + +
+ {{::price.grouping}} + x {{::price.price | currency: 'EUR': 2}}
- - -
- - - +
+ {{::price.priceKg | currency: 'EUR'}}/Kg +
+ + + + + + + + + + + +
+ + +
+ diff --git a/modules/order/front/prices-popover/index.js b/modules/order/front/prices-popover/index.js index c9620136d..7e2fb1900 100644 --- a/modules/order/front/prices-popover/index.js +++ b/modules/order/front/prices-popover/index.js @@ -11,34 +11,18 @@ class Controller extends Popover { set prices(value) { this._prices = value; if (value && value[0].grouping) - this.calculateTotal(); + this.getTotalQuantity(); } get prices() { return this._prices; } - getTags() { - const filter = { - where: { - itemFk: this.id, - priority: {gte: 4} - }, - order: 'priority ASC', - include: {relation: 'tag'} - }; - this.$http.get(`ItemTags`, {filter}) - .then(res => { - this.tags = res.data; - this.$.$applyAsync(() => this.relocate()); - }); - } - show(parent, item) { this.item = JSON.parse(JSON.stringify(item)); this.id = item.id; this.prices = this.item.prices; - this.getTags(); + super.show(parent); } @@ -47,67 +31,74 @@ class Controller extends Popover { this.item = {}; this.tags = {}; this._prices = {}; - this.total = 0; + this.totalQuantity = 0; super.onClose(); } - calculateMax() { - this.max = this.item.available - this.total; - } - - calculateTotal() { - this.total = 0; - - this.prices.forEach(price => { + getTotalQuantity() { + let total = 0; + for (let price of this.prices) { if (!price.quantity) price.quantity = 0; - this.total += price.quantity; - }); - this.calculateMax(); + total += price.quantity; + } + + this.totalQuantity = total; + this.maxQuantity = this.item.available - total; } addQuantity(price) { - if (this.total + price.grouping <= this.max) + this.getTotalQuantity(); + const quantity = this.totalQuantity + price.grouping; + if (quantity <= this.maxQuantity) price.quantity += price.grouping; } - getFilledLines() { - const filledLines = []; - let match; - this.prices.forEach(price => { + getGroupings() { + const filledRows = []; + for (let price of this.prices) { if (price.quantity && price.quantity > 0) { - match = filledLines.find(element => { - return element.warehouseFk == price.warehouseFk; + const priceMatch = filledRows.find(row => { + return row.warehouseFk == price.warehouseFk; }); - if (!match) { - filledLines.push(Object.assign({}, price)); - return; - } - match.quantity += price.quantity; + if (!priceMatch) + filledRows.push(Object.assign({}, price)); + else priceMatch.quantity += price.quantity; } - }); - return filledLines; + } + + return filledRows; } submit() { - this.calculateTotal(); - const filledLines = this.getFilledLines(); + const filledRows = this.getGroupings(); - if (filledLines.length <= 0) { - this.vnApp.showError(this.$t('First you must add some quantity')); - return; + try { + const hasValidGropings = filledRows.some(row => + row.quantity % row.grouping == 0 + ); + + if (filledRows.length <= 0) + throw new Error('First you must add some quantity'); + + if (!hasValidGropings) + throw new Error(`The amounts doesn't match with the grouping`); + + const params = { + orderFk: this.order.id, + items: filledRows + }; + this.$http.post(`OrderRows/addToOrder`, params) + .then(() => { + this.vnApp.showSuccess(this.$t('Data saved!')); + this.hide(); + if (this.card) this.card.reload(); + }); + } catch (e) { + this.vnApp.showError(this.$t(e.message)); + return false; } - - const params = { - orderFk: this.order.id, - items: filledLines - }; - this.$http.post(`OrderRows/addToOrder`, params) - .then(() => { - this.vnApp.showSuccess(this.$t('Data saved!')); - this.hide(); - if (this.card) this.card.reload(); - }); + return true; } } diff --git a/modules/order/front/prices-popover/locale/es.yml b/modules/order/front/prices-popover/locale/es.yml index b1a26e0f3..27eac802d 100644 --- a/modules/order/front/prices-popover/locale/es.yml +++ b/modules/order/front/prices-popover/locale/es.yml @@ -1,4 +1,3 @@ -Last entries: Últimas entradas Qty.: Cant. -Wrong quantity: Cantidad errónea -First you must add some quantity: Primero debes agregar alguna cantidad \ No newline at end of file +First you must add some quantity: Primero debes agregar alguna cantidad +The amounts doesn't match with the grouping: Las cantidades no coinciden con el grouping \ No newline at end of file diff --git a/modules/order/front/prices-popover/style.scss b/modules/order/front/prices-popover/style.scss index dbca75586..0ab12ad02 100644 --- a/modules/order/front/prices-popover/style.scss +++ b/modules/order/front/prices-popover/style.scss @@ -1,25 +1,8 @@ @import "variables"; .vn-order-prices-popover .content { - max-width: 350px; - - .header > a:first-child { - visibility: hidden; - } - img[ng-src] { - height: 100%; - width: 100%; - } - vn-vertical.data { - padding-right: 16px; - border-right: 1px solid $color-main; - } .prices { vn-table { - .warehouse { - width: 48px; - max-width: 48px; - } .price-kg { color: $color-font-secondary; font-size: .75rem @@ -30,18 +13,6 @@ } .footer { text-align: center; - - .error { - display: none; - } - &.invalid { - .error { - display: block; - padding-top: 10px; - color: $color-alert; - text-align: center; - } - } } } } \ No newline at end of file diff --git a/modules/ticket/front/descriptor-menu/index.html b/modules/ticket/front/descriptor-menu/index.html index 390d9daf7..4f65fe008 100644 --- a/modules/ticket/front/descriptor-menu/index.html +++ b/modules/ticket/front/descriptor-menu/index.html @@ -7,7 +7,6 @@ From 2cdafeecf4b300153a2f4ca382759561169f8f82 Mon Sep 17 00:00:00 2001 From: joan Date: Thu, 15 Apr 2021 14:30:47 +0200 Subject: [PATCH 2/6] Added unit tests --- .../order/front/prices-popover/index.spec.js | 171 ++++++++++++++++++ 1 file changed, 171 insertions(+) create mode 100644 modules/order/front/prices-popover/index.spec.js diff --git a/modules/order/front/prices-popover/index.spec.js b/modules/order/front/prices-popover/index.spec.js new file mode 100644 index 000000000..a68a328a2 --- /dev/null +++ b/modules/order/front/prices-popover/index.spec.js @@ -0,0 +1,171 @@ +import './index.js'; + +describe('Order', () => { + describe('Component vnOrderPricesPopover', () => { + let controller; + let $httpBackend; + let orderId = 16; + + beforeEach(ngModule('order')); + + beforeEach(inject(($componentController, $rootScope, _$httpBackend_) => { + $httpBackend = _$httpBackend_; + const $scope = $rootScope.$new(); + const $element = angular.element(''); + const $transclude = { + $$boundTransclude: { + $$slots: [] + } + }; + controller = $componentController('vnOrderPricesPopover', {$element, $scope, $transclude}); + controller._prices = [ + {warehouseFk: 1, grouping: 10, quantity: 0}, + {warehouseFk: 1, grouping: 100, quantity: 100} + ]; + controller.item = {available: 1000}; + controller.order = {id: orderId}; + })); + + describe('prices() setter', () => { + it('should call to the getTotalQuantity() method', () => { + controller.getTotalQuantity = jest.fn(); + + controller.prices = [ + {grouping: 10, quantity: 0}, + {grouping: 100, quantity: 0}, + {grouping: 1000, quantity: 0}, + ]; + + expect(controller.getTotalQuantity).toHaveBeenCalledWith(); + }); + }); + + describe('getTotalQuantity()', () => { + it('should set the totalQuantity and maxQuantity properties', () => { + controller.getTotalQuantity(); + + expect(controller.totalQuantity).toEqual(100); + expect(controller.maxQuantity).toEqual(900); + }); + }); + + describe('addQuantity()', () => { + it('should call to the getTotalQuantity() method and NOT set the quantity property', () => { + jest.spyOn(controller, 'getTotalQuantity'); + + controller.prices = [ + {grouping: 10, quantity: 0}, + {grouping: 100, quantity: 0}, + {grouping: 1000, quantity: 1000}, + ]; + + const oneThousandGrouping = controller.prices[2]; + + expect(oneThousandGrouping.quantity).toEqual(1000); + + controller.addQuantity(oneThousandGrouping); + + expect(controller.getTotalQuantity).toHaveBeenCalledWith(); + expect(oneThousandGrouping.quantity).toEqual(1000); + }); + + it('should call to the getTotalQuantity() method and then set the quantity property', () => { + jest.spyOn(controller, 'getTotalQuantity'); + + const oneHandredGrouping = controller.prices[1]; + controller.addQuantity(oneHandredGrouping); + + expect(controller.getTotalQuantity).toHaveBeenCalledWith(); + expect(oneHandredGrouping.quantity).toEqual(200); + }); + }); + + describe('getGroupings()', () => { + it('should return a row with the total filled quantity', () => { + jest.spyOn(controller, 'getTotalQuantity'); + + controller.prices = [ + {warehouseFk: 1, grouping: 10, quantity: 10}, + {warehouseFk: 1, grouping: 100, quantity: 100}, + {warehouseFk: 1, grouping: 1000, quantity: 1000}, + ]; + + const rows = controller.getGroupings(); + const firstRow = rows[0]; + + expect(rows.length).toEqual(1); + expect(firstRow.quantity).toEqual(1110); + }); + + it('should return two filled rows with a quantity', () => { + jest.spyOn(controller, 'getTotalQuantity'); + + controller.prices = [ + {warehouseFk: 1, grouping: 10, quantity: 10}, + {warehouseFk: 2, grouping: 10, quantity: 10}, + {warehouseFk: 1, grouping: 100, quantity: 0}, + {warehouseFk: 1, grouping: 1000, quantity: 1000}, + ]; + + const rows = controller.getGroupings(); + const firstRow = rows[0]; + const secondRow = rows[1]; + + expect(rows.length).toEqual(2); + expect(firstRow.quantity).toEqual(1010); + expect(secondRow.quantity).toEqual(10); + }); + }); + + describe('submit()', () => { + it('should throw an error if none of the rows contains a quantity', () => { + jest.spyOn(controller, 'getTotalQuantity'); + jest.spyOn(controller.vnApp, 'showError'); + + controller.prices = [ + {warehouseFk: 1, grouping: 10, quantity: 0}, + {warehouseFk: 1, grouping: 100, quantity: 0} + ]; + + controller.submit(); + + expect(controller.vnApp.showError).toHaveBeenCalledWith(`First you must add some quantity`); + }); + + it(`should throw an error if the quantity doesn't match the grouping value`, () => { + jest.spyOn(controller, 'getTotalQuantity'); + jest.spyOn(controller.vnApp, 'showError'); + + controller.prices = [ + {warehouseFk: 1, grouping: 10, quantity: 0}, + {warehouseFk: 1, grouping: 100, quantity: 101} + ]; + + controller.submit(); + + expect(controller.vnApp.showError).toHaveBeenCalledWith(`The amounts doesn't match with the grouping`); + }); + + it('should should make an http query and then show a success message', () => { + jest.spyOn(controller, 'getTotalQuantity'); + jest.spyOn(controller.vnApp, 'showSuccess'); + + controller.prices = [ + {warehouseFk: 1, grouping: 10, quantity: 0}, + {warehouseFk: 1, grouping: 100, quantity: 100} + ]; + + const params = { + orderFk: orderId, + items: [{warehouseFk: 1, grouping: 100, quantity: 100}] + }; + + $httpBackend.expectPOST('OrderRows/addToOrder', params).respond(200); + controller.submit(); + $httpBackend.flush(); + + expect(controller.vnApp.showSuccess).toHaveBeenCalledWith(`Data saved!`); + }); + }); + }); +}); From 56ec7b4729e7a8dca48d596589ad6e5c749976b0 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Fri, 16 Apr 2021 10:17:59 +0200 Subject: [PATCH 3/6] input number made wider --- modules/order/front/prices-popover/style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/order/front/prices-popover/style.scss b/modules/order/front/prices-popover/style.scss index 0ab12ad02..deaeab044 100644 --- a/modules/order/front/prices-popover/style.scss +++ b/modules/order/front/prices-popover/style.scss @@ -8,7 +8,7 @@ font-size: .75rem } .vn-input-number { - width: 56px; + width: 80px; } } .footer { From a445632c29e11105c0392ebf99d4a45d77579765 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Fri, 16 Apr 2021 16:16:05 +0200 Subject: [PATCH 4/6] removed waitForTimeouts with 1 to 3 seconds --- e2e/paths/02-client/03_edit_fiscal_data.spec.js | 1 - e2e/paths/02-client/05_add_address.spec.js | 1 - e2e/paths/02-client/15_user_config.spec.js | 1 - e2e/paths/02-client/18_contacts.spec.js | 1 - e2e/paths/02-client/20_credit_insurance.spec.js | 1 - e2e/paths/04-item/02_basic_data.spec.js | 3 +-- e2e/paths/04-item/10_index.spec.js | 1 - e2e/paths/04-item/14_fixedPrice.spec.js | 1 - e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js | 5 ----- e2e/paths/05-ticket/05_tracking_state.spec.js | 1 - e2e/paths/05-ticket/06_basic_data_steps.spec.js | 1 - e2e/paths/05-ticket/10_request.spec.js | 1 - e2e/paths/05-ticket/14_create_ticket.spec.js | 1 - e2e/paths/06-claim/04_claim_action.spec.js | 4 ---- e2e/paths/07-order/01_summary.spec.js | 1 - e2e/paths/08-route/03_create_and_clone.spec.js | 2 -- e2e/paths/10-travel/02_basic_data_and_log.spec.js | 1 - e2e/paths/10-travel/04_extra_community.spec.js | 1 - e2e/paths/12-entry/03_latestBuys.spec.js | 1 - 19 files changed, 1 insertion(+), 28 deletions(-) diff --git a/e2e/paths/02-client/03_edit_fiscal_data.spec.js b/e2e/paths/02-client/03_edit_fiscal_data.spec.js index 614ede0f0..d57cd968e 100644 --- a/e2e/paths/02-client/03_edit_fiscal_data.spec.js +++ b/e2e/paths/02-client/03_edit_fiscal_data.spec.js @@ -159,7 +159,6 @@ describe('Client Edit fiscalData path', () => { }); it('should propagate the Equalization tax changes', async() => { - await page.waitForTimeout(1000); await page.waitToClick(selectors.globalItems.acceptButton); const message = await page.waitForSnackbar(); diff --git a/e2e/paths/02-client/05_add_address.spec.js b/e2e/paths/02-client/05_add_address.spec.js index 90cbc15a5..c35237ab4 100644 --- a/e2e/paths/02-client/05_add_address.spec.js +++ b/e2e/paths/02-client/05_add_address.spec.js @@ -81,7 +81,6 @@ describe('Client Add address path', () => { }); it(`should confirm the new address exists and it's the default one`, async() => { - await page.waitForTimeout(2000); // needs more than a single second to load the section const result = await page.waitToGetProperty(selectors.clientAddresses.defaultAddress, 'innerText'); expect(result).toContain('320 Park Avenue New York'); diff --git a/e2e/paths/02-client/15_user_config.spec.js b/e2e/paths/02-client/15_user_config.spec.js index 2954ff522..615df4e0c 100644 --- a/e2e/paths/02-client/15_user_config.spec.js +++ b/e2e/paths/02-client/15_user_config.spec.js @@ -52,7 +52,6 @@ describe('User config', () => { it('should open the user config form to check the settings', async() => { await page.waitToClick(selectors.globalItems.userMenuButton); - await page.waitForTimeout(1000); let expectedLocalWarehouse = await page .expectPropertyValue(selectors.globalItems.userLocalWarehouse, 'value', ''); diff --git a/e2e/paths/02-client/18_contacts.spec.js b/e2e/paths/02-client/18_contacts.spec.js index 49d930435..b1159993d 100644 --- a/e2e/paths/02-client/18_contacts.spec.js +++ b/e2e/paths/02-client/18_contacts.spec.js @@ -28,7 +28,6 @@ describe('Client contacts', () => { }); it('should delete de contact', async() => { - await page.waitForTimeout(3000); await page.waitToClick(selectors.clientContacts.deleteFirstPhone); await page.waitToClick(selectors.clientContacts.saveButton); const message = await page.waitForSnackbar(); diff --git a/e2e/paths/02-client/20_credit_insurance.spec.js b/e2e/paths/02-client/20_credit_insurance.spec.js index 58cb2737c..904a51145 100644 --- a/e2e/paths/02-client/20_credit_insurance.spec.js +++ b/e2e/paths/02-client/20_credit_insurance.spec.js @@ -20,7 +20,6 @@ describe('Client credit insurance path', () => { }); it('should open the create a new credit contract form', async() => { - await page.waitForTimeout(1000); await page.waitToClick(selectors.clientCreditInsurance.addNewContract); await page.waitForState('client.card.creditInsurance.create'); }); diff --git a/e2e/paths/04-item/02_basic_data.spec.js b/e2e/paths/04-item/02_basic_data.spec.js index a728ac717..defefe279 100644 --- a/e2e/paths/04-item/02_basic_data.spec.js +++ b/e2e/paths/04-item/02_basic_data.spec.js @@ -45,8 +45,7 @@ describe('Item Edit basic data path', () => { await page.waitToClick(selectors.itemBasicData.newIntrastatButton); await page.write(selectors.itemBasicData.newIntrastatId, '588420239'); await page.write(selectors.itemBasicData.newIntrastatDescription, 'Tropical Flowers'); - await page.waitToClick(selectors.itemBasicData.acceptIntrastatButton); // this popover obscures the rest of the form for aprox 2 seconds - await page.waitForTimeout(2000); + await page.waitToClick(selectors.itemBasicData.acceptIntrastatButton); await page.waitForTextInField(selectors.itemBasicData.intrastat, 'Tropical Flowers'); let newcode = await page.waitToGetProperty(selectors.itemBasicData.intrastat, 'value'); diff --git a/e2e/paths/04-item/10_index.spec.js b/e2e/paths/04-item/10_index.spec.js index 40c567cac..3d7ab1632 100644 --- a/e2e/paths/04-item/10_index.spec.js +++ b/e2e/paths/04-item/10_index.spec.js @@ -55,7 +55,6 @@ describe('Item index path', () => { }); it('should mark all unchecked boxes to leave the index as it was', async() => { - await page.waitForTimeout(500); // otherwise the snackbar doesnt appear some times. await page.waitToClick(selectors.itemsIndex.fieldsToShowButton); await page.waitToClick(selectors.itemsIndex.idCheckbox); await page.waitToClick(selectors.itemsIndex.stemsCheckbox); diff --git a/e2e/paths/04-item/14_fixedPrice.spec.js b/e2e/paths/04-item/14_fixedPrice.spec.js index 477daa151..d68092904 100644 --- a/e2e/paths/04-item/14_fixedPrice.spec.js +++ b/e2e/paths/04-item/14_fixedPrice.spec.js @@ -45,7 +45,6 @@ describe('Item fixed prices path', () => { await page.writeOnEditableTD(selectors.itemFixedPrice.fourthMinPrice, '5'); await page.pickDate(selectors.itemFixedPrice.fourthStarted, now); await page.pickDate(selectors.itemFixedPrice.fourthEnded, now); - await page.waitForTimeout(1000); const message = await page.waitForSnackbar(); expect(message.text).toContain('Data saved!'); diff --git a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js index 713ccf7cd..6c82e31a7 100644 --- a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js +++ b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js @@ -143,7 +143,6 @@ describe('Ticket Edit sale path', () => { }); it('should remove 1 from the first sale quantity', async() => { - await page.waitForTimeout(500); await page.waitToClick(selectors.ticketSales.firstSaleQuantityCell); await page.waitForSelector(selectors.ticketSales.firstSaleQuantity); await page.type(selectors.ticketSales.firstSaleQuantity, '9\u000d'); @@ -225,16 +224,12 @@ describe('Ticket Edit sale path', () => { it('should search for a ticket then access to the sales section', async() => { await page.accessToSearchResult('16'); await page.accessToSection('ticket.card.sale'); - await page.waitForTimeout(2000); }); it('should select the third sale and delete it', async() => { await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox); - await page.waitForTimeout(2000); await page.waitToClick(selectors.ticketSales.deleteSaleButton); - await page.waitForTimeout(2000); await page.waitToClick(selectors.globalItems.acceptButton); - await page.waitForTimeout(2000); await page.waitForSpinnerLoad(); const message = await page.waitForSnackbar(); diff --git a/e2e/paths/05-ticket/05_tracking_state.spec.js b/e2e/paths/05-ticket/05_tracking_state.spec.js index 07f0d86bc..7978cf85c 100644 --- a/e2e/paths/05-ticket/05_tracking_state.spec.js +++ b/e2e/paths/05-ticket/05_tracking_state.spec.js @@ -47,7 +47,6 @@ describe('Ticket Create new tracking state path', () => { }); it(`should attemp to create an state for which salesPerson doesn't have permissions`, async() => { - await page.waitForTimeout(1500); await page.autocompleteSearch(selectors.createStateView.state, 'Encajado'); await page.waitToClick(selectors.createStateView.saveStateButton); const message = await page.waitForSnackbar(); diff --git a/e2e/paths/05-ticket/06_basic_data_steps.spec.js b/e2e/paths/05-ticket/06_basic_data_steps.spec.js index fff6c1264..f7834e562 100644 --- a/e2e/paths/05-ticket/06_basic_data_steps.spec.js +++ b/e2e/paths/05-ticket/06_basic_data_steps.spec.js @@ -51,7 +51,6 @@ describe('Ticket Edit basic data path', () => { it(`should edit the ticket agency then check there are no zones for it`, async() => { await page.autocompleteSearch(selectors.ticketBasicData.agency, 'Super-Man delivery'); - await page.waitForTimeout(1000); let emptyZone = await page .expectPropertyValue(selectors.ticketBasicData.zone, 'value', ''); diff --git a/e2e/paths/05-ticket/10_request.spec.js b/e2e/paths/05-ticket/10_request.spec.js index af73d7081..1b580aec2 100644 --- a/e2e/paths/05-ticket/10_request.spec.js +++ b/e2e/paths/05-ticket/10_request.spec.js @@ -18,7 +18,6 @@ describe('Ticket purchase request path', () => { }); it('should add a new request', async() => { - await page.waitForTimeout(500); await page.waitToClick(selectors.ticketRequests.addRequestButton); await page.write(selectors.ticketRequests.descriptionInput, 'New stuff'); await page.write(selectors.ticketRequests.quantity, '9'); diff --git a/e2e/paths/05-ticket/14_create_ticket.spec.js b/e2e/paths/05-ticket/14_create_ticket.spec.js index 4e7d95493..bfaa08775 100644 --- a/e2e/paths/05-ticket/14_create_ticket.spec.js +++ b/e2e/paths/05-ticket/14_create_ticket.spec.js @@ -42,7 +42,6 @@ describe('Ticket create path', () => { it('should again open the new ticket form', async() => { await page.waitToClick(selectors.globalItems.returnToModuleIndexButton); - await page.waitForTimeout(500); await page.waitToClick(selectors.ticketsIndex.newTicketButton); await page.waitForState('ticket.create'); }); diff --git a/e2e/paths/06-claim/04_claim_action.spec.js b/e2e/paths/06-claim/04_claim_action.spec.js index b3fedc9c8..1170e0c9c 100644 --- a/e2e/paths/06-claim/04_claim_action.spec.js +++ b/e2e/paths/06-claim/04_claim_action.spec.js @@ -25,10 +25,6 @@ describe('Claim action path', () => { }); it('should import the second importable ticket', async() => { - // the animation adding the header element for the claimed total - // obscures somehow other elements for about 2 seconds - await page.waitForTimeout(3000); - await page.waitToClick(selectors.claimAction.importTicketButton); await page.waitToClick(selectors.claimAction.secondImportableTicket); const message = await page.waitForSnackbar(); diff --git a/e2e/paths/07-order/01_summary.spec.js b/e2e/paths/07-order/01_summary.spec.js index 1b4776826..9b9e37998 100644 --- a/e2e/paths/07-order/01_summary.spec.js +++ b/e2e/paths/07-order/01_summary.spec.js @@ -8,7 +8,6 @@ describe('Order summary path', () => { browser = await getBrowser(); page = browser.page; await page.loginAndModule('employee', 'order'); - await page.waitForTimeout(2000); await page.accessToSearchResult('16'); }); diff --git a/e2e/paths/08-route/03_create_and_clone.spec.js b/e2e/paths/08-route/03_create_and_clone.spec.js index c0132362f..0b8da98b4 100644 --- a/e2e/paths/08-route/03_create_and_clone.spec.js +++ b/e2e/paths/08-route/03_create_and_clone.spec.js @@ -17,7 +17,6 @@ describe('Route create path', () => { describe('as employee', () => { it('should click on the add new route button and open the creation form', async() => { - await page.waitForTimeout(500); await page.waitToClick(selectors.routeIndex.addNewRouteButton); await page.waitForState('route.create'); }); @@ -74,7 +73,6 @@ describe('Route create path', () => { }); it(`should clone the first route`, async() => { - await page.waitForTimeout(1000); // needs time for the index to show all items await page.waitToClick(selectors.routeIndex.firstRouteCheckbox); await page.waitToClick(selectors.routeIndex.cloneButton); await page.waitToClick(selectors.routeIndex.submitClonationButton); diff --git a/e2e/paths/10-travel/02_basic_data_and_log.spec.js b/e2e/paths/10-travel/02_basic_data_and_log.spec.js index 50e2e1980..a231a70b2 100644 --- a/e2e/paths/10-travel/02_basic_data_and_log.spec.js +++ b/e2e/paths/10-travel/02_basic_data_and_log.spec.js @@ -44,7 +44,6 @@ describe('Travel basic data path', () => { it('should now edit the whole form then save', async() => { await page.clearInput(selectors.travelBasicData.reference); await page.write(selectors.travelBasicData.reference, 'new reference!'); - await page.waitForTimeout(2000); await page.autocompleteSearch(selectors.travelBasicData.agency, 'Entanglement'); await page.autocompleteSearch(selectors.travelBasicData.outputWarehouse, 'Warehouse Three'); await page.autocompleteSearch(selectors.travelBasicData.inputWarehouse, 'Warehouse Four'); diff --git a/e2e/paths/10-travel/04_extra_community.spec.js b/e2e/paths/10-travel/04_extra_community.spec.js index af577d2f9..e4a859192 100644 --- a/e2e/paths/10-travel/04_extra_community.spec.js +++ b/e2e/paths/10-travel/04_extra_community.spec.js @@ -22,7 +22,6 @@ describe('Travel extra community path', () => { await page.writeOnEditableTD(selectors.travelExtraCommunity.firstTravelReference, 'edited reference'); await page.waitForSpinnerLoad(); await page.writeOnEditableTD(selectors.travelExtraCommunity.firstTravelLockedKg, '1500'); - await page.waitForTimeout(1000); }); it('should reload the index and confirm the reference and locked kg were edited', async() => { diff --git a/e2e/paths/12-entry/03_latestBuys.spec.js b/e2e/paths/12-entry/03_latestBuys.spec.js index f2d64e3b4..4b1050abc 100644 --- a/e2e/paths/12-entry/03_latestBuys.spec.js +++ b/e2e/paths/12-entry/03_latestBuys.spec.js @@ -17,7 +17,6 @@ describe('Entry lastest buys path', () => { it('should access the latest buys seccion and search not seeing the edit buys button yet', async() => { await page.waitToClick(selectors.entryLatestBuys.latestBuysSectionButton); - await page.waitForTimeout(250); await page.waitToClick(selectors.globalItems.searchButton); await page.waitForSelector(selectors.entryLatestBuys.editBuysButton, {visible: false}); }); From b73045e7dc8f43058a0a443dbeed864915f4a07f Mon Sep 17 00:00:00 2001 From: joan Date: Mon, 19 Apr 2021 09:55:56 +0200 Subject: [PATCH 5/6] Increase input width --- modules/order/front/prices-popover/style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/order/front/prices-popover/style.scss b/modules/order/front/prices-popover/style.scss index 0ab12ad02..deaeab044 100644 --- a/modules/order/front/prices-popover/style.scss +++ b/modules/order/front/prices-popover/style.scss @@ -8,7 +8,7 @@ font-size: .75rem } .vn-input-number { - width: 56px; + width: 80px; } } .footer { From 94cd6cfb3e24b24ea243727e5ad3081ea966fd34 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Mon, 19 Apr 2021 13:23:08 +0200 Subject: [PATCH 6/6] watcher aint looking after data changed to disable test conn button --- modules/account/front/ldap/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/account/front/ldap/index.html b/modules/account/front/ldap/index.html index 5c5aaead4..23356452a 100644 --- a/modules/account/front/ldap/index.html +++ b/modules/account/front/ldap/index.html @@ -53,7 +53,6 @@ label="Save">