Fix removing workspace via UI - new popup. (#16561)

eclipse-che · Apr 7, 2020 · 7580ee9 · 7580ee9
1 parent 6ea0182
commit 7580ee9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/tests/e2e/pageobjects/dashboard/Dashboard.ts b/tests/e2e/pageobjects/dashboard/Dashboard.ts
@@ -49,7 +49,7 @@ export class Dashboard {
         await this.workspaces.waitWorkspaceListItem(workspaceName);
         await this.workspaces.clickWorkspaceListItem(workspaceName);
         await this.workspaces.clickDeleteButtonOnWorkspaceDetails();
-        await this.workspaces.clickConfirmDeletionButton();
+        await this.workspaces.confirmWorkspaceDeletion();
         await this.workspaces.waitPage();
         await this.workspaces.waitWorkspaceListItemAbcence(workspaceName);
     }

diff --git a/tests/e2e/pageobjects/dashboard/Workspaces.ts b/tests/e2e/pageobjects/dashboard/Workspaces.ts
@@ -92,10 +92,14 @@ export class Workspaces {
         await this.driverHelper.waitDisappearance(workspaceListItemLocator, timeout);
     }
 
-    async clickConfirmDeletionButton(timeout: number = TestConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT) {
-        Logger.debug('Workspaces.clickConfirmDeletionButton');
+    async confirmWorkspaceDeletion(timeout: number = TestConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT) {
+        Logger.debug('Workspaces.confirmWorkspaceDeletion');
 
-        await this.driverHelper.waitAndClick(By.css('#ok-dialog-button'), timeout);
+        const checkbox: By = By.xpath(`//che-popup//input[contains(@type, 'checkbox')]`);
+        await this.driverHelper.waitAndClick(checkbox, 10000);
+
+        const deleteButton: By = By.xpath('//che-popup//che-button-danger');
+        await this.driverHelper.waitAndClick(deleteButton, 10000);
     }
 
     private getWorkspaceListItemLocator(workspaceName: string): string {