From a98a8831ed359ba2f3595b8f3a0c52c49dfcd040 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Mon, 30 Sep 2019 07:53:38 +0200 Subject: [PATCH 1/8] prevent popover focus propagation #1718 --- front/core/components/popover/popover.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/core/components/popover/popover.js b/front/core/components/popover/popover.js index 0041a84139..0cc2a74903 100644 --- a/front/core/components/popover/popover.js +++ b/front/core/components/popover/popover.js @@ -100,7 +100,7 @@ export default class Popover extends Component { }, 30); this.document.addEventListener('keydown', this.docKeyDownHandler); - this.document.addEventListener('focusin', this.docFocusInHandler); + this.document.addEventListener('focus', this.docFocusInHandler); this.element.addEventListener('mousedown', this.bgMouseDownHandler); this.deregisterCallback = this.$transitions.onStart({}, () => this.hide()); From e380e4466c587ee238870c04de7969b281e2e111 Mon Sep 17 00:00:00 2001 From: Bernat Date: Mon, 30 Sep 2019 08:26:51 +0200 Subject: [PATCH 2/8] =?UTF-8?q?#1717=20route.basic-data=20a=C3=B1adir=20ca?= =?UTF-8?q?mpo=20description?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- e2e/helpers/selectors.js | 4 +-- .../08-route-module/02_basic_data.spec.js | 4 +-- modules/route/front/basic-data/index.html | 27 ++++++++++--------- modules/route/front/basic-data/index.js | 16 +++++++++++ modules/route/front/basic-data/locale/es.yml | 1 + modules/route/front/descriptor/index.html | 4 +-- modules/route/front/descriptor/index.js | 1 - modules/route/front/descriptor/locale/es.yml | 3 ++- modules/route/front/routes.json | 4 +-- 9 files changed, 42 insertions(+), 22 deletions(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 9be6bc0dd5..34926155fe 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -652,8 +652,8 @@ export default { kmStartInput: 'vn-route-basic-data vn-input-number[field="$ctrl.route.kmStart"] input', kmEndInput: 'vn-route-basic-data vn-input-number[model="$ctrl.route.kmEnd"] input', createdDateInput: 'vn-route-basic-data vn-date-picker[model="$ctrl.route.created"] > div > input', - startedDateInput: 'vn-route-basic-data vn-date-picker[model="$ctrl.route.started"] > div > input', - finishedDateInput: 'vn-route-basic-data vn-date-picker[model="$ctrl.route.finished"] > div > input', + startedHourInput: 'vn-route-basic-data vn-input-time[model="$ctrl.route.started"] input', + finishedHourInput: 'vn-route-basic-data vn-input-time[model="$ctrl.route.finished"] input', saveButton: 'vn-route-basic-data vn-submit[label="Save"] input' }, routeTickets: { diff --git a/e2e/paths/08-route-module/02_basic_data.spec.js b/e2e/paths/08-route-module/02_basic_data.spec.js index 593a6b1863..63ed673d9f 100644 --- a/e2e/paths/08-route-module/02_basic_data.spec.js +++ b/e2e/paths/08-route-module/02_basic_data.spec.js @@ -20,8 +20,8 @@ describe('Route basic Data path', () => { .write(selectors.routeBasicData.kmStartInput, 1) .clearInput(selectors.routeBasicData.kmEndInput) .write(selectors.routeBasicData.kmEndInput, 2) - .datePicker(selectors.routeBasicData.startedDateInput, 1, null) - .datePicker(selectors.routeBasicData.finishedDateInput, 1, null) + .write(selectors.routeBasicData.startedHourInput, '0800') + .write(selectors.routeBasicData.finishedHourInput, '1230') .waitToClick(selectors.routeBasicData.saveButton) .waitForLastSnackbar(); diff --git a/modules/route/front/basic-data/index.html b/modules/route/front/basic-data/index.html index da58ead63f..5bdcfc1e5d 100644 --- a/modules/route/front/basic-data/index.html +++ b/modules/route/front/basic-data/index.html @@ -5,7 +5,7 @@ form="form" save="patch"> -
+ - + + + + + + - - - + label="Description" + field="$ctrl.route.description" vn-focus> + diff --git a/modules/route/front/basic-data/index.js b/modules/route/front/basic-data/index.js index 30e8abfb36..3c64200f4c 100644 --- a/modules/route/front/basic-data/index.js +++ b/modules/route/front/basic-data/index.js @@ -1,8 +1,24 @@ import ngModule from '../module'; +class Controller { + constructor($scope, $state) { + this.$scope = $scope; + this.$state = $state; + } + + onSubmit() { + this.$scope.watcher.submit().then(() => { + this.card.reload(); + }); + } +} ngModule.component('vnRouteBasicData', { template: require('./index.html'), + controller: Controller, bindings: { route: '<' + }, + require: { + card: '^vnRouteCard' } }); diff --git a/modules/route/front/basic-data/locale/es.yml b/modules/route/front/basic-data/locale/es.yml index 49bc892942..442a4fa828 100644 --- a/modules/route/front/basic-data/locale/es.yml +++ b/modules/route/front/basic-data/locale/es.yml @@ -2,3 +2,4 @@ Date finished: Fecha fin Date started: Fecha inicio Km start: Km de inicio Km end: Km de fin +Description: Descripción \ No newline at end of file diff --git a/modules/route/front/descriptor/index.html b/modules/route/front/descriptor/index.html index dac65333e9..1b5576167c 100644 --- a/modules/route/front/descriptor/index.html +++ b/modules/route/front/descriptor/index.html @@ -40,7 +40,7 @@ + ng-class="{bright: $ctrl.route.m3 > $ctrl.route.vehicle.m3 && $ctrl.route.vehicle.m3 != NULL}">
@@ -74,5 +74,5 @@ + question="Are you sure you want to update the volume?"> \ No newline at end of file diff --git a/modules/route/front/descriptor/index.js b/modules/route/front/descriptor/index.js index 15472726ef..d0b8e266b0 100644 --- a/modules/route/front/descriptor/index.js +++ b/modules/route/front/descriptor/index.js @@ -1,5 +1,4 @@ import ngModule from '../module'; -import {createDecipher} from 'crypto'; class Controller { constructor($, $http, vnApp, $translate, aclService) { diff --git a/modules/route/front/descriptor/locale/es.yml b/modules/route/front/descriptor/locale/es.yml index f2347b9962..63fa7202be 100644 --- a/modules/route/front/descriptor/locale/es.yml +++ b/modules/route/front/descriptor/locale/es.yml @@ -3,4 +3,5 @@ Volume: Volumen Send route report: Enviar informe de ruta Show route report: Ver informe de ruta Update volume: Actualizar volumen -Volume updated: Volumen actualizado \ No newline at end of file +Volume updated: Volumen actualizado +Are you sure you want to update the volume?: Estas seguro que quieres actualizar el volumen? \ No newline at end of file diff --git a/modules/route/front/routes.json b/modules/route/front/routes.json index 635324267e..baffe90822 100644 --- a/modules/route/front/routes.json +++ b/modules/route/front/routes.json @@ -6,8 +6,8 @@ "dependencies": ["client", "worker", "ticket"], "menu": [ {"state": "route.card.basicData", "icon": "settings"}, - {"state": "route.card.log", "icon": "history"}, - {"state": "route.card.tickets", "icon": "icon-ticket"}], + {"state": "route.card.tickets", "icon": "icon-ticket"}, + {"state": "route.card.log", "icon": "history"}], "routes": [ { "url": "/route", From 2bcdcaa133feff3fae9e155be824557a881ca855 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 30 Sep 2019 11:30:54 +0200 Subject: [PATCH 3/8] #1285 fixed, vnInputTime fixes --- e2e/helpers/extensions.js | 33 +++- e2e/helpers/selectors.js | 116 ++++++------- e2e/paths/02-client-module/17_dms.spec.js | 2 +- .../03-worker-module/02_time_control.spec.js | 72 +++----- .../05-ticket-module/12_descriptor.spec.js | 5 +- e2e/paths/06-claim-module/05_summary.spec.js | 2 + .../06-claim-module/06_descriptor.spec.js | 1 + front/core/components/card/card.js | 3 +- .../core/components/drop-down/drop-down.html | 6 +- front/core/components/drop-down/drop-down.js | 21 +-- front/core/components/drop-down/style.scss | 124 +++++++------- front/core/components/input-number/index.js | 59 ------- front/core/components/input-number/style.scss | 2 +- front/core/components/input-time/index.html | 7 +- front/core/components/input-time/index.js | 154 ++---------------- front/core/components/input-time/style.scss | 4 +- front/core/components/menu/menu.js | 8 +- front/core/components/popover/popover.html | 4 +- front/core/components/popover/popover.js | 85 ++++------ front/core/components/textfield/textfield.js | 6 +- front/core/directives/id.js | 9 +- front/core/directives/specs/id.spec.js | 8 - front/core/lib/input.js | 79 +++++++++ front/core/vendor.js | 4 +- .../salix/components/main-menu/main-menu.html | 2 +- front/salix/components/main-menu/style.scss | 47 +++--- .../user-configuration-popover/index.html | 2 +- .../user-configuration-popover/style.scss | 13 +- loopback/locale/en.json | 3 +- modules/ticket/front/sale/specs/index.spec.js | 2 +- modules/worker/front/time-control/index.js | 1 + 31 files changed, 363 insertions(+), 521 deletions(-) diff --git a/e2e/helpers/extensions.js b/e2e/helpers/extensions.js index abdb637e3a..9562ec641c 100644 --- a/e2e/helpers/extensions.js +++ b/e2e/helpers/extensions.js @@ -75,7 +75,7 @@ let actions = { }, changeLanguageToEnglish: function(done) { - let langSelector = 'vn-user-configuration-popover vn-autocomplete[field="$ctrl.lang"]'; + let langSelector = '.user-configuration vn-autocomplete[field="$ctrl.lang"]'; this.waitToClick('#user') .wait(langSelector) @@ -180,6 +180,7 @@ let actions = { .evaluate_now(elementSelector => { const selectorMatches = document.querySelectorAll(elementSelector); const element = selectorMatches[0]; + if (selectorMatches.length > 1) throw new Error(`multiple matches of ${elementSelector} found`); @@ -190,17 +191,18 @@ let actions = { isVisible = true; }; element.addEventListener('mouseover', eventHandler); - const elementBoundaries = element.getBoundingClientRect(); - const x = elementBoundaries.left + element.offsetWidth / 2; - const y = elementBoundaries.top + element.offsetHeight / 2; + const rect = element.getBoundingClientRect(); + const x = rect.left + rect.width / 2; + const y = rect.top + rect.height / 2; const elementInCenter = document.elementFromPoint(x, y); - const elementInTopLeft = document.elementFromPoint(elementBoundaries.left, elementBoundaries.top); - const elementInBottomRight = document.elementFromPoint(elementBoundaries.right, elementBoundaries.bottom); + const elementInTopLeft = document.elementFromPoint(rect.left, rect.top); + const elementInBottomRight = document.elementFromPoint(rect.right, rect.bottom); const e = new MouseEvent('mouseover', { view: window, bubbles: true, cancelable: true, }); + if (elementInCenter) elementInCenter.dispatchEvent(e); @@ -401,10 +403,12 @@ let actions = { autocompleteSearch: function(autocompleteSelector, searchValue, done) { this.wait(`${autocompleteSelector} input`) .waitToClick(`${autocompleteSelector} input`) - .write(`${autocompleteSelector} vn-drop-down input`, searchValue) - .waitToClick(`${autocompleteSelector} li.active`) + .write(`.vn-popover.shown .vn-drop-down input`, searchValue) + .waitToClick(`.vn-popover.shown .vn-drop-down li.active`) .wait((autocompleteSelector, searchValue) => { - return document.querySelector(`${autocompleteSelector} input`).value.toLowerCase().includes(searchValue.toLowerCase()); + return document.querySelector(`${autocompleteSelector} input`).value + .toLowerCase() + .includes(searchValue.toLowerCase()); }, autocompleteSelector, searchValue) .then(done) .catch(() => { @@ -412,6 +416,17 @@ let actions = { }); }, + pickTime: function(selector, time, done) { + this.wait(selector) + .evaluate((selector, time) => { + let input = document.querySelector(selector); + input.value = time; + input.dispatchEvent(new Event('change')); + }, selector, time) + .then(done) + .catch(done); + }, + datePicker: function(datePickerSelector, changeMonth, day, done) { this.wait(datePickerSelector) .mousedown(datePickerSelector) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 9be6bc0dd5..2b364d681c 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -3,19 +3,19 @@ import components from './components_selectors.js'; export default { globalItems: { applicationsMenuButton: '#apps', - applicationsMenuVisible: 'vn-main-menu [vn-id="apps-menu"] ul', - clientsButton: 'vn-main-menu [vn-id="apps-menu"] ul > li[ui-sref="client.index"]', - itemsButton: 'vn-main-menu [vn-id="apps-menu"] ul > li[ui-sref="item.index"]', - ticketsButton: 'vn-main-menu [vn-id="apps-menu"] ul > li[ui-sref="ticket.index"]', - invoiceOutButton: 'vn-main-menu [vn-id="apps-menu"] ul > li[ui-sref="invoiceOut.index"]', - claimsButton: 'vn-main-menu [vn-id="apps-menu"] ul > li[ui-sref="claim.index"]', + applicationsMenuVisible: '.modules-menu', + clientsButton: '.modules-menu > li[ui-sref="client.index"]', + itemsButton: '.modules-menu > li[ui-sref="item.index"]', + ticketsButton: '.modules-menu > li[ui-sref="ticket.index"]', + invoiceOutButton: '.modules-menu > li[ui-sref="invoiceOut.index"]', + claimsButton: '.modules-menu > li[ui-sref="claim.index"]', returnToModuleIndexButton: 'a[ui-sref="order.index"]', userMenuButton: 'vn-topbar #user', - userLocalWarehouse: 'vn-topbar vn-popover vn-autocomplete[field="$ctrl.localWarehouseFk"]', - userLocalBank: 'vn-topbar vn-popover vn-autocomplete[field="$ctrl.localBankFk"]', - userLocalCompany: 'vn-topbar vn-popover vn-autocomplete[field="$ctrl.localCompanyFk"]', - userWarehouse: 'vn-topbar vn-popover vn-autocomplete[field="$ctrl.warehouseFk"]', - userCompany: 'vn-topbar vn-popover vn-autocomplete[field="$ctrl.companyFk"]', + userLocalWarehouse: '.user-configuration vn-autocomplete[field="$ctrl.localWarehouseFk"]', + userLocalBank: '.user-configuration vn-autocomplete[field="$ctrl.localBankFk"]', + userLocalCompany: '.user-configuration vn-autocomplete[field="$ctrl.localCompanyFk"]', + userWarehouse: '.user-configuration vn-autocomplete[field="$ctrl.warehouseFk"]', + userCompany: '.user-configuration vn-autocomplete[field="$ctrl.companyFk"]', userConfigFirstAutocompleteClear: '#localWarehouse > div > div > div > vn-icon.clear', userConfigSecondAutocompleteClear: '#localBank > div > div > div > vn-icon.clear', userConfigThirdAutocompleteClear: '#localCompany > div > div > div > vn-icon.clear', @@ -45,7 +45,7 @@ export default { }, clientDescriptor: { moreMenu: 'vn-client-descriptor vn-icon-menu > div > vn-icon', - simpleTicketButton: 'vn-client-descriptor vn-popover > div > div.content > div > div.list > ul > li' + simpleTicketButton: '.vn-popover.shown .vn-drop-down li' }, clientBasicData: { basicDataButton: 'vn-left-menu a[ui-sref="client.card.basicData"]', @@ -177,7 +177,7 @@ export default { dms: { deleteFileButton: 'vn-client-dms-index vn-table vn-tr:nth-child(1) vn-icon-button[icon="delete"]', firstDocWorker: 'vn-client-dms-index vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(8) > span', - firstDocWorkerDescriptor: 'vn-client-dms-index > vn-worker-descriptor-popover > vn-popover', + firstDocWorkerDescriptor: '.vn-popover.shown vn-worker-descriptor', acceptDeleteButton: 'vn-client-dms-index > vn-confirm button[response="ACCEPT"]' }, itemsIndex: { @@ -218,7 +218,7 @@ export default { itemDescriptor: { goBackToModuleIndexButton: 'vn-item-descriptor a[href="#!/item/index"]', moreMenu: 'vn-item-descriptor vn-icon-menu > div > vn-icon', - moreMenuRegularizeButton: 'vn-item-descriptor vn-drop-down > vn-popover ul > li[name="Regularize stock"]', + moreMenuRegularizeButton: '.vn-popover.shown .vn-drop-down li[name="Regularize stock"]', regularizeQuantityInput: 'vn-item-descriptor > vn-dialog > div > form > div.body > tpl-body > div > vn-textfield > div > div > div.infix > input', regularizeWarehouseAutocomplete: 'vn-item-descriptor vn-dialog vn-autocomplete[field="$ctrl.warehouseFk"]', editButton: 'vn-item-card vn-item-descriptor vn-float-button[icon="edit"]', @@ -313,10 +313,10 @@ export default { total: 'vn-ticket-summary vn-one.taxes > p:nth-child(3) > strong', sale: 'vn-ticket-summary [name="sales"] vn-table > div > vn-tbody > vn-tr', firstSaleItemId: 'vn-ticket-summary [name="sales"] vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(2) > span', - firstSaleDescriptorImage: 'vn-ticket-summary vn-item-descriptor-popover > vn-popover vn-item-descriptor img', - itemDescriptorPopover: 'vn-ticket-summary vn-item-descriptor-popover > vn-popover', - itemDescriptorPopoverItemDiaryButton: 'vn-ticket-summary > vn-item-descriptor-popover a[href="#!/item/2/diary?warehouseFk=5&ticketFk=20"]', - popoverDiaryButton: 'vn-ticket-summary vn-item-descriptor-popover vn-item-descriptor vn-icon[icon="icon-transaction"]', + firstSaleDescriptorImage: '.vn-popover.shown vn-item-descriptor img', + itemDescriptorPopover: '.vn-popover.shown vn-item-descriptor', + itemDescriptorPopoverItemDiaryButton: 'vn-item-descriptor a[href="#!/item/2/diary?warehouseFk=5&ticketFk=20"]', + popoverDiaryButton: '.vn-popover.shown vn-item-descriptor vn-icon[icon="icon-transaction"]', firstSaleQuantity: 'vn-ticket-summary [name="sales"] vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(3)', firstSaleDiscount: 'vn-ticket-summary [name="sales"] vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(6)', invoiceOutRef: 'vn-ticket-summary > vn-card > div > vn-horizontal > vn-one:nth-child(1) > vn-label-value:nth-child(6) > section > span', @@ -324,7 +324,7 @@ export default { }, ticketsIndex: { openAdvancedSearchButton: 'vn-ticket-index vn-searchbar t-right-icons > vn-icon[icon="keyboard_arrow_down"]', - advancedSearchInvoiceOut: 'vn-ticket-index vn-searchbar vn-ticket-search-panel vn-textfield[model="filter.refFk"] input', + advancedSearchInvoiceOut: 'vn-ticket-search-panel vn-textfield[model="filter.refFk"] input', newTicketButton: 'vn-ticket-index > a', searchResult: 'vn-ticket-index vn-card > div > vn-table > div > vn-tbody > a.vn-tr', searchWeeklyResult: 'vn-ticket-weekly-index vn-table vn-tbody > vn-tr', @@ -332,11 +332,11 @@ export default { searchTicketInput: `vn-ticket-index ${components.vnTextfield}`, searchWeeklyTicketInput: `vn-ticket-weekly-index ${components.vnTextfield}`, searchWeeklyClearInput: 'vn-ticket-weekly-index vn-searchbar i[class="material-icons clear"]', - advancedSearchButton: 'vn-ticket-index vn-searchbar > vn-popover vn-ticket-search-panel vn-submit[label="Search"] input', + advancedSearchButton: 'vn-ticket-search-panel vn-submit[label="Search"] input', searchButton: 'vn-ticket-index vn-searchbar vn-icon[icon="search"]', searchWeeklyButton: 'vn-ticket-weekly-index vn-searchbar vn-icon[icon="search"]', moreMenu: 'vn-ticket-index vn-icon-menu[vn-id="more-button"] > div > vn-icon', - moreMenuWeeklyTickets: 'vn-ticket-index vn-icon-menu vn-drop-down > vn-popover li:nth-child(2)', + moreMenuWeeklyTickets: '.vn-popover.shown .vn-drop-down li:nth-child(2)', sixthWeeklyTicket: 'vn-ticket-weekly-index vn-table vn-tr:nth-child(6) vn-autocomplete[field="weekly.weekDay"] input', weeklyTicket: 'vn-ticket-weekly-index vn-table > div > vn-tbody > vn-tr', firstWeeklyTicketDeleteIcon: 'vn-ticket-weekly-index vn-tr:nth-child(1) vn-icon-button[icon="delete"]', @@ -355,13 +355,13 @@ export default { stateLabelValue: 'vn-ticket-descriptor vn-label-value[label="State"]', goBackToModuleIndexButton: 'vn-ticket-descriptor a[ui-sref="ticket.index"]', moreMenu: 'vn-ticket-descriptor vn-icon-menu > div > vn-icon', - moreMenuAddStowaway: 'vn-ticket-descriptor vn-drop-down > vn-popover ul > li[name="Add stowaway"]', - moreMenuDeleteStowawayButton: 'vn-ticket-descriptor vn-drop-down > vn-popover ul > li[name="Remove stowaway"]', - moreMenuAddToTurn: 'vn-ticket-descriptor vn-drop-down > vn-popover ul > li[name="Add turn"]', - moreMenuDeleteTicket: 'vn-ticket-descriptor vn-drop-down > vn-popover ul > li[name="Delete ticket"]', - moreMenuMakeInvoice: 'vn-ticket-descriptor vn-drop-down > vn-popover ul > li[name="Make invoice"]', - moreMenuChangeShippedHour: 'vn-ticket-descriptor vn-drop-down > vn-popover ul > li[name="Change shipped hour"]', - changeShippedHourInput: 'vn-ticket-descriptor > vn-dialog.ng-isolate-scope.vn-dialog.shown vn-input-time input', + moreMenuAddStowaway: '.vn-popover.shown .vn-drop-down li[name="Add stowaway"]', + moreMenuDeleteStowawayButton: '.vn-popover.shown .vn-drop-down li[name="Remove stowaway"]', + moreMenuAddToTurn: '.vn-popover.shown .vn-drop-down li[name="Add turn"]', + moreMenuDeleteTicket: '.vn-popover.shown .vn-drop-down li[name="Delete ticket"]', + moreMenuMakeInvoice: '.vn-popover.shown .vn-drop-down li[name="Make invoice"]', + moreMenuChangeShippedHour: '.vn-popover.shown .vn-drop-down li[name="Change shipped hour"]', + changeShippedHourInput: 'vn-ticket-descriptor .vn-dialog.shown vn-input-time input', addStowawayDialogFirstTicket: 'vn-ticket-descriptor > vn-add-stowaway > vn-dialog vn-table vn-tbody vn-tr', shipButton: 'vn-ticket-descriptor > div > div.body > div.quicklinks vn-icon[icon="icon-stowaway"]', thursdayButton: 'vn-ticket-descriptor > vn-dialog > div > form > div.body > tpl-body > div > vn-tool-bar > vn-button:nth-child(4)', @@ -398,21 +398,21 @@ export default { ticketSales: { saleButton: 'vn-left-menu a[ui-sref="ticket.card.sale"]', saleLine: 'vn-table div > vn-tbody > vn-tr', - saleDescriptorPopover: 'vn-ticket-sale vn-item-descriptor-popover > vn-popover', - saleDescriptorPopoverSummaryButton: 'vn-item-descriptor-popover a[ui-sref="item.card.summary({id: $ctrl.item.id})"]', + saleDescriptorPopover: '.vn-popover.shown vn-item-descriptor', + saleDescriptorPopoverSummaryButton: '.vn-popover.shown vn-item-descriptor a[ui-sref="item.card.summary({id: $ctrl.item.id})"]', descriptorItemDiaryButton: 'vn-item-descriptor .quicklinks.ng-scope > vn-horizontal > a > vn-icon > i', newItemFromCatalogButton: 'vn-ticket-sale vn-float-button[icon="add"]', newItemButton: 'vn-ticket-sale > vn-vertical > vn-card > div > vn-vertical > vn-one > vn-icon-button > button > vn-icon > i', moreMenu: 'vn-ticket-sale vn-tool-bar > vn-button-menu[vn-id="more-button"] > div > button', - moreMenuCreateClaim: 'vn-ticket-sale vn-tool-bar > vn-button-menu[vn-id="more-button"] vn-drop-down > vn-popover ul > li[name="Add claim"]', - moreMenuReserve: 'vn-ticket-sale vn-tool-bar > vn-button-menu[vn-id="more-button"] vn-drop-down > vn-popover ul > li[name="Mark as reserved"]', - moreMenuUnmarkReseved: 'vn-ticket-sale vn-tool-bar > vn-button-menu[vn-id="more-button"] vn-drop-down > vn-popover ul > li[name="Unmark as reserved"]', - moreMenuUpdateDiscount: 'vn-ticket-sale vn-tool-bar > vn-button-menu[vn-id="more-button"] vn-drop-down > vn-popover ul > li[name="Update discount"]', + moreMenuCreateClaim: '.vn-popover.shown .vn-drop-down li[name="Add claim"]', + moreMenuReserve: '.vn-popover.shown .vn-drop-down li[name="Mark as reserved"]', + moreMenuUnmarkReseved: '.vn-popover.shown .vn-drop-down li[name="Unmark as reserved"]', + moreMenuUpdateDiscount: '.vn-popover.shown .vn-drop-down li[name="Update discount"]', moreMenuUpdateDiscountInput: 'vn-ticket-sale vn-dialog form vn-ticket-sale-edit-discount vn-input-number[model="$ctrl.newDiscount"] input', - transferQuantityInput: 'vn-ticket-sale vn-popover.transfer.ng-isolate-scope.vn-popover.shown vn-table > div > vn-tbody > vn-tr > vn-td-editable > span > text', - transferQuantityCell: 'vn-ticket-sale vn-popover.transfer.ng-isolate-scope.vn-popover.shown vn-table > div > vn-tbody > vn-tr > vn-td-editable', + transferQuantityInput: '.vn-popover.shown vn-table > div > vn-tbody > vn-tr > vn-td-editable > span > text', + transferQuantityCell: '.vn-popover.shown vn-table > div > vn-tbody > vn-tr > vn-td-editable', firstSaleClaimIcon: 'vn-ticket-sale vn-table vn-tbody > vn-tr:nth-child(1) vn-icon[icon="icon-claims"]', - firstSaleDescriptorImage: 'vn-ticket-sale vn-item-descriptor-popover > vn-popover vn-item-descriptor img', + firstSaleDescriptorImage: '.vn-popover.shown vn-item-descriptor img', firstSaleText: 'vn-table div > vn-tbody > vn-tr:nth-child(1)', firstSaleThumbnailImage: 'vn-ticket-sale:nth-child(1) vn-tr:nth-child(1) vn-td:nth-child(3) > img', firstSaleZoomedImage: 'body > div > div > img', @@ -421,9 +421,9 @@ export default { firstSaleQuantityClearInput: 'vn-textfield[model="sale.quantity"] div.suffix > i', firstSaleIdInput: 'body > vn-app > div > ui-view > vn-ticket-card > vn-main-block > div > vn-ticket-sale > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(4) > vn-autocomplete > div > div > input', firstSaleIdAutocomplete: 'vn-ticket-sale > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(4) > vn-autocomplete', - idAutocompleteFirstResult: 'vn-ticket-sale > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr:nth-child(2) > vn-td:nth-child(4) > vn-autocomplete > vn-drop-down > vn-popover > div > div.content > div > div.list > ul > li', + idAutocompleteFirstResult: '.vn-popover.shown .vn-drop-down li', firstSalePrice: 'vn-ticket-sale vn-table vn-tr:nth-child(1) > vn-td:nth-child(7) > span', - firstSalePriceInput: 'vn-ticket-sale:nth-child(1) vn-popover.edit.dialog-summary.ng-isolate-scope.vn-popover.shown vn-input-number input', + firstSalePriceInput: '.vn-popover.shown vn-input-number input', firstSaleDiscount: 'vn-ticket-sale vn-table vn-tr:nth-child(1) > vn-td:nth-child(8) > span', firstSaleDiscountInput: 'vn-ticket-sale:nth-child(1) vn-ticket-sale-edit-discount vn-input-number input', firstSaleImport: 'vn-ticket-sale:nth-child(1) vn-td:nth-child(9)', @@ -449,10 +449,10 @@ export default { thirdSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(3) vn-check[field="sale.checked"] md-checkbox', deleteSaleButton: 'vn-ticket-sale vn-tool-bar > vn-button[icon="delete"]', transferSaleButton: 'vn-ticket-sale vn-tool-bar > vn-button[icon="call_split"]', - moveToTicketInput: 'vn-ticket-sale vn-popover.transfer vn-textfield[model="$ctrl.transfer.ticketId"] input', - moveToTicketInputClearButton: 'vn-popover.shown i[title="Clear"]', - moveToTicketButton: 'vn-ticket-sale vn-popover.transfer vn-icon[icon="arrow_forward_ios"]', - moveToNewTicketButton: 'vn-ticket-sale vn-popover.transfer vn-button[label="New ticket"]', + moveToTicketInput: '.vn-popover.shown vn-textfield[model="$ctrl.transfer.ticketId"] input', + moveToTicketInputClearButton: '.vn-popover.shown i[title="Clear"]', + moveToTicketButton: '.vn-popover.shown vn-icon[icon="arrow_forward_ios"]', + moveToNewTicketButton: '.vn-popover.shown vn-button[label="New ticket"]', acceptDeleteLineButton: 'vn-ticket-sale > vn-confirm[vn-id="delete-lines"] button[response=ACCEPT]', acceptDeleteTicketButton: 'vn-ticket-sale > vn-confirm[vn-id="delete-ticket"] button[response=ACCEPT]', stateMenuButton: 'vn-ticket-sale vn-tool-bar > vn-button-menu[label="State"]' @@ -524,7 +524,7 @@ export default { }, claimDescriptor: { moreMenu: 'vn-claim-descriptor vn-icon-menu[vn-id="more-button"]', - moreMenuDeleteClaim: 'vn-claim-descriptor vn-icon-menu vn-drop-down li[name="Delete claim"]', + moreMenuDeleteClaim: '.vn-popover.shown .vn-drop-down li[name="Delete claim"]', acceptDeleteClaim: 'vn-claim-descriptor > vn-confirm[vn-id="confirm-delete-claim"] button[response="ACCEPT"]' }, claimSummary: { @@ -532,13 +532,13 @@ export default { state: 'vn-claim-summary vn-label-value[label="State"] > section > span', observation: 'vn-claim-summary vn-textarea[model="$ctrl.summary.claim.observation"] > div > textarea', firstSaleItemId: 'vn-claim-summary vn-horizontal > vn-auto:nth-child(4) > vn-table > div > vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(1) > span', - firstSaleDescriptorImage: 'vn-claim-summary vn-item-descriptor-popover > vn-popover vn-item-descriptor img', - itemDescriptorPopover: 'vn-claim-summary vn-item-descriptor-popover > vn-popover', - itemDescriptorPopoverItemDiaryButton: 'vn-claim-summary > vn-item-descriptor-popover a[href="#!/item/2/diary"]', + firstSaleDescriptorImage: '.vn-popover.shown vn-item-descriptor img', + itemDescriptorPopover: '.vn-popover.shown vn-item-descriptor', + itemDescriptorPopoverItemDiaryButton: '.vn-popover.shown vn-item-descriptor a[href="#!/item/2/diary"]', firstDevelopmentWorker: 'vn-claim-summary vn-horizontal > vn-auto:nth-child(5) > vn-table > div > vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(4) > span', - firstDevelopmentWorkerGoToClientButton: 'vn-claim-summary > vn-worker-descriptor-popover > vn-popover vn-worker-descriptor div.quicklinks > a[href="#!/client/21/summary"]', + firstDevelopmentWorkerGoToClientButton: '.vn-popover.shown vn-worker-descriptor div.quicklinks > a[href="#!/client/21/summary"]', firstActionTicketId: 'vn-claim-summary > vn-card > div > vn-horizontal > vn-auto:nth-child(6) > vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(2) > span', - firstActionTicketDescriptor: 'vn-claim-summary > vn-ticket-descriptor-popover > vn-popover > div > div.content > vn-ticket-descriptor' + firstActionTicketDescriptor: '.vn-popover.shown vn-ticket-descriptor' }, claimBasicData: { claimStateAutocomplete: 'vn-claim-basic-data vn-autocomplete[field="$ctrl.claim.claimStateFk"]', @@ -548,8 +548,8 @@ export default { }, claimDetail: { secondItemDiscount: 'vn-claim-detail > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr:nth-child(2) > vn-td:nth-child(6) > span', - discountInput: 'vn-claim-detail vn-popover vn-input-number[model="$ctrl.newDiscount"] > div > div > div.infix > input', - discoutPopoverMana: 'vn-claim-detail > vn-popover > div > div.content > div > vn-horizontal > h5', + discountInput: '.vn-popover.shown vn-input-number[model="$ctrl.newDiscount"] > div > div > div.infix > input', + discoutPopoverMana: '.vn-popover.shown .content > div > vn-horizontal > h5', addItemButton: 'vn-claim-detail a vn-float-button', firstClaimableSaleFromTicket: 'vn-claim-detail > vn-dialog vn-tbody > vn-tr', claimDetailLine: 'vn-claim-detail > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr', @@ -575,7 +575,7 @@ export default { claimAction: { importClaimButton: 'vn-claim-action vn-button[label="Import claim"]', importTicketButton: 'vn-claim-action vn-button[label="Import ticket"]', - secondImportableTicket: 'vn-claim-action > vn-vertical > vn-popover > div > div.content > div > vn-table > div > vn-tbody > vn-tr:nth-child(2)', + secondImportableTicket: '.vn-popover.shown .content > div > vn-table > div > vn-tbody > vn-tr:nth-child(2)', firstLineDestination: 'vn-claim-action vn-tr:nth-child(1) vn-autocomplete[field="saleClaimed.claimDestinationFk"]', secondLineDestination: 'vn-claim-action vn-tr:nth-child(2) vn-autocomplete[field="saleClaimed.claimDestinationFk"]', firstDeleteLine: 'vn-claim-action vn-tr:nth-child(1) vn-icon-button[icon="delete"]', @@ -608,9 +608,9 @@ export default { itemIdInput: 'vn-order-catalog > vn-side-menu vn-catalog-filter vn-textfield[model="$ctrl.itemFk"] input', itemTagValueInput: 'vn-order-catalog > vn-side-menu vn-catalog-filter vn-textfield[model="$ctrl.value"] input', openTagSearch: 'vn-order-catalog > vn-side-menu > div > vn-catalog-filter > div > vn-vertical > vn-textfield[model="$ctrl.value"] > div > div > div.rightIcons > t-right-icons > i', - tagAutocomplete: 'vn-order-catalog > vn-side-menu vn-catalog-filter vn-popover vn-order-catalog-search-panel vn-autocomplete[field="filter.tagFk"]', - tagValueInput: 'vn-order-catalog > vn-side-menu vn-catalog-filter vn-popover vn-order-catalog-search-panel vn-textfield[model="filter.value"] input', - searchTagButton: 'vn-order-catalog > vn-side-menu vn-catalog-filter vn-popover vn-order-catalog-search-panel > div > form > vn-horizontal:nth-child(3) > vn-submit > input', + tagAutocomplete: 'vn-order-catalog-search-panel vn-autocomplete[field="filter.tagFk"]', + tagValueInput: 'vn-order-catalog-search-panel vn-textfield[model="filter.value"] input', + searchTagButton: 'vn-order-catalog-search-panel > div > form > vn-horizontal:nth-child(3) > vn-submit > input', thirdFilterRemoveButton: 'vn-order-catalog > vn-side-menu vn-catalog-filter > div > vn-horizontal.chips > vn-chip:nth-child(3) button', fourthFilterRemoveButton: 'vn-order-catalog > vn-side-menu vn-catalog-filter > div > vn-horizontal.chips > vn-chip:nth-child(4) button', }, @@ -727,9 +727,9 @@ export default { }, invoiceOutDescriptor: { moreMenu: 'vn-invoice-out-descriptor vn-icon-menu[vn-id="more-button"]', - moreMenuDeleteInvoiceOut: 'vn-invoice-out-descriptor vn-popover li[name="Delete Invoice"]', - moreMenuBookInvoiceOut: 'vn-invoice-out-descriptor vn-popover li[name="Book invoice"]', - moreMenuShowInvoiceOutPdf: 'vn-invoice-out-descriptor vn-popover li[name="Show invoice PDF"]', + moreMenuDeleteInvoiceOut: '.vn-popover.shown .vn-drop-down li[name="Delete Invoice"]', + moreMenuBookInvoiceOut: '.vn-popover.shown .vn-drop-down li[name="Book invoice"]', + moreMenuShowInvoiceOutPdf: '.vn-popover.shown .vn-drop-down li[name="Show invoice PDF"]', acceptDeleteButton: 'vn-invoice-out-descriptor > vn-confirm[vn-id="deleteConfirmation"] button[response="ACCEPT"]', acceptBookingButton: 'vn-invoice-out-descriptor > vn-confirm[vn-id="bookConfirmation"] button[response="ACCEPT"]' }, diff --git a/e2e/paths/02-client-module/17_dms.spec.js b/e2e/paths/02-client-module/17_dms.spec.js index 16a061f850..236401cf43 100644 --- a/e2e/paths/02-client-module/17_dms.spec.js +++ b/e2e/paths/02-client-module/17_dms.spec.js @@ -24,7 +24,7 @@ describe('Client DMS', () => { it(`should click on the first document line worker name making the descriptor visible`, async() => { const visible = await nightmare .waitToClick(selectors.dms.firstDocWorker) - .waitForClassPresent(selectors.dms.firstDocWorkerDescriptor, 'shown') + .wait(selectors.dms.firstDocWorkerDescriptor) .isVisible(selectors.dms.firstDocWorkerDescriptor); expect(visible).toBeTruthy(); diff --git a/e2e/paths/03-worker-module/02_time_control.spec.js b/e2e/paths/03-worker-module/02_time_control.spec.js index b6d6d17547..42be3e9e02 100644 --- a/e2e/paths/03-worker-module/02_time_control.spec.js +++ b/e2e/paths/03-worker-module/02_time_control.spec.js @@ -17,8 +17,7 @@ describe('Worker time control path', () => { const scanTime = '07:00'; const result = await nightmare .waitToClick(selectors.workerTimeControl.mondayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.firstEntryOfMonday, 'innerText'); @@ -29,8 +28,7 @@ describe('Worker time control path', () => { const scanTime = '10:00'; const result = await nightmare .waitToClick(selectors.workerTimeControl.mondayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.secondEntryOfMonday, 'innerText'); @@ -41,8 +39,7 @@ describe('Worker time control path', () => { const scanTime = '15:00'; const result = await nightmare .waitToClick(selectors.workerTimeControl.mondayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.thirdEntryOfMonday, 'innerText'); @@ -53,8 +50,7 @@ describe('Worker time control path', () => { const scanTime = '10:20'; const result = await nightmare .waitToClick(selectors.workerTimeControl.mondayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.fourthEntryOfMonday, 'innerText'); @@ -82,8 +78,7 @@ describe('Worker time control path', () => { const scanTime = '08:00'; const result = await nightmare .waitToClick(selectors.workerTimeControl.tuesdayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.firstEntryOfTuesday, 'innerText'); @@ -94,8 +89,7 @@ describe('Worker time control path', () => { const scanTime = '10:00'; const result = await nightmare .waitToClick(selectors.workerTimeControl.tuesdayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.secondEntryOfTuesday, 'innerText'); @@ -106,8 +100,7 @@ describe('Worker time control path', () => { const scanTime = '10:20'; const result = await nightmare .waitToClick(selectors.workerTimeControl.tuesdayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.thirdEntryOfTuesday, 'innerText'); @@ -118,8 +111,7 @@ describe('Worker time control path', () => { const scanTime = '16:00'; const result = await nightmare .waitToClick(selectors.workerTimeControl.tuesdayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.fourthEntryOfTuesday, 'innerText'); @@ -139,8 +131,7 @@ describe('Worker time control path', () => { const scanTime = '09:00'; const result = await nightmare .waitToClick(selectors.workerTimeControl.wednesdayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.firstEntryOfWednesday, 'innerText'); @@ -151,8 +142,7 @@ describe('Worker time control path', () => { const scanTime = '10:00'; const result = await nightmare .waitToClick(selectors.workerTimeControl.wednesdayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.secondEntryOfWednesday, 'innerText'); @@ -163,8 +153,7 @@ describe('Worker time control path', () => { const scanTime = '10:20'; const result = await nightmare .waitToClick(selectors.workerTimeControl.wednesdayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.thirdEntryOfWednesday, 'innerText'); @@ -175,8 +164,7 @@ describe('Worker time control path', () => { const scanTime = '17:00'; const result = await nightmare .waitToClick(selectors.workerTimeControl.wednesdayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.fourthEntryOfWednesday, 'innerText'); @@ -196,8 +184,7 @@ describe('Worker time control path', () => { const scanTime = '09:59'; const result = await nightmare .waitToClick(selectors.workerTimeControl.thursdayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.firstEntryOfThursday, 'innerText'); @@ -208,8 +195,7 @@ describe('Worker time control path', () => { const scanTime = '10:00'; const result = await nightmare .waitToClick(selectors.workerTimeControl.thursdayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.secondEntryOfThursday, 'innerText'); @@ -220,8 +206,7 @@ describe('Worker time control path', () => { const scanTime = '10:20'; const result = await nightmare .waitToClick(selectors.workerTimeControl.thursdayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.thirdEntryOfThursday, 'innerText'); @@ -232,8 +217,7 @@ describe('Worker time control path', () => { const scanTime = '17:59'; const result = await nightmare .waitToClick(selectors.workerTimeControl.thursdayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.fourthEntryOfThursday, 'innerText'); @@ -253,8 +237,7 @@ describe('Worker time control path', () => { const scanTime = '07:30'; const result = await nightmare .waitToClick(selectors.workerTimeControl.fridayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.firstEntryOfFriday, 'innerText'); @@ -265,8 +248,7 @@ describe('Worker time control path', () => { const scanTime = '10:00'; const result = await nightmare .waitToClick(selectors.workerTimeControl.fridayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.secondEntryOfFriday, 'innerText'); @@ -277,8 +259,7 @@ describe('Worker time control path', () => { const scanTime = '10:20'; const result = await nightmare .waitToClick(selectors.workerTimeControl.fridayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.thirdEntryOfFriday, 'innerText'); @@ -289,8 +270,7 @@ describe('Worker time control path', () => { const scanTime = '15:30'; const result = await nightmare .waitToClick(selectors.workerTimeControl.fridayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.fourthEntryOfFriday, 'innerText'); @@ -319,8 +299,7 @@ describe('Worker time control path', () => { const scanTime = '06:00'; const result = await nightmare .waitToClick(selectors.workerTimeControl.saturdayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.firstEntryOfSaturday, 'innerText'); @@ -331,8 +310,7 @@ describe('Worker time control path', () => { const scanTime = '13:40'; const result = await nightmare .waitToClick(selectors.workerTimeControl.saturdayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.secondEntryOfSaturday, 'innerText'); @@ -352,8 +330,7 @@ describe('Worker time control path', () => { const scanTime = '05:00'; const result = await nightmare .waitToClick(selectors.workerTimeControl.sundayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.firstEntryOfSunday, 'innerText'); @@ -364,8 +341,7 @@ describe('Worker time control path', () => { const scanTime = '12:40'; const result = await nightmare .waitToClick(selectors.workerTimeControl.sundayAddTimeButton) - .clearInput(selectors.workerTimeControl.timeDialogInput) - .write(selectors.workerTimeControl.timeDialogInput, scanTime) + .pickTime(selectors.workerTimeControl.timeDialogInput, scanTime) .waitToClick(selectors.workerTimeControl.confirmButton) .waitToGetProperty(selectors.workerTimeControl.secondEntryOfSunday, 'innerText'); diff --git a/e2e/paths/05-ticket-module/12_descriptor.spec.js b/e2e/paths/05-ticket-module/12_descriptor.spec.js index cbae66d931..0424f1f94c 100644 --- a/e2e/paths/05-ticket-module/12_descriptor.spec.js +++ b/e2e/paths/05-ticket-module/12_descriptor.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import createNightmare from '../../helpers/nightmare'; -describe('Ticket descriptor path', () => { +fdescribe('Ticket descriptor path', () => { const nightmare = createNightmare(); beforeAll(() => { @@ -43,7 +43,7 @@ describe('Ticket descriptor path', () => { it(`should update the shipped hour`, async() => { const result = await nightmare - .write(selectors.ticketDescriptor.changeShippedHourInput, '0815') + .pickTime(selectors.ticketDescriptor.changeShippedHourInput, '08:15') .waitToClick(selectors.ticketDescriptor.acceptChangeHourButton) .waitForLastSnackbar(); @@ -116,7 +116,6 @@ describe('Ticket descriptor path', () => { .wait(selectors.ticketDescriptor.addStowawayDialogFirstTicket) .isVisible(selectors.ticketDescriptor.addStowawayDialogFirstTicket); - expect(isVisible).toBeTruthy(); }); diff --git a/e2e/paths/06-claim-module/05_summary.spec.js b/e2e/paths/06-claim-module/05_summary.spec.js index 07e4c9080c..dde444ea3c 100644 --- a/e2e/paths/06-claim-module/05_summary.spec.js +++ b/e2e/paths/06-claim-module/05_summary.spec.js @@ -59,6 +59,7 @@ describe('claim Summary path', () => { .exists(selectors.claimSummary.itemDescriptorPopoverItemDiaryButton); expect(exists).toBeTruthy(); + await nightmare.mousedown('.vn-popover.shown'); }); it('should display the claim development details', async() => { @@ -82,6 +83,7 @@ describe('claim Summary path', () => { .exists(selectors.claimSummary.firstDevelopmentWorkerGoToClientButton); expect(exists).toBeTruthy(); + await nightmare.mousedown('.vn-popover.shown'); }); it(`should click on the first action ticket ID making the ticket descriptor visible`, async() => { diff --git a/e2e/paths/06-claim-module/06_descriptor.spec.js b/e2e/paths/06-claim-module/06_descriptor.spec.js index f434401295..67faaa2243 100644 --- a/e2e/paths/06-claim-module/06_descriptor.spec.js +++ b/e2e/paths/06-claim-module/06_descriptor.spec.js @@ -36,6 +36,7 @@ describe('claim Descriptor path', () => { it(`should be able to see the delete claim button of the descriptor more menu`, async() => { let exists = await nightmare .waitToClick(selectors.claimDescriptor.moreMenu) + .wait(selectors.claimDescriptor.moreMenuDeleteClaim) .exists(selectors.claimDescriptor.moreMenuDeleteClaim); expect(exists).toBeTruthy(); diff --git a/front/core/components/card/card.js b/front/core/components/card/card.js index 405a676940..b812ccf613 100644 --- a/front/core/components/card/card.js +++ b/front/core/components/card/card.js @@ -1,8 +1,7 @@ import ngModule from '../../module'; require('./style.scss'); -directive.$inject = ['vnTemplate']; -export default function directive(vnTemplate) { +export default function directive() { return { restrict: 'E', transclude: true, diff --git a/front/core/components/drop-down/drop-down.html b/front/core/components/drop-down/drop-down.html index 5fef1dd5e2..d4dec9dd55 100755 --- a/front/core/components/drop-down/drop-down.html +++ b/front/core/components/drop-down/drop-down.html @@ -2,17 +2,19 @@ vn-id="popover" on-open="$ctrl.onOpen()" on-close="$ctrl.onClose()"> -
+
-
+
diff --git a/front/core/components/drop-down/drop-down.js b/front/core/components/drop-down/drop-down.js index f027d1bf37..8422a60ded 100755 --- a/front/core/components/drop-down/drop-down.js +++ b/front/core/components/drop-down/drop-down.js @@ -31,10 +31,7 @@ export default class DropDown extends Component { $postLink() { super.$postLink(); - this.input = this.element.querySelector('.search input'); - this.ul = this.element.querySelector('ul'); - this.list = this.element.querySelector('.list'); - this.list.addEventListener('scroll', e => this.onScroll(e)); + this.$.list.addEventListener('scroll', e => this.onScroll(e)); } get shown() { @@ -129,7 +126,7 @@ export default class DropDown extends Component { moveToOption(option) { this.activateOption(option); - let list = this.list; + let list = this.$.list; let li = this.activeLi; if (!li) return; @@ -156,7 +153,7 @@ export default class DropDown extends Component { let data = this.modelData; if (option >= 0 && data && option < data.length) { - this.activeLi = this.ul.children[option]; + this.activeLi = this.$.ul.children[option]; this.activeLi.className = 'active'; } } @@ -195,8 +192,8 @@ export default class DropDown extends Component { onOpen() { this.document.addEventListener('keydown', this.docKeyDownHandler); - this.list.scrollTop = 0; - this.input.focus(); + this.$.list.scrollTop = 0; + this.$.input.focus(); } onClose() { @@ -208,7 +205,7 @@ export default class DropDown extends Component { } onScroll() { - let list = this.list; + let list = this.$.list; let shouldLoad = list.scrollTop + list.clientHeight >= (list.scrollHeight - 40) && !this.model.isLoading; @@ -225,7 +222,7 @@ export default class DropDown extends Component { onContainerClick(event) { if (event.defaultPrevented) return; - let index = getPosition(this.ul, event); + let index = getPosition(this.$.ul, event); if (index != -1) { event.preventDefault(); this.selectOption(index); @@ -312,13 +309,13 @@ export default class DropDown extends Component { } } - this.ul.appendChild(fragment); + this.$.ul.appendChild(fragment); this.activateOption(this._activeOption); this.$.$applyAsync(() => this.$.popover.relocate()); } destroyList() { - this.ul.innerHTML = ''; + this.$.ul.innerHTML = ''; if (this.scopes) { for (let scope of this.scopes) diff --git a/front/core/components/drop-down/style.scss b/front/core/components/drop-down/style.scss index 3fceb02122..a33186a6eb 100755 --- a/front/core/components/drop-down/style.scss +++ b/front/core/components/drop-down/style.scss @@ -1,79 +1,77 @@ @import "effects"; @import "variables"; -vn-drop-down { - .dropdown { - display: flex; - flex-direction: column; - height: inherit; +.vn-drop-down { + display: flex; + flex-direction: column; + height: inherit; - & > .filter { - position: relative; + & > .filter { + position: relative; - & > .search { - display: block; - width: 100%; - box-sizing: border-box; - border: none; - font-size: inherit; - padding: .6em; - margin: 0!important; - &.not-empty label{ - display: none; - } - & .selected label { - font-size: inherit; - bottom: 2px; - color: $color-font-secondary; - } - } - & > vn-icon[icon=clear] { + & > .search { + display: block; + width: 100%; + box-sizing: border-box; + border: none; + font-size: inherit; + padding: .6em; + margin: 0!important; + &.not-empty label{ display: none; - cursor: pointer; - position: absolute; - right: .5em; - top: .6em; - height: 1em; - color: #888; - border-radius: 50%; - background-color: rgba(255, 255, 255, .8); - font-size: 18px; - - &:hover { - color: $color-font; - } } - &:hover > vn-icon[icon=clear] { - display: block; + & .selected label { + font-size: inherit; + bottom: 2px; + color: $color-font-secondary; } } - & > .list { - max-height: 20em; - overflow: auto; + & > vn-icon[icon=clear] { + display: none; + cursor: pointer; + position: absolute; + right: .5em; + top: .6em; + height: 1em; + color: #888; + border-radius: 50%; + background-color: rgba(255, 255, 255, .8); + font-size: 18px; + + &:hover { + color: $color-font; + } + } + &:hover > vn-icon[icon=clear] { + display: block; + } + } + & > .list { + max-height: 20em; + overflow: auto; - ul { - padding: 0; + ul { + padding: 0; + margin: 0; + list-style-type: none; + } + li, .status { + @extend %clickable; + padding: .6em; + white-space: nowrap; + display: flex; + + & > input[type=checkbox] { margin: 0; - list-style-type: none; + margin-right: .6em; } - li, .status { - @extend %clickable; - padding: .6em; - white-space: nowrap; - display: flex; - - & > input[type=checkbox] { - margin: 0; - margin-right: .6em; - } - &.active { - @extend %active; - } - } - .status { - color: $color-main; - font-weight: bold; + &.active { + @extend %active; } } + .status { + color: $color-main; + font-weight: bold; + } } } diff --git a/front/core/components/input-number/index.js b/front/core/components/input-number/index.js index 6c9f378e82..8cf2ef1804 100644 --- a/front/core/components/input-number/index.js +++ b/front/core/components/input-number/index.js @@ -9,7 +9,6 @@ export default class InputNumber extends Input { this.hasFocus = false; vnTemplate.normalizeInputAttrs($attrs); - this.registerEvents(); } @@ -107,10 +106,6 @@ export default class InputNumber extends Input { if (value) this.input.step = value; } - get validationError() { - return this.input.validationMessage; - } - /** * Increases the input value */ @@ -124,61 +119,7 @@ export default class InputNumber extends Input { stepDown() { this.input.stepDown(); } - - /** - * Validates a valid input value - * - * @return {Boolean} - True if has a valid value - */ - hasValidValue() { - return this.input.checkValidity(); - } - - /** - * Changes the input element - * if has a validation error - */ - validateValue() { - if (!this.hasValidValue()) { - this.hideError(); - this.showError(); - } else - this.hideError(); - } - - /** - * Shows the input validation error - */ - showError() { - const infixElement = this.element.querySelector('.infix'); - const infixClassList = infixElement.classList; - - const errorSpan = document.createElement('span'); - errorSpan.className = 'mdl-textfield__error'; - - const errorText = document.createTextNode(this.validationError); - - errorSpan.append(errorText); - infixElement.append(errorSpan); - - infixClassList.add('validated', 'invalid'); - } - - /** - * Hides the input validation error - */ - hideError() { - const infixElement = this.element.querySelector('.infix'); - const infixClassList = infixElement.classList; - const errorElement = this.element.querySelector('.infix span.mdl-textfield__error'); - - if (errorElement) - errorElement.remove(); - - infixClassList.remove('validated', 'invalid'); - } } - InputNumber.$inject = ['$element', '$scope', '$attrs', 'vnTemplate']; ngModule.component('vnInputNumber', { diff --git a/front/core/components/input-number/style.scss b/front/core/components/input-number/style.scss index cb801d4703..1f7bdff573 100644 --- a/front/core/components/input-number/style.scss +++ b/front/core/components/input-number/style.scss @@ -4,7 +4,7 @@ vn-input-number { @extend vn-textfield; input { - text-align: center!important; + text-align: center !important; } vn-icon[icon=add], vn-icon[icon=remove]{ diff --git a/front/core/components/input-time/index.html b/front/core/components/input-time/index.html index 8d885ba47a..cc84b17c25 100644 --- a/front/core/components/input-time/index.html +++ b/front/core/components/input-time/index.html @@ -5,14 +5,11 @@
+ ng-blur="$ctrl.hasFocus = false"/>
diff --git a/front/core/components/input-time/index.js b/front/core/components/input-time/index.js index f6c6c7f77a..41f76c086e 100644 --- a/front/core/components/input-time/index.js +++ b/front/core/components/input-time/index.js @@ -3,17 +3,16 @@ import Input from '../../lib/input'; import './style.scss'; export default class InputTime extends Input { - constructor($element, $scope) { + constructor($element, $scope, $filter) { super($element, $scope); + this.$filter = $filter; this.registerEvents(); } - /** - * Registers all event emitters - */ registerEvents() { this.input.addEventListener('change', event => { + this.onTimeChange(); this.emit('change', {event}); }); @@ -35,147 +34,31 @@ export default class InputTime extends Input { * @param {Number} value - Value */ set value(value) { - if (this._value === undefined && value || typeof value === 'string') - value = this.formatTime(value); + this.updateValue(value); + this.input.value = this.$filter('date')(value, 'HH:mm'); + } + updateValue(value) { this._value = value; - this.hasValue = !(value === null || value === undefined); - - if (this.hasValue) - this.element.classList.add('not-empty'); - else - this.element.classList.remove('not-empty'); - + this.element.classList.toggle('not-empty', value != null); this.validateValue(); } - /** - * Gets max value - */ - get max() { - return this.input.max; - } + onTimeChange() { + let date = null; + let value = this.input.value; - /** - * Sets max allowed value - * - * @param {Number} value - Value - */ - set max(value) { - if (value) this.input.max = value; - } - - /** - * Gets min value - */ - get min() { - return this.input.min; - } - - /** - * Sets min allowed value - * - * @param {Number} value - Value - */ - set min(value) { - if (value) this.input.min = value; - } - - /** - * Gets min step value - */ - get step() { - return parseInt(this.input.step); - } - - /** - * Sets min step value - * - * @param {Number} value - Value - */ - set step(value) { - if (value) this.input.step = value; - } - - /** - * Returns a formatted hour - * @param {Date} date -a - * @return {String} Formatted hour - */ - formatTime(date) { - if (typeof date === 'string') { - date = new Date(date); - date.setTime(date.getTime() + (date.getTimezoneOffset() * 60000)); + if (value) { + let split = value.split(':').map(i => parseInt(i) || null); + date = new Date(this.value || null); + date.setHours(split[0], split[1], 0, 0); } - date.setSeconds(null); - date.setMilliseconds(null); - - return date; - } - - /** - * Returns native validation message - */ - get validationError() { - return this.input.validationMessage; - } - - /** - * Validates a valid input value - * - * @return {Boolean} - True if has a valid value - */ - hasValidValue() { - return this.input.checkValidity(); - } - - /** - * Changes the input element - * if has a validation error - */ - validateValue() { - if (!this.hasValidValue()) { - this.hideError(); - this.showError(); - } else - this.hideError(); - } - - /** - * Shows the input validation error - */ - showError() { - const infixElement = this.element.querySelector('.infix'); - const infixClassList = infixElement.classList; - - const errorSpan = document.createElement('span'); - errorSpan.className = 'mdl-textfield__error'; - - const errorText = document.createTextNode(this.validationError); - - errorSpan.append(errorText); - infixElement.append(errorSpan); - - infixClassList.add('validated', 'invalid'); - } - - /** - * Hides the input validation error - */ - hideError() { - const infixElement = this.element.querySelector('.infix'); - const infixClassList = infixElement.classList; - const errorElement = this.element.querySelector('.infix span.mdl-textfield__error'); - - if (errorElement) - errorElement.remove(); - - infixClassList.remove('validated', 'invalid'); + this.updateValue(date); } } -InputTime.$inject = ['$element', '$scope', '$attrs', 'vnTemplate', '$transclude']; +InputTime.$inject = ['$element', '$scope', '$filter']; ngModule.component('vnInputTime', { template: require('./index.html'), @@ -188,9 +71,6 @@ ngModule.component('vnInputTime', { label: '@?', disabled: ' this.onClick()); - } - - onClick() { - this.hide(); + this.popover.addEventListener('click', + () => this.hide()); } } diff --git a/front/core/components/popover/popover.html b/front/core/components/popover/popover.html index 3e3e6ca595..7a29ba817f 100644 --- a/front/core/components/popover/popover.html +++ b/front/core/components/popover/popover.html @@ -1,4 +1,6 @@ +
-
+
+
\ No newline at end of file diff --git a/front/core/components/popover/popover.js b/front/core/components/popover/popover.js index 0041a84139..8babe867d4 100644 --- a/front/core/components/popover/popover.js +++ b/front/core/components/popover/popover.js @@ -1,5 +1,6 @@ import ngModule from '../../module'; import Component from '../../lib/component'; +import template from './popover.html'; import './style.scss'; /** @@ -11,30 +12,26 @@ import './style.scss'; * @event close Thrown when popover is hidden */ export default class Popover extends Component { - constructor($element, $scope, $timeout, $transitions) { + constructor($element, $scope, $timeout, $transitions, $transclude, $compile) { super($element, $scope); this.$timeout = $timeout; this.$transitions = $transitions; this._shown = false; - } - $postLink() { - super.$postLink(); - this.$element.addClass('vn-popover'); - - this.docKeyDownHandler = e => this.onDocKeyDown(e); - this.docFocusInHandler = e => this.onDocFocusIn(e); - this.bgMouseDownHandler = e => this.onBgMouseDown(e); - - this.element.addEventListener('focusin', - e => this.onFocusIn(e)); + this.element = $compile(template)($scope)[0]; this.popover = this.element.querySelector('.popover'); - this.popover.addEventListener('mousedown', - e => this.onMouseDown(e)); + this.popover.addEventListener('mousedown', e => this.onMouseDown(e)); this.arrow = this.element.querySelector('.arrow'); this.content = this.element.querySelector('.content'); + + $transclude($scope.$parent, + clone => angular.element(this.content).append(clone)); + } + + $onDestroy() { + this.hide(); } /** @@ -74,33 +71,23 @@ export default class Popover extends Component { if (parent) this.parent = parent; - let isDescriptorMoreMenu = parent && parent.attributes[0].nodeValue == 'more-button'; - let leftMenu = this.document.querySelector('div[class="menu left"]'); - if (isDescriptorMoreMenu && leftMenu) { - let descriptorDiv = this.document.querySelector('vn-side-menu div[class="vn-descriptor"]'); - let leftMenuWidth = leftMenu.offsetWidth; + this._shown = true; - let descriptorWidth = descriptorDiv.offsetWidth; - this.scrollbarWidth = leftMenuWidth - descriptorWidth; - let newWidth = leftMenuWidth - this.scrollbarWidth; - - leftMenu.style.overflow = 'hidden'; - leftMenu.style.minWidth = `${newWidth}px`; - leftMenu.style.width = `${newWidth}px`; - - this.restoreOverflow = true; + if (!this.showTimeout) { + this.document.body.appendChild(this.element); + this.element.style.display = 'block'; } - this._shown = true; - this.element.style.display = 'block'; this.$timeout.cancel(this.showTimeout); this.showTimeout = this.$timeout(() => { - this.$element.addClass('shown'); this.showTimeout = null; + this.element.classList.add('shown'); }, 30); + this.docKeyDownHandler = e => this.onDocKeyDown(e); this.document.addEventListener('keydown', this.docKeyDownHandler); - this.document.addEventListener('focusin', this.docFocusInHandler); + + this.bgMouseDownHandler = e => this.onBgMouseDown(e); this.element.addEventListener('mousedown', this.bgMouseDownHandler); this.deregisterCallback = this.$transitions.onStart({}, () => this.hide()); @@ -114,28 +101,22 @@ export default class Popover extends Component { hide() { if (!this._shown) return; - if (this.restoreOverflow) { - const leftMenu = this.document.querySelector('div[class="menu left"]'); - let leftMenuWidth = parseInt(leftMenu.style.width); - let newWidth = leftMenuWidth + this.scrollbarWidth; - leftMenu.style.overflow = 'auto'; - leftMenu.style.minWidth = `${newWidth}px`; - leftMenu.style.width = `${newWidth}px`; - - this.restoreOverflow = false; - } this._shown = false; - this.$element.removeClass('shown'); + this.element.classList.remove('shown'); + this.$timeout.cancel(this.showTimeout); this.showTimeout = this.$timeout(() => { - this.element.style.display = 'none'; this.showTimeout = null; + this.element.style.display = 'none'; + this.document.body.removeChild(this.element); this.emit('close'); }, 250); this.document.removeEventListener('keydown', this.docKeyDownHandler); - this.document.removeEventListener('focusin', this.docFocusInHandler); + this.docKeyDownHandler = null; + this.element.removeEventListener('mousedown', this.bgMouseDownHandler); + this.bgMouseDownHandler = null; if (this.deregisterCallback) this.deregisterCallback(); @@ -165,7 +146,7 @@ export default class Popover extends Component { let arrowHeight = Math.floor(arrowRect.height / 2); let arrowOffset = arrowHeight + margin / 2; - let docEl = document.documentElement; + let docEl = this.document.documentElement; let maxRight = Math.min(window.innerWidth, docEl.clientWidth) - margin; let maxBottom = Math.min(window.innerHeight, docEl.clientHeight) - margin; let maxWith = maxRight - margin; @@ -214,20 +195,10 @@ export default class Popover extends Component { if (event != this.lastMouseEvent) this.hide(); } - - onFocusIn(event) { - this.lastFocusEvent = event; - } - - onDocFocusIn(event) { - if (event !== this.lastFocusEvent) - this.hide(); - } } -Popover.$inject = ['$element', '$scope', '$timeout', '$transitions']; +Popover.$inject = ['$element', '$scope', '$timeout', '$transitions', '$transclude', '$compile']; ngModule.component('vnPopover', { - template: require('./popover.html'), controller: Popover, transclude: true }); diff --git a/front/core/components/textfield/textfield.js b/front/core/components/textfield/textfield.js index bf6d5bfd50..d4bb945eff 100644 --- a/front/core/components/textfield/textfield.js +++ b/front/core/components/textfield/textfield.js @@ -41,10 +41,8 @@ export default class Textfield extends Input { set value(value) { this._value = (value === undefined || value === '') ? null : value; this.input.value = this._value; - this.hasValue = this._value !== null; - - if (this.hasValue) this.element.classList.add('not-empty'); - else this.element.classList.remove('not-empty'); + this.hasValue = this._value != null; + this.element.classList.toggle('not-empty', this.hasValue); } get value() { diff --git a/front/core/directives/id.js b/front/core/directives/id.js index 193d84781a..693606b0c1 100644 --- a/front/core/directives/id.js +++ b/front/core/directives/id.js @@ -12,15 +12,14 @@ export function directive() { restrict: 'A', link: function($scope, $element, $attrs) { let id = kebabToCamel($attrs.vnId); - let controller = $element[0].$ctrl ? - $element[0].$ctrl : $element.controller($element[0].tagName.toLowerCase()); + let $ctrl = $element[0].$ctrl + ? $element[0].$ctrl + : $element.controller($element[0].tagName.toLowerCase()); if (!id) throw new Error(`vnId: Attribute can't be null`); - if (!controller) - throw new Error(`vnId: Can't find controller for element '${id}'`); - $scope[id] = controller; + $scope[id] = $ctrl || $element[0]; } }; } diff --git a/front/core/directives/specs/id.spec.js b/front/core/directives/specs/id.spec.js index 185944fc79..dcadae2d52 100644 --- a/front/core/directives/specs/id.spec.js +++ b/front/core/directives/specs/id.spec.js @@ -25,14 +25,6 @@ describe('Directive vnId', () => { }).toThrow(new Error(`vnId: Attribute can't be null`)); }); - it(`should throw an error when these's no controller defined in $element[0]`, () => { - let html = `
`; - - expect(() => { - compile(html); - }).toThrow(new Error(`vnId: Can't find controller for element '1'`)); - }); - // FIXME: Sometimes fails with '$scope is undefined' xit(`should set the controller into the $scope as there are no errors being thrown`, () => { let html = ``; diff --git a/front/core/lib/input.js b/front/core/lib/input.js index 9e428e675f..44bc890d0e 100644 --- a/front/core/lib/input.js +++ b/front/core/lib/input.js @@ -8,22 +8,101 @@ export default class Input extends Component { super($element, $scope); this.input = this.element.querySelector('input'); } + set disabled(value) { this.input.disabled = value == true; this.mdlUpdate(); } + get disabled() { return this.input.disabled; } + select() { this.input.select(); } + focus() { this.input.focus(); } + mdlUpdate() { if (this.mdlElement) this.mdlElement.updateClasses_(); } + + get validationError() { + return this.input.validationMessage; + } + + /** + * Validates a valid input value + * + * @return {Boolean} - True if has a valid value + */ + hasValidValue() { + return this.input.checkValidity(); + } + + /** + * Changes the input element + * if has a validation error + */ + validateValue() { + if (!this.hasValidValue()) { + this.hideError(); + this.showError(); + } else + this.hideError(); + } + + /** + * Shows the input validation error + */ + showError() { + const infixElement = this.element.querySelector('.infix'); + const infixClassList = infixElement.classList; + + const errorSpan = document.createElement('span'); + errorSpan.className = 'mdl-textfield__error'; + + const errorText = document.createTextNode(this.validationError); + + errorSpan.append(errorText); + infixElement.append(errorSpan); + + infixClassList.add('validated', 'invalid'); + } + + /** + * Hides the input validation error + */ + hideError() { + const infixElement = this.element.querySelector('.infix'); + const infixClassList = infixElement.classList; + const errorElement = this.element.querySelector('.infix span.mdl-textfield__error'); + + if (errorElement) + errorElement.remove(); + + infixClassList.remove('validated', 'invalid'); + } } Input.$inject = ['$element', '$scope']; + +export const component = { + transclude: { + leftIcons: '?tLeftIcons', + rightIcons: '?tRightIcons' + }, + bindings: { + label: '@?', + disabled: '
-
    +
    • {{::mod.name}} diff --git a/front/salix/components/main-menu/style.scss b/front/salix/components/main-menu/style.scss index ac3ee18c7c..cff2286b9c 100644 --- a/front/salix/components/main-menu/style.scss +++ b/front/salix/components/main-menu/style.scss @@ -26,28 +26,29 @@ vn-main-menu { padding: 0; margin-left: .3em; } - } - vn-menu.vn-popover > div > div.content > ul { - list-style-type: none; - margin: 0; - color: $color-font-dark; - - & > li { - @extend %clickable-light; - background-color: $color-main; - margin-bottom: .6em; - padding: .8em; - border-radius: .1em; - min-width: 8em; - white-space: nowrap; - - &:last-child { - margin-bottom: 0; - } - & > vn-icon { - padding-right: .3em; - vertical-align: middle; - } + } +} + +.vn-popover .modules-menu { + list-style-type: none; + margin: 0; + color: $color-font-dark; + + & > li { + @extend %clickable-light; + background-color: $color-main; + margin-bottom: .6em; + padding: .8em; + border-radius: .1em; + min-width: 8em; + white-space: nowrap; + + &:last-child { + margin-bottom: 0; + } + & > vn-icon { + padding-right: .3em; + vertical-align: middle; } } -} \ No newline at end of file +} diff --git a/front/salix/components/user-configuration-popover/index.html b/front/salix/components/user-configuration-popover/index.html index 7761fcc4cc..8b83e22705 100644 --- a/front/salix/components/user-configuration-popover/index.html +++ b/front/salix/components/user-configuration-popover/index.html @@ -11,7 +11,7 @@ order="code"> - + { +describe('Ticket', () => { describe('Component vnTicketSale', () => { let controller; let $scope; diff --git a/modules/worker/front/time-control/index.js b/modules/worker/front/time-control/index.js index a82fdc63de..1161e7f37e 100644 --- a/modules/worker/front/time-control/index.js +++ b/modules/worker/front/time-control/index.js @@ -236,6 +236,7 @@ class Controller { addTime(response) { if (response === 'ACCEPT') { + console.log('newTime', this.newTime); let data = {workerFk: this.worker.id, timed: this.newTime}; let query = `/api/WorkerTimeControls/addTime`; this.$http.post(query, data).then(() => { From 55133ded681f3108500c1172238fe1efc5d9b68a Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 30 Sep 2019 11:31:10 +0200 Subject: [PATCH 4/8] Fixes --- front/core/vendor.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/front/core/vendor.js b/front/core/vendor.js index 44d041ebef..629c4de4e6 100644 --- a/front/core/vendor.js +++ b/front/core/vendor.js @@ -7,10 +7,8 @@ import 'angular-translate-loader-partial'; import '@uirouter/angularjs'; import 'mg-crud'; import 'oclazyload'; -/* import 'angular-material'; import 'angular-material/modules/scss/angular-material.scss'; -*/ import 'angular-moment'; export const ngDeps = [ @@ -18,7 +16,7 @@ export const ngDeps = [ 'ui.router', 'mgCrud', 'oc.lazyLoad', - // 'ngMaterial', + 'ngMaterial', 'angularMoment' ]; From 300dfc5772d4ca856bdf5d05df0a9dd95f92cb03 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Mon, 30 Sep 2019 11:47:39 +0200 Subject: [PATCH 5/8] =?UTF-8?q?#1726=20client.index=20a=C3=B1adir=20icono?= =?UTF-8?q?=20de=20Listado=20tickets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/client/front/index/index.html | 5 ++++ modules/client/front/index/index.js | 13 +++++++++-- modules/client/front/index/index.spec.js | 29 ++++++++++++++++++++++++ modules/client/front/index/locale/es.yml | 3 ++- 4 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 modules/client/front/index/index.spec.js diff --git a/modules/client/front/index/index.html b/modules/client/front/index/index.html index d4bbcd1980..8321f99d10 100644 --- a/modules/client/front/index/index.html +++ b/modules/client/front/index/index.html @@ -40,6 +40,11 @@ + + { + let $scope; + let controller; + + beforeEach(angular.mock.module('client', $translateProvider => { + $translateProvider.translations('en', {}); + })); + + beforeEach(angular.mock.inject(($componentController, $rootScope, $state) => { + $scope = $rootScope.$new(); + controller = $componentController('vnClientIndex', {$scope, $state}); + })); + + describe('x()', () => { + it('should request to patch the propagation of tax status', () => { + const client = {id: 101}; + const event = {preventDefault: () => {}}; + spyOn(event, 'preventDefault'); + spyOn(controller.$state, 'go'); + + controller.filterTickets(client, event); + + expect(event.preventDefault).toHaveBeenCalledWith(); + expect(controller.$state.go).toHaveBeenCalledWith('ticket.index', jasmine.any(Object)); + }); + }); +}); diff --git a/modules/client/front/index/locale/es.yml b/modules/client/front/index/locale/es.yml index 35c21976cb..bfbbbddd07 100644 --- a/modules/client/front/index/locale/es.yml +++ b/modules/client/front/index/locale/es.yml @@ -2,4 +2,5 @@ Client id: Id cliente Phone: Teléfono Town/City: Ciudad Email: E-mail -View client: Ver cliente \ No newline at end of file +View client: Ver cliente +Client tickets: Listado de tickets del cliente \ No newline at end of file From a177ad8e26668362450ef497ae685eafab71312c Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 30 Sep 2019 13:02:11 +0200 Subject: [PATCH 6/8] Fixes --- e2e/paths/05-ticket-module/12_descriptor.spec.js | 4 ++-- front/core/components/input-time/index.spec.js | 15 --------------- .../back/methods/sale/specs/updateConcept.spec.js | 14 +++++++------- print/lib/smtp.js | 12 ++++++------ 4 files changed, 15 insertions(+), 30 deletions(-) diff --git a/e2e/paths/05-ticket-module/12_descriptor.spec.js b/e2e/paths/05-ticket-module/12_descriptor.spec.js index 0424f1f94c..c178e7fc8f 100644 --- a/e2e/paths/05-ticket-module/12_descriptor.spec.js +++ b/e2e/paths/05-ticket-module/12_descriptor.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import createNightmare from '../../helpers/nightmare'; -fdescribe('Ticket descriptor path', () => { +describe('Ticket descriptor path', () => { const nightmare = createNightmare(); beforeAll(() => { @@ -114,7 +114,7 @@ fdescribe('Ticket descriptor path', () => { .waitToClick(selectors.ticketDescriptor.moreMenu) .waitToClick(selectors.ticketDescriptor.moreMenuAddStowaway) .wait(selectors.ticketDescriptor.addStowawayDialogFirstTicket) - .isVisible(selectors.ticketDescriptor.addStowawayDialogFirstTicket); + .visible(selectors.ticketDescriptor.addStowawayDialogFirstTicket); expect(isVisible).toBeTruthy(); }); diff --git a/front/core/components/input-time/index.spec.js b/front/core/components/input-time/index.spec.js index c71965240c..95bfbf8a26 100644 --- a/front/core/components/input-time/index.spec.js +++ b/front/core/components/input-time/index.spec.js @@ -40,19 +40,4 @@ describe('Component vnInputTime', () => { expect(controller._value).toEqual(null); }); }); - - describe('step() setter/getter', () => { - it(`should set input.step to a given value`, () => { - controller.step = 2; - - expect(controller.input.step).toEqual('2'); - }); - - it(`should return a number`, () => { - controller.step = 2; - - expect(controller.step).toEqual(2); - expect(typeof controller.step).toEqual('number'); - }); - }); }); diff --git a/modules/ticket/back/methods/sale/specs/updateConcept.spec.js b/modules/ticket/back/methods/sale/specs/updateConcept.spec.js index ab27bfdcae..d383cc9484 100644 --- a/modules/ticket/back/methods/sale/specs/updateConcept.spec.js +++ b/modules/ticket/back/methods/sale/specs/updateConcept.spec.js @@ -16,17 +16,17 @@ describe('sale updateConcept()', () => { done(); }); - it('should throw if ID was undefined', async() => { + let err; const newConcept = 'I am he new concept'; - await app.models.Sale.updateConcept(undefined, newConcept) - .catch(response => { - expect(response).toEqual(new Error(`Model::findById requiere el argumento id`)); - error = response; - }); + try { + await app.models.Sale.updateConcept(undefined, newConcept); + } catch (e) { + err = e; + } - expect(error).toBeDefined(); + expect(err).toBeDefined(); }); it('should update the sale concept', async() => { diff --git a/print/lib/smtp.js b/print/lib/smtp.js index 042bd91af6..65fb582895 100644 --- a/print/lib/smtp.js +++ b/print/lib/smtp.js @@ -10,13 +10,13 @@ module.exports = { send(options) { options.from = `${config.app.senderName} <${config.app.senderMail}>`; - if (process.env.NODE_ENV !== 'production') + if (process.env.NODE_ENV !== 'production') { + if (!config.smtp.user) + return Promise.resolve(true); + options.to = config.app.senderMail; + } return this.transporter.sendMail(options); - }, - - log() { - - }, + } }; From f5d9d2133eefa33d83086290f90c83a70e6fe0be Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 30 Sep 2019 13:10:29 +0200 Subject: [PATCH 7/8] CI jest tests enabled --- .gitignore | 2 +- Jenkinsfile | 2 +- package-lock.json | 143 ++++++++++++++++++++++++++-------------------- package.json | 3 +- 4 files changed, 86 insertions(+), 64 deletions(-) diff --git a/.gitignore b/.gitignore index 1f84ed8bd8..3ef8c28fd2 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,4 @@ npm-debug.log datasources.*.json print.*.json db.json -junitresults.xml \ No newline at end of file +junit.xml \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index a5ef853d52..fdb0cba55e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -71,7 +71,7 @@ pipeline { } steps { nodejs('node-lts') { - // sh 'karma start --junit' + sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=1' sh 'gulp backTestDockerOnce --junit --random --run-chown' } } diff --git a/package-lock.json b/package-lock.json index 30ba5e104c..7b4445337b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3159,6 +3159,11 @@ "to-utf8": "0.0.1" } }, + "bowser": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.6.1.tgz", + "integrity": "sha512-hySGUuLhi0KetfxPZpuJOsjM0kRvCiCgPBygBkzGzJNsq/nbJmaO8QJc6xlWfeFFnMvtd/LeKkhDJGVrmVobUA==" + }, "boxen": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", @@ -4033,9 +4038,9 @@ } }, "content-security-policy-builder": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-2.0.0.tgz", - "integrity": "sha512-j+Nhmj1yfZAikJLImCvPJFE29x/UuBi+/MWqggGGc515JKaZrjuei2RhULJmy0MsstW3E3htl002bwmBNMKr7w==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-2.1.0.tgz", + "integrity": "sha512-/MtLWhJVvJNkA9dVLAp6fg9LxD2gfI6R2Fi1hPmfjYXSahJJzcfvoeDOxSyp4NvxMuwWv3WMssE9o31DoULHrQ==" }, "content-type": { "version": "1.0.4", @@ -4679,9 +4684,9 @@ } }, "dns-prefetch-control": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/dns-prefetch-control/-/dns-prefetch-control-0.1.0.tgz", - "integrity": "sha1-YN20V3dOF48flBXwyrsOhbCzALI=" + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/dns-prefetch-control/-/dns-prefetch-control-0.2.0.tgz", + "integrity": "sha512-hvSnros73+qyZXhHFjx2CMLwoj3Fe7eR9EJsFsqmcI1bB2OBWL/+0YzaEaKssCHnj/6crawNnUyw74Gm2EKe+Q==" }, "dns-txt": { "version": "2.0.2", @@ -4757,14 +4762,14 @@ } }, "dont-sniff-mimetype": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.0.0.tgz", - "integrity": "sha1-WTKJDcn04vGeXrAqIAJuXl78j1g=" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.1.0.tgz", + "integrity": "sha512-ZjI4zqTaxveH2/tTlzS1wFp+7ncxNZaIEWYg3lzZRHkKf5zPT/MnEG6WL0BhHMJUabkh8GeU5NL5j+rEUCb7Ug==" }, "dot-prop": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", - "integrity": "sha1-HxngwuGqDjJ5fEl5nyg3rGr2nFc=", + "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", "requires": { "is-obj": "^1.0.0" } @@ -4932,7 +4937,7 @@ }, "jsonfile": { "version": "2.4.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", + "resolved": "http://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", "dev": true, "requires": { @@ -5325,10 +5330,13 @@ } }, "eslint-utils": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz", - "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==", - "dev": true + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz", + "integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.0.0" + } }, "eslint-visitor-keys": { "version": "1.0.0", @@ -7477,7 +7485,7 @@ }, "kind-of": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz", "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=", "dev": true }, @@ -7775,9 +7783,9 @@ "dev": true }, "handlebars": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.2.1.tgz", - "integrity": "sha512-bqPIlDk06UWbVEIFoYj+LVo42WhK96J+b25l7hbFDpxrOXMphFM3fNIm+cluwg4Pk2jiLjWU5nHQY7igGE75NQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.4.0.tgz", + "integrity": "sha512-xkRtOt3/3DzTKMOt3xahj2M/EqNhY988T+imYSlMgs5fVhLN2fmKVVj0LtEGmb+3UUYV5Qmm1052Mm3dIQxOvw==", "dev": true, "requires": { "neo-async": "^2.6.0", @@ -7950,47 +7958,47 @@ "dev": true }, "helmet": { - "version": "3.18.0", - "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.18.0.tgz", - "integrity": "sha512-TsKlGE5UVkV0NiQ4PllV9EVfZklPjyzcMEMjWlyI/8S6epqgRT+4s4GHVgc25x0TixsKvp3L7c91HQQt5l0+QA==", + "version": "3.21.1", + "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.21.1.tgz", + "integrity": "sha512-IC/54Lxvvad2YiUdgLmPlNFKLhNuG++waTF5KPYq/Feo3NNhqMFbcLAlbVkai+9q0+4uxjxGPJ9bNykG+3zZNg==", "requires": { "depd": "2.0.0", - "dns-prefetch-control": "0.1.0", - "dont-sniff-mimetype": "1.0.0", + "dns-prefetch-control": "0.2.0", + "dont-sniff-mimetype": "1.1.0", "expect-ct": "0.2.0", "feature-policy": "0.3.0", "frameguard": "3.1.0", - "helmet-crossdomain": "0.3.0", - "helmet-csp": "2.7.1", - "hide-powered-by": "1.0.0", + "helmet-crossdomain": "0.4.0", + "helmet-csp": "2.9.2", + "hide-powered-by": "1.1.0", "hpkp": "2.0.0", "hsts": "2.2.0", "ienoopen": "1.1.0", "nocache": "2.1.0", "referrer-policy": "1.2.0", - "x-xss-protection": "1.1.0" + "x-xss-protection": "1.3.0" } }, "helmet-crossdomain": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/helmet-crossdomain/-/helmet-crossdomain-0.3.0.tgz", - "integrity": "sha512-YiXhj0E35nC4Na5EPE4mTfoXMf9JTGpN4OtB4aLqShKuH9d2HNaJX5MQoglO6STVka0uMsHyG5lCut5Kzsy7Lg==" + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/helmet-crossdomain/-/helmet-crossdomain-0.4.0.tgz", + "integrity": "sha512-AB4DTykRw3HCOxovD1nPR16hllrVImeFp5VBV9/twj66lJ2nU75DP8FPL0/Jp4jj79JhTfG+pFI2MD02kWJ+fA==" }, "helmet-csp": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.7.1.tgz", - "integrity": "sha512-sCHwywg4daQ2mY0YYwXSZRsgcCeerUwxMwNixGA7aMLkVmPTYBl7gJoZDHOZyXkqPrtuDT3s2B1A+RLI7WxSdQ==", + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.9.2.tgz", + "integrity": "sha512-Lt5WqNfbNjEJ6ysD4UNpVktSyjEKfU9LVJ1LaFmPfYseg/xPealPfgHhtqdAdjPDopp5zbg/VWCyp4cluMIckw==", "requires": { + "bowser": "^2.6.1", "camelize": "1.0.0", - "content-security-policy-builder": "2.0.0", - "dasherize": "2.0.0", - "platform": "1.3.5" + "content-security-policy-builder": "2.1.0", + "dasherize": "2.0.0" } }, "hide-powered-by": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/hide-powered-by/-/hide-powered-by-1.0.0.tgz", - "integrity": "sha1-SoWtZYgfYoV/xwr3F0oRhNzM4ys=" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/hide-powered-by/-/hide-powered-by-1.1.0.tgz", + "integrity": "sha512-Io1zA2yOA1YJslkr+AJlWSf2yWFkKjvkcL9Ni1XSUqnGLr/qRQe2UI3Cn/J9MsJht7yEVCe0SscY1HgVMujbgg==" }, "hmac-drbg": { "version": "1.0.1", @@ -9112,7 +9120,7 @@ }, "jasmine-core": { "version": "2.99.1", - "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz", + "resolved": "http://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz", "integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU=", "dev": true }, @@ -9487,6 +9495,18 @@ "throat": "^4.0.0" } }, + "jest-junit": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/jest-junit/-/jest-junit-8.0.0.tgz", + "integrity": "sha512-cuD2XM2youMjrOxOu/7H2pLfsO8LfAG4D3WsBxd9fFyI9U0uPpmr/CORH64kbIyZ47X5x1Rbzb9ovUkAEvhEEA==", + "dev": true, + "requires": { + "jest-validate": "^24.0.0", + "mkdirp": "^0.5.1", + "strip-ansi": "^4.0.0", + "xml": "^1.0.1" + } + }, "jest-leak-detector": { "version": "24.9.0", "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz", @@ -10290,9 +10310,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, "lodash._basecopy": { "version": "3.0.1", @@ -10387,9 +10407,9 @@ } }, "lodash.mergewith": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", - "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==", + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz", + "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==", "dev": true }, "lodash.restparam": { @@ -11174,7 +11194,7 @@ "dependencies": { "commander": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/commander/-/commander-1.0.4.tgz", + "resolved": "http://registry.npmjs.org/commander/-/commander-1.0.4.tgz", "integrity": "sha1-Xt6xruI8T7VBprcNaSq+8ZZpotM=", "dev": true, "requires": { @@ -12785,11 +12805,6 @@ } } }, - "platform": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.5.tgz", - "integrity": "sha512-TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q==" - }, "plugin-error": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", @@ -13026,7 +13041,7 @@ }, "readable-stream": { "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "dev": true, "requires": { @@ -13038,7 +13053,7 @@ }, "string_decoder": { "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", "dev": true }, @@ -13485,7 +13500,7 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true } @@ -14306,7 +14321,7 @@ }, "string-width": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { @@ -15870,7 +15885,7 @@ "touch": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", - "integrity": "sha1-/jZfX3XsntTlaCXgu3bSSrdK+Ds=", + "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", "dev": true, "requires": { "nopt": "~1.0.10" @@ -17273,15 +17288,21 @@ } }, "x-xss-protection": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.1.0.tgz", - "integrity": "sha512-rx3GzJlgEeZ08MIcDsU2vY2B1QEriUKJTSiNHHUIem6eg9pzVOr2TL3Y4Pd6TMAM5D5azGjcxqI62piITBDHVg==" + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.3.0.tgz", + "integrity": "sha512-kpyBI9TlVipZO4diReZMAHWtS0MMa/7Kgx8hwG/EuZLiA6sg4Ah/4TRdASHhRRN3boobzcYgFRUFSgHRge6Qhg==" }, "xdg-basedir": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz", "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=" }, + "xml": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz", + "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=", + "dev": true + }, "xml-crypto": { "version": "0.8.5", "resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-0.8.5.tgz", diff --git a/package.json b/package.json index fab44bbb13..ef61b52d4a 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "dependencies": { "compression": "^1.7.3", "fs-extra": "^5.0.0", - "helmet": "^3.15.1", + "helmet": "^3.21.1", "i18n": "^0.8.3", "loopback": "^3.26.0", "loopback-boot": "^2.27.1", @@ -68,6 +68,7 @@ "jasmine-reporters": "^2.3.2", "jasmine-spec-reporter": "^4.2.1", "jest": "^24.9.0", + "jest-junit": "^8.0.0", "json-loader": "^0.5.7", "merge-stream": "^1.0.1", "minimist": "^1.2.0", From 80e1f5d476cf402a1ff34ee6d0174e24616eb4f5 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 30 Sep 2019 13:41:20 +0200 Subject: [PATCH 8/8] CI test now use the jest junit file --- Jenkinsfile | 2 +- junitresults.xml | 652 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 653 insertions(+), 1 deletion(-) create mode 100644 junitresults.xml diff --git a/Jenkinsfile b/Jenkinsfile index fdb0cba55e..441ce31089 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -158,8 +158,8 @@ pipeline { script { if (!['master', 'test'].contains(env.BRANCH_NAME)) { try { - junit '*/junitresults.xml' junit 'junitresults.xml' + junit 'junit.xml' } catch (e) { echo e.toString() } diff --git a/junitresults.xml b/junitresults.xml new file mode 100644 index 0000000000..3246cf9088 --- /dev/null +++ b/junitresults.xml @@ -0,0 +1,652 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file