Merge pull request #7305 from masudul-tikweb/master

fix selectable list test

Author: renemadsen

eform-client/e2e/Page objects/SelectableLists.page.ts

@@ -10,6 +10,16 @@ export class SelectableListsPage extends PageWithNavbarPage {
   public async selectableListCount(): Promise<number> {
     //await browser.pause(250);
     return (await $$('tbody > tr')).length;
+
+  }
+
+  public async openRowMenu(i = 0) {
+    const menuBtn = await $(`#action-items${i} #actionMenu`);
+    await menuBtn.waitForDisplayed({ timeout: 5000 });
+    await menuBtn.waitForClickable({ timeout: 5000 });
+    await menuBtn.scrollIntoView();
+    await menuBtn.click();
+    await browser.pause(200);
   }
 
   public async itemsEditPageCount(): Promise<number> {
@@ -287,6 +297,13 @@ export class SelectableListsPage extends PageWithNavbarPage {
     //await browser.pause(250);
   }
 
+  // public async cleanupList() {
+  //   const last = await this.getLastSelectableListObject();
+  //   if (last.name !== 'Device users') {
+  //     await last.delete();
+  //   }
+  // }
+
   public async cleanupList() {
     for (let i = await this.selectableListCount(); i > 0; i--) {
       const obj = new SelectableListRowObject();
@@ -296,6 +313,7 @@ export class SelectableListsPage extends PageWithNavbarPage {
       }
     }
   }
+
 }
 
 const selectableLists = new SelectableListsPage();
@@ -331,26 +349,54 @@ export class SelectableListRowObject {
     return this;
   }
 
+  // async delete(clickCancel = false) {
+  //   await this.deleteBtn.click();
+  //   await browser.pause(250);
+  //   if (!clickCancel) {
+  //     await (await selectableLists.entitySelectDeleteDeleteBtn()).click();
+  //     await browser.pause(250);
+  //   } else {
+  //     await (await selectableLists.entitySelectDeleteCancelBtn()).click();
+  //     await browser.pause(250);
+  //   }
+  //   await (await selectableLists.entitySelectCreateBtn()).waitForDisplayed();
+  // }
+
   async delete(clickCancel = false) {
-    await this.deleteBtn.click();
+    const index = this.index - 1;
+    await selectableLists.openRowMenu(index);
+    const deleteBtn = await $(`#entitySelectDeleteBtn${index}`);
+    await deleteBtn.waitForDisplayed({ timeout: 5000 });
+    await deleteBtn.waitForClickable({ timeout: 5000 });
+    await deleteBtn.scrollIntoView();
+    await deleteBtn.click();
     await browser.pause(250);
+
     if (!clickCancel) {
       await (await selectableLists.entitySelectDeleteDeleteBtn()).click();
       await browser.pause(250);
     } else {
       await (await selectableLists.entitySelectDeleteCancelBtn()).click();
       await browser.pause(250);
     }
+
     await (await selectableLists.entitySelectCreateBtn()).waitForDisplayed();
   }
 
   async openEdit() {
-    await this.editBtn.click();
-    await browser.pause(250);
+    const index = this.index - 1;
+
+    await selectableLists.openRowMenu(index);
+    const editBtn = await $(`#entitySelectEditBtn${index}`);
+
+    await editBtn.waitForDisplayed({ timeout: 5000 });
+    await editBtn.waitForClickable({ timeout: 5000 });
+    await editBtn.click();
+
     await (await selectableLists.entitySelectEditCancelBtn()).waitForDisplayed();
-    //await browser.pause(250);
   }
 
+
   async closeEdit(clickCancel = false) {
     if (!clickCancel) {
       await (await selectableLists.entitySelectEditSaveBtn()).click();

eform-client/src/app/modules/advanced/components/entity-select/entity-select/entity-select.component.html

@@ -46,15 +46,15 @@
 </mtx-grid>
 
 <ng-template #actionsTpl let-row let-i="index">
-  <div id="action-items-{{i}}" *ngIf="(selectCurrentUserClaimsEntitySelectDelete$ | async) || (selectCurrentUserClaimsEntitySelectUpdate$ | async)">
+  <div id="action-items{{i}}" *ngIf="(selectCurrentUserClaimsEntitySelectDelete$ | async) || (selectCurrentUserClaimsEntitySelectUpdate$ | async)">
     <button id="actionMenu" mat-icon-button [matMenuTriggerFor]="menu" matTooltip="{{ 'Actions' | translate }}">
       <mat-icon>more_vert</mat-icon>
     </button>
 
     <mat-menu #menu="matMenu">
       <button
         mat-menu-item
-        id="entitySelectEditBtn-{{i}}"
+        id="entitySelectEditBtn{{i}}"
         [disabled]="(selectCurrentUserClaimsEntitySelectUpdate$ | async) === false"
         [routerLink]="['/advanced/entity-select/edit/' + row.microtingUUID]"
       >
@@ -64,7 +64,7 @@
 
       <button
         mat-menu-item
-        id="entitySelectDeleteBtn-{{i}}"
+        id="entitySelectDeleteBtn{{i}}"
         (click)="openModalSelectRemove(row)"
         [disabled]="(selectCurrentUserClaimsEntitySelectDelete$ | async) === false || row.isLocked"
       >