test: Fix ModialDialog tests for VS Code 1.87.0

redhat-developer · Mar 19, 2024 · a8c1199 · a8c1199
1 parent 52ecd8e
commit a8c1199
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/locators/lib/1.37.0.ts b/locators/lib/1.37.0.ts
@@ -457,7 +457,10 @@ const dialog = {
         details: By.className('dialog-message-detail'),
         buttonContainer: By.className('dialog-buttons-row'),
         button: By.className('monaco-text-button'),
-        closeButton: By.className('codicon-dialog-close')
+        closeButton: By.className('codicon-dialog-close'),
+        buttonLabel: {
+            value: fromAttribute('title')
+        }
     }
 }
 

diff --git a/locators/lib/1.87.0.ts b/locators/lib/1.87.0.ts
@@ -28,6 +28,11 @@ export const diff: LocatorDiff = {
         },
         DefaultTreeItem: {
             labelAttribute: 'aria-label'
+        },
+        Dialog: {
+            buttonLabel: {
+                value: fromText()
+            }
         }
     }
 }
diff --git a/page-objects/src/components/dialog/ModalDialog.ts b/page-objects/src/components/dialog/ModalDialog.ts
@@ -42,7 +42,7 @@ export class ModalDialog extends AbstractElement {
      */
     async pushButton(title: string): Promise<void> {
         const buttons = await this.getButtons();
-        const titles = await Promise.all(buttons.map(async btn => btn.getAttribute('title')));
+        const titles = await Promise.all(buttons.map(async btn => ModalDialog.locators.Dialog.buttonLabel.value(btn)));
         const index = titles.findIndex(value => value === title);
         if (index > -1) {
             await buttons[index].click();

diff --git a/page-objects/src/locators/locators.ts b/page-objects/src/locators/locators.ts
@@ -457,6 +457,9 @@ export interface Locators {
         buttonContainer: By
         button: By
         closeButton: By
+        buttonLabel: {
+            value: WebElementFunction<WebElement, string>
+        }
     }
 
     WelcomeContent: {