From f97d169cbf68d70ff1eade93d05d4056cd640c6c Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 17 Apr 2023 11:52:31 +0200 Subject: [PATCH 1/4] observationEmail --- db/changes/231601/00-observationEmailACL.sql | 2 ++ e2e/helpers/selectors.js | 2 +- e2e/paths/02-client/21_defaulter.spec.js | 2 +- e2e/paths/03-worker/08_add_notes.spec.js | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 db/changes/231601/00-observationEmailACL.sql diff --git a/db/changes/231601/00-observationEmailACL.sql b/db/changes/231601/00-observationEmailACL.sql new file mode 100644 index 0000000000..6c0c5a51ca --- /dev/null +++ b/db/changes/231601/00-observationEmailACL.sql @@ -0,0 +1,2 @@ +INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) + VALUES ('Defaulter', 'observationEmail', 'WRITE', 'ALLOW', 'ROLE', 'employee'); diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index b504244ea8..1eb01de7e3 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -989,7 +989,7 @@ export default { saveButton: 'vn-worker-basic-data button[type=submit]' }, workerNotes: { - addNoteFloatButton: 'vn-float-button', + addNoteFloatButton: 'a vn-float-button', note: 'vn-textarea[ng-model="$ctrl.note.text"]', saveButton: 'button[type=submit]', firstNoteText: 'vn-worker-note .text' diff --git a/e2e/paths/02-client/21_defaulter.spec.js b/e2e/paths/02-client/21_defaulter.spec.js index 0eb16441f9..97e62abef4 100644 --- a/e2e/paths/02-client/21_defaulter.spec.js +++ b/e2e/paths/02-client/21_defaulter.spec.js @@ -50,7 +50,7 @@ describe('Client defaulter path', () => { expect(message.text).toContain(`The message can't be empty`); }); - it('shoul checked all defaulters', async() => { + it('should checked all defaulters', async() => { await page.loginAndModule('insurance', 'client'); await page.accessToSection('client.defaulter'); diff --git a/e2e/paths/03-worker/08_add_notes.spec.js b/e2e/paths/03-worker/08_add_notes.spec.js index eb2e4c041e..bdc475c90c 100644 --- a/e2e/paths/03-worker/08_add_notes.spec.js +++ b/e2e/paths/03-worker/08_add_notes.spec.js @@ -7,7 +7,7 @@ describe('Worker Add notes path', () => { beforeAll(async() => { browser = await getBrowser(); page = browser.page; - await page.loginAndModule('employee', 'worker'); + await page.loginAndModule('hr', 'worker'); await page.accessToSearchResult('Bruce Banner'); await page.accessToSection('worker.card.note.index'); }); -- 2.40.1 From 6144c24a448dd571ec66633f03b5da401082f0fb Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 17 Apr 2023 12:44:58 +0200 Subject: [PATCH 2/4] fix(ticket_edit): fix e2e --- e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js | 1 + 1 file changed, 1 insertion(+) diff --git a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js index f9b5209818..323646d298 100644 --- a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js +++ b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js @@ -249,6 +249,7 @@ describe('Ticket Edit sale path', () => { await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox); await page.waitToClick(selectors.ticketSales.moreMenu); await page.waitToClick(selectors.ticketSales.moreMenuCreateClaim); + await page.waitToClick(selectors.globalItems.acceptButton); await page.waitForState('claim.card.basicData'); }); -- 2.40.1 From b5434c5e4e859334e6d9b68091b4e0e7dd5dc6e0 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 17 Apr 2023 12:58:55 +0200 Subject: [PATCH 3/4] tab --- db/changes/231601/00-observationEmailACL.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/db/changes/231601/00-observationEmailACL.sql b/db/changes/231601/00-observationEmailACL.sql index 6c0c5a51ca..1a5d475e85 100644 --- a/db/changes/231601/00-observationEmailACL.sql +++ b/db/changes/231601/00-observationEmailACL.sql @@ -1,2 +1,3 @@ INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) - VALUES ('Defaulter', 'observationEmail', 'WRITE', 'ALLOW', 'ROLE', 'employee'); + VALUES + ('Defaulter', 'observationEmail', 'WRITE', 'ALLOW', 'ROLE', 'employee'); -- 2.40.1 From 6a0a08be953ef1a70f7538f9c44f2660a5ccc5a8 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 17 Apr 2023 13:03:09 +0200 Subject: [PATCH 4/4] typo --- e2e/helpers/selectors.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 1eb01de7e3..84db638e3e 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -989,7 +989,7 @@ export default { saveButton: 'vn-worker-basic-data button[type=submit]' }, workerNotes: { - addNoteFloatButton: 'a vn-float-button', + addNoteFloatButton: 'vn-worker-note vn-float-button', note: 'vn-textarea[ng-model="$ctrl.note.text"]', saveButton: 'button[type=submit]', firstNoteText: 'vn-worker-note .text' -- 2.40.1