added step to cancel edit an delete workspace to clean up

all-of-us · chavanr2019 · Mar 3, 2022 · Feb 14, 2022 · Feb 14, 2022 · Feb 14, 2022
commit a3269224e19c2e67a6b698bbcac0e5f384f7c6c6
diff --git a/e2e/app/page/workspace-edit-page.ts b/e2e/app/page/workspace-edit-page.ts
@@ -13,6 +13,7 @@ import WorkspaceBase, { UseFreeCredits } from './workspace-base';
 import { config } from 'resources/workbench-config';
 import BaseElement from 'app/element/base-element';
 import { makeWorkspaceName } from 'utils/str-utils';
+import WorkspaceDataPage from './workspace-data-page';
 
 const faker = require('faker/locale/en_US');
 
@@ -503,4 +504,12 @@ export default class WorkspaceEditPage extends WorkspaceBase {
     await this.requestForReviewRadiobutton(false);
     return workspaceName;
   }
+
+  // click cancel button on edit page and navigate to dataPage
+  async clickCancelButton(): Promise<WorkspaceDataPage> {
+    const button = this.getCancelButton();
+    await button.click();
+    const dataPage = new WorkspaceDataPage(this.page);
+    return dataPage;
+  }
 }
diff --git a/e2e/tests/nightly/admin/lock-workspace.spec.ts b/e2e/tests/nightly/admin/lock-workspace.spec.ts
@@ -14,6 +14,7 @@ import WorkspaceEditPage from 'app/page/workspace-edit-page';
 import { MenuOption } from 'app/text-labels';
 import WorkspaceAnalysisPage from 'app/page/workspace-analysis-page';
 
+
 describe('Workspace Admin lock-workspace', () => {
   const workspaceName = 'e2eLockWorkspace';
   const reasonText = 'locking this workspace';
@@ -25,7 +26,7 @@ describe('Workspace Admin lock-workspace', () => {
     await signInWithAccessToken(page, config.ADMIN_TEST_USER);
   });
 
-  test.only('verify if workspace is locked', async () => {
+  test('verify if workspace is locked', async () => {
     const workspacesPage = new WorkspacesPage(page);
     await workspacesPage.load();
     await workspacesPage.createWorkspace(workspaceName);
@@ -68,8 +69,7 @@ describe('Workspace Admin lock-workspace', () => {
     // verify the lock icon is displaying for the locked workspace
     const aboutLockedIcon = aboutPage.getAboutLockedWorkspaceIcon();
     expect(aboutLockedIcon).toBeTruthy();
-    // expect(await aboutPage.getTabState(page, Tabs.Analysis)).toBe(false);
-    // expect(await aboutPage.getTabState(page, Tabs.Data)).toBe(false);
+
     // verify DATA & ANALYSIS tabs are inactive for locked workspace
     const analysisTab = await aboutPage.getTabState(Tabs.Analysis);
     expect(analysisTab).toBe(false);
@@ -124,8 +124,12 @@ describe('Workspace Admin lock-workspace', () => {
     await aboutPage.getAboutEditIcon();
     const workspaceEdit = new WorkspaceEditPage(page);
     await workspaceEdit.waitForLoad();
+    await workspaceEdit.clickCancelButton();
+    // cleanup
+    await dataPage.deleteWorkspace();
   });
 
+  // function to create cohort, dataset and notebook
   async function createDatasetNotebook(page: Page, pyNotebookName: string): Promise<NotebookPreviewPage> {
     const dataPage = new WorkspaceDataPage(page);
     await dataPage.waitForLoad();