From 237a004705be5892aac5c0c9f14f7d694ab4eab3 Mon Sep 17 00:00:00 2001
From: Andrei Zhaleznichenka <andrei.zhaleznichenka@gmail.com>
Date: Sat, 21 Sep 2024 11:28:55 +0200
Subject: [PATCH] chore: Updates e2e tests to support webdriverio 9 changes
 (#161)

---
 src/pages/table-saved-filters/use-filter-sets.tsx | 2 +-
 test/e2e/details-tabs.test.ts                     | 5 +++--
 test/e2e/page/tags-page-object.ts                 | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/pages/table-saved-filters/use-filter-sets.tsx b/src/pages/table-saved-filters/use-filter-sets.tsx
index 7b6c959..83766e7 100644
--- a/src/pages/table-saved-filters/use-filter-sets.tsx
+++ b/src/pages/table-saved-filters/use-filter-sets.tsx
@@ -6,7 +6,7 @@ import { ButtonDropdownProps } from '@cloudscape-design/components/button-dropdo
 import { SelectProps } from '@cloudscape-design/components/select';
 import { DeleteFilterSetModal, SaveFilterSetModal, UpdateFilterSetModal } from './filter-set-modals';
 import { FlashbarProps } from '@cloudscape-design/components/flashbar';
-import { isEqual } from 'lodash';
+import isEqual from 'lodash/isEqual';
 
 export interface FilterSet {
   name: string;
diff --git a/test/e2e/details-tabs.test.ts b/test/e2e/details-tabs.test.ts
index b1d8774..1d1e834 100644
--- a/test/e2e/details-tabs.test.ts
+++ b/test/e2e/details-tabs.test.ts
@@ -3,6 +3,7 @@
 import useBrowser from '@cloudscape-design/browser-test-tools/use-browser';
 import createWrapper from '@cloudscape-design/components/test-utils/selectors';
 import BaseExamplePage from './common/base-example-page';
+import range from 'lodash/range';
 
 const setupTagsTest = (testFn: (page: TagsTab) => Promise<void>) => {
   return useBrowser(async browser => {
@@ -48,7 +49,7 @@ class TagsTab extends BaseExamplePage {
   }
 
   async getTableRows() {
-    const elements = await this.browser.$$(tagsTableRowSelector);
-    return Promise.all(Array.from(elements).map((el, index) => this.getTableRow(index + 1)));
+    const totalTags = await this.getElementsCount(tagsTableRowSelector);
+    return Promise.all(range(0, totalTags).map(index => this.getTableRow(index + 1)));
   }
 }
diff --git a/test/e2e/page/tags-page-object.ts b/test/e2e/page/tags-page-object.ts
index e5d7803..8ca88a1 100644
--- a/test/e2e/page/tags-page-object.ts
+++ b/test/e2e/page/tags-page-object.ts
@@ -52,8 +52,8 @@ export default class PageObject extends BaseExamplePage {
   }
 
   async isMarkedForRemoval(row: number) {
-    const items = await this.browser.$$(this.findRow(row).findUndoButton().toSelector());
-    return items.length > 0;
+    const itemsCount = await this.getElementsCount(this.findRow(row).findUndoButton().toSelector());
+    return itemsCount > 0;
   }
 
   async getKeySuggestionsCount(row: number) {
@@ -83,9 +83,9 @@ export default class PageObject extends BaseExamplePage {
   }
 
   async getTags() {
-    const items = await this.browser.$$(this.tagEditorWrapper.findRows().toSelector());
+    const itemsCount = await this.getElementsCount(this.tagEditorWrapper.findRows().toSelector());
     const tags = [];
-    for (let index = 1; index <= items.length; index++) {
+    for (let index = 1; index <= itemsCount; index++) {
       tags.push(await this.getTag(index));
     }
     return tags;