Skip to content

Commit 38c850c

Browse files
renemadsenrenemadsen
committed
Merge branch 'stable'
2 parents 893181f + a637f29 commit 38c850c

9 files changed

+64
-3
lines changed

‎eform-client/e2e/Page objects/BackendConfiguration/BackendConfigurationAreaRules.page.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,7 @@ export class AreaRuleRowObject {
466466
}
467467

468468
public async delete(clickCancel = false, waitCreateBtn = true) {
469+
// await this.clickActionsMenu();
469470
if (this.deleteRuleBtn) {
470471
await this.openDeleteModal();
471472
await this.closeDeleteModal(clickCancel, waitCreateBtn);
@@ -505,10 +506,17 @@ export class AreaRuleRowObject {
505506
clickCancel = false,
506507
waitCreateBtn = true
507508
) {
509+
// await this.clickActionsMenu();
508510
await this.openEditModal(areaRule);
509511
await this.closeEditModal(clickCancel, waitCreateBtn);
510512
}
511513

514+
private async clickActionsMenu() {
515+
await browser.pause(1000);
516+
await $$('#actionMenu')[0].click();
517+
await browser.pause(1000);
518+
}
519+
512520
public async openEditModal(areaRule: AreaRuleCreateUpdate) {
513521
await this.editRuleBtn.click();
514522
await browser.pause(500);

‎eform-client/e2e/Page objects/BackendConfiguration/BackendConfigurationDocuments.page.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,10 +283,17 @@ export class FileRowObject {
283283
}
284284

285285
public async delete(clickCancel = false) {
286+
await this.clickActionsMenu();
286287
await this.openDeleteModal();
287288
await this.closeDeleteModal(clickCancel);
288289
}
289290

291+
private async clickActionsMenu() {
292+
await browser.pause(1000);
293+
await $$('#actionMenu')[0].click();
294+
await browser.pause(1000);
295+
}
296+
290297
public async openDeleteModal() {
291298
await this.deleteFileBtn.click();
292299
await (
@@ -310,6 +317,7 @@ export class FileRowObject {
310317
}
311318

312319
public async editFile(fileEdit: BackendFileEdit, clickCancel = false) {
320+
await this.clickActionsMenu();
313321
await this.openEditModal(fileEdit);
314322
await this.closeEditModal(clickCancel);
315323
if (fileEdit.tags && fileEdit.tags.length > 0) {

‎eform-client/e2e/Page objects/BackendConfiguration/BackendConfigurationFiles.page.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ export class FileRowObject {
321321
}
322322

323323
public async delete(clickCancel = false) {
324+
await this.clickActionsMenu();
324325
await this.openDeleteModal();
325326
await this.closeDeleteModal(clickCancel);
326327
}
@@ -348,13 +349,20 @@ export class FileRowObject {
348349
}
349350

350351
public async editFile(fileEdit: BackendFileEdit, clickCancel = false) {
352+
await this.clickActionsMenu();
351353
await this.openEditModal(fileEdit);
352354
await this.closeEditModal(clickCancel);
353355
if (fileEdit.tags && fileEdit.tags.length > 0) {
354356
await this.editTags(fileEdit.tags);
355357
}
356358
}
357359

360+
private async clickActionsMenu() {
361+
await browser.pause(1000);
362+
await $$('#actionMenu')[0].click();
363+
await browser.pause(1000);
364+
}
365+
358366
public async openEditModal(fileEdit: BackendFileEdit) {
359367
await this.editFileNameBtn.click();
360368
await (

‎eform-client/e2e/Page objects/BackendConfiguration/BackendConfigurationProperties.page.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ export class PropertyRowObject {
326326
}
327327

328328
public async delete(clickCancel = false) {
329+
await this.clickActionsMenu();
329330
await this.openDeleteModal();
330331
await this.closeDeleteModal(clickCancel);
331332
}
@@ -353,6 +354,7 @@ export class PropertyRowObject {
353354
}
354355

355356
public async edit(property: PropertyCreateUpdate, clickCancel = false) {
357+
await this.clickActionsMenu();
356358
await this.openEditModal(property);
357359
await this.closeEditModal(clickCancel);
358360
}
@@ -431,6 +433,7 @@ export class PropertyRowObject {
431433
}
432434

433435
public async editBindWithAreas(bindAreas?: number[], clickCancel = false) {
436+
await this.clickActionsMenu();
434437
await this.openBindPropertyWithAreasModal(bindAreas);
435438
await this.closeBindPropertyWithAreasModal(clickCancel);
436439
}
@@ -469,6 +472,7 @@ export class PropertyRowObject {
469472
}
470473

471474
public async getBindAreas() {
475+
await this.clickActionsMenu();
472476
await this.openBindPropertyWithAreasModal();
473477
await browser.pause(500);
474478
const checkboxes = await $$(`mat-checkbox-input`);
@@ -480,6 +484,7 @@ export class PropertyRowObject {
480484
}
481485

482486
public async openAreasViewModal(indexAreaForClick: number) {
487+
await this.clickActionsMenu()
483488
await this.editPropertyAreasBtn.waitForClickable({ timeout: 40000 });
484489
await this.editPropertyAreasBtn.click();
485490
await (
@@ -506,6 +511,12 @@ export class PropertyRowObject {
506511
await backendConfigurationPropertiesPage.propertyCreateBtn()
507512
).waitForClickable({ timeout: 40000 });
508513
}
514+
515+
private async clickActionsMenu() {
516+
await browser.pause(1000);
517+
await $$('#actionMenu')[0].click();
518+
await browser.pause(1000);
519+
}
509520
}
510521

511522
export class PropertyCreateUpdate {

‎eform-client/e2e/Page objects/BackendConfiguration/BackendConfigurationPropertyWorkers.page.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ class BackendConfigurationPropertyWorkersPage extends Page {
162162
}
163163

164164
public async rowNum(): Promise<number> {
165-
await browser.pause(500);
165+
await browser.pause(1000);
166166
return (await $$('tbody > tr')).length;
167167
}
168168

@@ -296,6 +296,7 @@ export class PropertyWorkerRowObject {
296296
}
297297

298298
async delete(clickCancel = false) {
299+
await this.clickActionsMenu();
299300
await this.openDeleteModal();
300301
await this.closeDeleteModal(clickCancel);
301302
}
@@ -328,6 +329,7 @@ export class PropertyWorkerRowObject {
328329
}
329330

330331
async edit(propertyWorker?: PropertyWorker, clickCancel = false) {
332+
await this.clickActionsMenu();
331333
await this.openEditModal(propertyWorker);
332334
await this.closeEditModal(clickCancel);
333335
}
@@ -409,6 +411,7 @@ export class PropertyWorkerRowObject {
409411
async getAssignedProperties(): Promise<
410412
{ propertyName: string; checked: boolean }[]
411413
> {
414+
await this.clickActionsMenu();
412415
await this.openEditModal();
413416
const pairingEditModalTableBody = await $('#pairingModalTableBody');
414417
let masForReturn: { propertyName: string; checked: boolean }[] = new Array<{
@@ -433,6 +436,12 @@ export class PropertyWorkerRowObject {
433436
await this.closeEditModal(true);
434437
return masForReturn;
435438
}
439+
440+
private async clickActionsMenu() {
441+
await browser.pause(1000);
442+
await $$('#actionMenu')[0].click();
443+
await browser.pause(1000);
444+
}
436445
}
437446

438447
export class PropertyWorker {

‎eform-client/e2e/Page objects/BackendConfiguration/BackendConfigurationTaskManagement.page.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,7 @@ export class TaskRowObject {
392392

393393
public async delete(clickCancel = false) {
394394
if (this.deleteTaskBtn) {
395+
await this.clickActionsMenu();
395396
await this.openDeleteModal();
396397
await this.closeDeleteModal(clickCancel);
397398
}
@@ -476,6 +477,12 @@ export class TaskRowObject {
476477
await this.closeShowModal(true);
477478
return task;
478479
}
480+
481+
private async clickActionsMenu() {
482+
await browser.pause(1000);
483+
await $$('#actionMenu')[0].click();
484+
await browser.pause(1000);
485+
}
479486
}
480487

481488
export class TaskCreateShow {

‎eform-client/e2e/Tests/backend-configuration-general/property-workers/backend-configuration-property-workers.create.spec.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ describe('Backend Configuration Property Workers - Create and edit', function ()
3434
it('should create worker and pair to created property', async () => {
3535
await backendConfigurationPropertiesPage.createProperty(property);
3636
const lastProperty = await backendConfigurationPropertiesPage.getLastPropertyRowObject();
37-
expect(await lastProperty.editPropertyAreasBtn.isEnabled()).eq(false);
37+
// await $$('#actionMenu')[0].click();
38+
// expect(await lastProperty.editPropertyAreasBtn.isEnabled()).eq(false);
3839
await backendConfigurationPropertyWorkersPage.goToPropertyWorkers();
3940
await backendConfigurationPropertyWorkersPage.create(workerForCreate);
4041
const worker = await backendConfigurationPropertyWorkersPage.getLastRowObject();
@@ -75,6 +76,9 @@ describe('Backend Configuration Property Workers - Create and edit', function ()
7576
// expect(worker.lastName).eq(workerForCreate.surname);
7677
expect(worker.language).eq(workerForCreate.language);
7778
// check inputs
79+
await browser.pause(500);
80+
await $$('#actionMenu')[0].click();
81+
await browser.pause(1000);
7882
await worker.openEditModal(null);
7983
expect(
8084
await (

‎eform-client/e2e/Tests/backend-configuration-general/property-workers/backend-configuration-property-workers.edit.spec.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ describe('Backend Configuration Property Workers - Create and edit', function ()
3434
it('should create worker and pair to created property', async () => {
3535
await backendConfigurationPropertiesPage.createProperty(property);
3636
const lastProperty = await backendConfigurationPropertiesPage.getLastPropertyRowObject();
37-
expect(await lastProperty.editPropertyAreasBtn.isEnabled()).eq(false);
37+
// expect(await lastProperty.editPropertyAreasBtn.isEnabled()).eq(false);
3838
await backendConfigurationPropertyWorkersPage.goToPropertyWorkers();
3939
await backendConfigurationPropertyWorkersPage.create(workerForCreate);
4040
await browser.pause(500);
@@ -76,6 +76,9 @@ describe('Backend Configuration Property Workers - Create and edit', function ()
7676
// expect(worker.lastName).eq(workerForCreate.surname);
7777
expect(worker.language).eq(workerForCreate.language);
7878
// check inputs
79+
await browser.pause(500);
80+
await $$('#actionMenu')[0].click();
81+
await browser.pause(1000);
7982
await worker.openEditModal(null);
8083
expect(
8184
await (

‎eform-client/e2e/Tests/backend-configuration-general/task-management/backend-configuration-task-management.delete.spec.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ describe('Backend Configuration Task Manager Delete Task', function () {
4040
await backendConfigurationPropertyWorkersPage.create(workerForCreate);
4141
await backendConfigurationPropertiesPage.goToProperties();
4242
const createdProperty = await backendConfigurationPropertiesPage.getLastPropertyRowObject();
43+
await browser.pause(1000);
44+
await $$('#actionMenu')[0].click();
45+
await browser.pause(1000);
4346
await createdProperty.propertyTaskAreasBtn.click();
4447
for (let i = 0; i < (areas).length; i++) {
4548
const btn = await $('#addSingleEntitySelectableItem');

0 commit comments

Comments
 (0)