@eclipse-che/che-e2e 7.73.0-dev-11985ec → 7.73.0-dev-62c0c9d

package/specs/factory/NoSetupRepoFactory.spec.ts

@@ -29,7 +29,6 @@ import {
 import { expect } from 'chai';
 import { StringUtil } from '../../utils/StringUtil';
 import { CheCodeLocatorLoader } from '../../pageobjects/ide/CheCodeLocatorLoader';
-import WebDriverError = error.WebDriverError;
 import { registerRunningWorkspace } from '../MochaHooks';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { CLASSES } from '../../configs/inversify.types';
@@ -44,6 +43,7 @@ import { LoginTests } from '../../tests-library/LoginTests';
 import { FactoryTestConstants, GitProviderType } from '../../constants/FactoryTestConstants';
 import { OAuthConstants } from '../../constants/OAuthConstants';
 import { BaseTestConstants } from '../../constants/BaseTestConstants';
+import WebDriverError = error.WebDriverError;
 
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
@@ -54,217 +54,219 @@ const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
 const workspaces: Workspaces = e2eContainer.get(CLASSES.Workspaces);
 const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
 
-suite(`Create a workspace via launching a factory from the ${FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER} repository without OAuth setup`, async function (): Promise<void> {
+suite(`Create a workspace via launching a factory from the ${FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER} repository without OAuth setup`, async function(): Promise<void> {
 
-    let projectSection: ViewSection;
-    let scmProvider: SingleScmProvider;
-    let rest: SingleScmProvider[];
-    let scmContextMenu: ContextMenu;
+  let projectSection: ViewSection;
+  let scmProvider: SingleScmProvider;
+  let rest: SingleScmProvider[];
+  let scmContextMenu: ContextMenu;
 
-    // test specific data
-    let numberOfCreatedWorkspaces: number = 0;
-    const timeToRefresh: number = 1500;
-    const changesToCommit: string = (new Date()).getTime().toString();
-    const fileToChange: string = 'Date.txt';
-    const pushItemLabel: string = 'Push';
-    const commitChangesButtonLabel: string = `Commit Changes on "${FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}"`;
-    const refreshButtonLabel: string = 'Refresh';
-    const label: string = BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME;
-    let testRepoProjectName: string;
-    const isPrivateRepo: string = FactoryTestConstants.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO ? 'private' : 'public';
+  // test specific data
+  let numberOfCreatedWorkspaces: number = 0;
+  const timeToRefresh: number = 1500;
+  const changesToCommit: string = (new Date()).getTime().toString();
+  const fileToChange: string = 'Date.txt';
+  const pushItemLabel: string = 'Push';
+  const commitChangesButtonLabel: string = `Commit Changes on "${FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}"`;
+  const refreshButtonLabel: string = 'Refresh';
+  const label: string = BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME;
+  let testRepoProjectName: string;
+  const isPrivateRepo: string = FactoryTestConstants.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO ? 'private' : 'public';
 
-    loginTests.loginIntoChe();
+  loginTests.loginIntoChe();
 
-    test('Get number of previously created workspaces', async function (): Promise<void> {
-        await dashboard.clickWorkspacesButton();
-        await workspaces.waitPage();
-        numberOfCreatedWorkspaces = (await workspaces.getAllCreatedWorkspacesNames()).length;
-    });
+  test('Get number of previously created workspaces', async function(): Promise<void> {
+    await dashboard.clickWorkspacesButton();
+    await workspaces.waitPage();
+    numberOfCreatedWorkspaces = (await workspaces.getAllCreatedWorkspacesNames()).length;
+  });
 
-    test(`Navigate to the ${isPrivateRepo} repository factory URL`, async function (): Promise<void> {
-        await browserTabsUtil.navigateTo(FactoryTestConstants.TS_SELENIUM_FACTORY_URL());
-    });
+  test(`Navigate to the ${isPrivateRepo} repository factory URL`, async function(): Promise<void> {
+    await browserTabsUtil.navigateTo(FactoryTestConstants.TS_SELENIUM_FACTORY_URL());
+  });
 
-    if (FactoryTestConstants.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {
+  if (FactoryTestConstants.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {
 
-        test(`Check that workspace cannot be created without OAuth for ${isPrivateRepo} repo`, async function (): Promise<void> {
-            await dashboard.waitLoader();
-            const loaderAlert: string = await dashboard.getLoaderAlert();
-            expect(loaderAlert).contains.oneOf(['Cause: Unsupported OAuth provider', 'Cause: No PersonalAccessTokenFetcher configured']);
-        });
+    test(`Check that workspace cannot be created without OAuth for ${isPrivateRepo} repo`, async function(): Promise<void> {
+      await dashboard.waitLoader();
+      const loaderAlert: string = await dashboard.getLoaderAlert();
+      expect(loaderAlert).contains.oneOf(['Cause: Unsupported OAuth provider', 'Cause: No PersonalAccessTokenFetcher configured']);
+    });
 
-        test(`Check that workspace was not created`, async function (): Promise<void> {
-            await dashboard.openDashboard();
-            await dashboard.clickWorkspacesButton();
-            await workspaces.waitPage();
-            const allCreatedWorkspacesNames: string[] = await workspaces.getAllCreatedWorkspacesNames();
-            expect(allCreatedWorkspacesNames).has.length(numberOfCreatedWorkspaces);
-        });
+    test(`Check that workspace was not created`, async function(): Promise<void> {
+      await dashboard.openDashboard();
+      await dashboard.clickWorkspacesButton();
+      await workspaces.waitPage();
+      const allCreatedWorkspacesNames: string[] = await workspaces.getAllCreatedWorkspacesNames();
+      expect(allCreatedWorkspacesNames).has.length(numberOfCreatedWorkspaces);
+    });
 
-        loginTests.logoutFromChe();
+    loginTests.logoutFromChe();
 
-    } else {
-        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+  } else {
+    test('Obtain workspace name from workspace loader page', async function(): Promise<void> {
+      await workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+    });
 
-        test('Registering the running workspace', async function (): Promise<void> {
-            registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
-        });
+    test('Registering the running workspace', async function(): Promise<void> {
+      registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+    });
 
-        test('Wait the workspace readiness', async function (): Promise<void> {
-            await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
-        });
+    test('Wait the workspace readiness', async function(): Promise<void> {
+      await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
+    });
 
-        test('Check if a project folder has been created', async function (): Promise<void> {
-            testRepoProjectName = StringUtil.getProjectNameFromGitUrl(FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL);
-            Logger.debug(`new SideBarView().getContent().getSection: get ${testRepoProjectName}`);
-            projectSection = await new SideBarView().getContent().getSection(testRepoProjectName);
-        });
+    test('Check if a project folder has been created', async function(): Promise<void> {
+      testRepoProjectName = StringUtil.getProjectNameFromGitUrl(FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL);
+      Logger.debug(`new SideBarView().getContent().getSection: get ${testRepoProjectName}`);
+      projectSection = await new SideBarView().getContent().getSection(testRepoProjectName);
+    });
 
-        test('Accept the project as a trusted one', async function (): Promise<void> {
-            // click somewhere to trigger "Welcome Content" dialog
-            try {
-                await driverHelper.waitAndClick(webCheCodeLocators.Workbench.notificationItem);
-            } catch (e) {
-                Logger.info(`Click on ${webCheCodeLocators.Workbench.notificationItem} to get "Welcome Content" dialog ${e as string}`);
-            }
-            // "Welcome Content" dialog can be shown before of after dialog with an error for private repo
-            try {
-                const buttonYesITrustTheAuthors: string = `Yes, I trust the authors`;
-                await driverHelper.waitVisibility(webCheCodeLocators.WelcomeContent.text, TimeoutConstants.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM);
-                const welcomeContentDialog: ModalDialog = new ModalDialog();
-                Logger.debug(`trustedProjectDialog.pushButton: "${buttonYesITrustTheAuthors}"`);
-                await welcomeContentDialog.pushButton(buttonYesITrustTheAuthors);
-                await driverHelper.waitDisappearance(webCheCodeLocators.WelcomeContent.text);
-            } catch (e) {
-                Logger.info(`"Accept the project as a trusted one" dialog was not shown firstly for "${isPrivateRepo}"`);
-                if (!FactoryTestConstants.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {
-                    throw new WebDriverError(e as string);
-                }
-            }
-        });
+    test('Accept the project as a trusted one', async function(): Promise<void> {
+      // click somewhere to trigger "Welcome Content" dialog
+      try {
+        await driverHelper.waitAndClick(webCheCodeLocators.Workbench.notificationItem);
+      } catch (e) {
+        Logger.info(`Click on ${webCheCodeLocators.Workbench.notificationItem} to get "Welcome Content" dialog ${e as string}`);
+      }
+      // "Welcome Content" dialog can be shown before of after dialog with an error for private repo
+      try {
+        const buttonYesITrustTheAuthors: string = `Yes, I trust the authors`;
+        await driverHelper.waitVisibility(webCheCodeLocators.WelcomeContent.text, TimeoutConstants.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM);
+        const welcomeContentDialog: ModalDialog = new ModalDialog();
+        Logger.debug(`trustedProjectDialog.pushButton: "${buttonYesITrustTheAuthors}"`);
+        await welcomeContentDialog.pushButton(buttonYesITrustTheAuthors);
+        await driverHelper.waitDisappearance(webCheCodeLocators.WelcomeContent.text);
+      } catch (e) {
+        Logger.info(`"Accept the project as a trusted one" dialog was not shown firstly for "${isPrivateRepo}"`);
+        if (!FactoryTestConstants.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {
+          throw new WebDriverError(e as string);
+        }
+      }
+    });
 
-        test('Check if the project files were imported', async function (): Promise<void> {
-            Logger.debug(`projectSection.findItem: find ${label}`);
-            const isFileImported: ViewItem | undefined = await projectSection.findItem(label);
-            // projectSection.findItem(label) can return undefined but test will goes on
-            expect(isFileImported).not.eqls(undefined);
-        });
+    test('Check if the project files were imported', async function(): Promise<void> {
+      Logger.debug(`projectSection.findItem: find ${label}`);
+      const isFileImported: ViewItem | undefined = await projectSection.findItem(label);
+      // projectSection.findItem(label) can return undefined but test will goes on
+      expect(isFileImported).not.eqls(undefined);
+    });
 
-        test('Make changes to the file', async function (): Promise<void> {
-            Logger.debug(`projectSection.openItem: "${fileToChange}"`);
-            await projectSection.openItem(fileToChange);
-            const editor: TextEditor = await new EditorView().openEditor(fileToChange) as TextEditor;
-            await driverHelper.waitVisibility(webCheCodeLocators.Editor.inputArea);
-            Logger.debug(`editor.clearText`);
-            await editor.clearText();
-            Logger.debug(`editor.typeTextAt: "${changesToCommit}"`);
-            await editor.typeTextAt(1, 1, changesToCommit);
-        });
+    test('Make changes to the file', async function(): Promise<void> {
+      Logger.debug(`projectSection.openItem: "${fileToChange}"`);
+      await projectSection.openItem(fileToChange);
+      const editor: TextEditor = await new EditorView().openEditor(fileToChange) as TextEditor;
+      await driverHelper.waitVisibility(webCheCodeLocators.Editor.inputArea);
+      Logger.debug(`editor.clearText`);
+      await editor.clearText();
+      Logger.debug(`editor.typeTextAt: "${changesToCommit}"`);
+      await editor.typeTextAt(1, 1, changesToCommit);
+    });
 
-        test('Open a source control manager', async function (): Promise<void> {
-            const viewSourceControl: string = `Source Control`;
-            const sourceControl: ViewControl = await new ActivityBar().getViewControl(viewSourceControl) as ViewControl;
-            Logger.debug(`sourceControl.openView: "${viewSourceControl}"`);
-            await sourceControl.openView();
-            const scmView: NewScmView = new NewScmView();
-            await driverHelper.waitVisibility(webCheCodeLocators.ScmView.actionConstructor(commitChangesButtonLabel));
-            [scmProvider, ...rest] = await scmView.getProviders();
-            Logger.debug(`scmView.getProviders: "${scmProvider}, ${scmProvider}"`);
-        });
+    test('Open a source control manager', async function(): Promise<void> {
+      const viewSourceControl: string = `Source Control`;
+      const sourceControl: ViewControl = await new ActivityBar().getViewControl(viewSourceControl) as ViewControl;
+      Logger.debug(`sourceControl.openView: "${viewSourceControl}"`);
+      await sourceControl.openView();
+      const scmView: NewScmView = new NewScmView();
+      await driverHelper.waitVisibility(webCheCodeLocators.ScmView.actionConstructor(commitChangesButtonLabel));
+      [scmProvider, ...rest] = await scmView.getProviders();
+      Logger.debug(`scmView.getProviders: "${scmProvider}, ${scmProvider}"`);
+    });
 
-        test('Check if the changes are displayed in the source control manager', async function (): Promise<void> {
-            await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
-            await driverHelper.wait(timeToRefresh);
-            Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
-            await scmProvider.takeAction(refreshButtonLabel);
-            // wait while changes counter will be refreshed
-            await driverHelper.wait(timeToRefresh);
-            const changes: number = await scmProvider.getChangeCount();
-            Logger.debug(`scmProvider.getChangeCount: number of changes is "${changes}"`);
-            expect(changes).eql(1);
-        });
+    test('Check if the changes are displayed in the source control manager', async function(): Promise<void> {
+      await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
+      await driverHelper.wait(timeToRefresh);
+      Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
+      await scmProvider.takeAction(refreshButtonLabel);
+      // wait while changes counter will be refreshed
+      await driverHelper.wait(timeToRefresh);
+      const changes: number = await scmProvider.getChangeCount();
+      Logger.debug(`scmProvider.getChangeCount: number of changes is "${changes}"`);
+      expect(changes).eql(1);
+    });
 
-        test('Stage the changes', async function (): Promise<void> {
-            await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
-            Logger.debug(`scmProvider.openMoreActions`);
-            scmContextMenu = await scmProvider.openMoreActions();
-            await driverHelper.waitVisibility(webCheCodeLocators.ContextMenu.contextView);
-            Logger.debug(`scmContextMenu.select: "Changes" -> "Stage All Changes"`);
-            await scmContextMenu.select('Changes', 'Stage All Changes');
-        });
+    test('Stage the changes', async function(): Promise<void> {
+      await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
+      Logger.debug(`scmProvider.openMoreActions`);
+      scmContextMenu = await scmProvider.openMoreActions();
+      await driverHelper.waitVisibility(webCheCodeLocators.ContextMenu.contextView);
+      Logger.debug(`scmContextMenu.select: "Changes" -> "Stage All Changes"`);
+      await scmContextMenu.select('Changes', 'Stage All Changes');
+    });
 
-        test('Commit the changes', async function (): Promise<void> {
-            await driverHelper.waitVisibility(webCheCodeLocators.ScmView.actionConstructor(commitChangesButtonLabel));
-            Logger.debug(`scmProvider.commitChanges: commit name "Commit ${changesToCommit}"`);
-            await scmProvider.commitChanges('Commit ' + changesToCommit);
-            await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
-            await driverHelper.wait(timeToRefresh);
-            Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
-            await scmProvider.takeAction(refreshButtonLabel);
-            // wait while changes counter will be refreshed
-            await driverHelper.wait(timeToRefresh);
-            const changes: number = await scmProvider.getChangeCount();
-            Logger.debug(`scmProvider.getChangeCount: number of changes is "${changes}"`);
-            expect(changes).eql(0);
-        });
+    test('Commit the changes', async function(): Promise<void> {
+      await driverHelper.waitVisibility(webCheCodeLocators.ScmView.actionConstructor(commitChangesButtonLabel));
+      Logger.debug(`scmProvider.commitChanges: commit name "Commit ${changesToCommit}"`);
+      await scmProvider.commitChanges('Commit ' + changesToCommit);
+      await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
+      await driverHelper.wait(timeToRefresh);
+      Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
+      await scmProvider.takeAction(refreshButtonLabel);
+      // wait while changes counter will be refreshed
+      await driverHelper.wait(timeToRefresh);
+      const changes: number = await scmProvider.getChangeCount();
+      Logger.debug(`scmProvider.getChangeCount: number of changes is "${changes}"`);
+      expect(changes).eql(0);
+    });
 
-        test('Push the changes', async function (): Promise<void> {
-            await driverHelper.waitVisibility(webCheCodeLocators.ScmView.actionConstructor(`Push 1 commits to origin/${FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}`));
-            await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
-            Logger.debug(`scmProvider.openMoreActions`);
-            scmContextMenu = await scmProvider.openMoreActions();
-            await driverHelper.waitVisibility(webCheCodeLocators.ContextMenu.itemConstructor(pushItemLabel));
-            Logger.debug(`scmContextMenu.select: "${pushItemLabel}"`);
-            await scmContextMenu.select(pushItemLabel);
-        });
+    test('Push the changes', async function(): Promise<void> {
+      await driverHelper.waitVisibility(webCheCodeLocators.ScmView.actionConstructor(`Push 1 commits to origin/${FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}`));
+      await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
+      Logger.debug(`scmProvider.openMoreActions`);
+      scmContextMenu = await scmProvider.openMoreActions();
+      await driverHelper.waitVisibility(webCheCodeLocators.ContextMenu.itemConstructor(pushItemLabel));
+      Logger.debug(`scmContextMenu.select: "${pushItemLabel}"`);
+      await scmContextMenu.select(pushItemLabel);
+    });
 
-        if (FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER === GitProviderType.GITHUB) {
-            test('Decline GitHub Extension', async function (): Promise<void> {
-                await driverHelper.waitVisibility(webCheCodeLocators.Dialog.details);
-                const gitHaExtensionDialog: ModalDialog = new ModalDialog();
-                await gitHaExtensionDialog.pushButton('Cancel');
-            });
-        }
+    if (FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER === GitProviderType.GITHUB) {
+      test('Decline GitHub Extension', async function(): Promise<void> {
+        await driverHelper.waitVisibility(webCheCodeLocators.Dialog.details);
+        const gitHaExtensionDialog: ModalDialog = new ModalDialog();
+        await gitHaExtensionDialog.pushButton('Cancel');
+      });
+    }
 
-        test('Insert git credentials which were asked after push', async function (): Promise<void> {
-            try {
-                await driverHelper.waitVisibility(webCheCodeLocators.InputBox.message);
-            } catch (e) {
-                Logger.info(`Workspace did not ask credentials before push - ${e};
+    test('Insert git credentials which were asked after push', async function(): Promise<void> {
+      try {
+        await driverHelper.waitVisibility(webCheCodeLocators.InputBox.message);
+      } catch (e) {
+        Logger.info(`Workspace did not ask credentials before push - ${e};
                 Known issue for github.com - https://issues.redhat.com/browse/CRW-4066, please check if not other git provider. `);
-                expect(FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER).eqls(GitProviderType.GITHUB);
-            }
-            const input: InputBox = new InputBox();
-            await input.setText(OAuthConstants.TS_SELENIUM_GIT_PROVIDER_USERNAME);
-            await input.confirm();
-            await driverHelper.wait(timeToRefresh);
-            await input.setText(OAuthConstants.TS_SELENIUM_GIT_PROVIDER_PASSWORD);
-            await input.confirm();
-            await driverHelper.wait(timeToRefresh);
-        });
+        expect(FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER).eqls(GitProviderType.GITHUB);
+      }
+      const input: InputBox = new InputBox();
+      await input.setText(OAuthConstants.TS_SELENIUM_GIT_PROVIDER_USERNAME);
+      await input.confirm();
+      await driverHelper.wait(timeToRefresh);
+      await input.setText(OAuthConstants.TS_SELENIUM_GIT_PROVIDER_PASSWORD);
+      await input.confirm();
+      await driverHelper.wait(timeToRefresh);
+    });
 
-        test('Check if the changes were pushed', async function (): Promise<void> {
-            try {
-                Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
-                await scmProvider.takeAction(refreshButtonLabel);
-            } catch (e) {
-                Logger.info('Check you use correct credentials.' +
-                    'For bitbucket.org ensure you use an app password: https://support.atlassian.com/bitbucket-cloud/docs/using-app-passwords/;' +
-                    'For github.com - personal access token instead of password.');
-            }
-            const isCommitButtonDisabled: string = await driverHelper.waitAndGetElementAttribute(webCheCodeLocators.ScmView.actionConstructor(commitChangesButtonLabel), 'aria-disabled');
-            expect(isCommitButtonDisabled).eql('true');
-        });
+    test('Check if the changes were pushed', async function(): Promise<void> {
+      try {
+        Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
+        await scmProvider.takeAction(refreshButtonLabel);
+      } catch (e) {
+        Logger.info('Check you use correct credentials.' +
+          'For bitbucket.org ensure you use an app password: https://support.atlassian.com/bitbucket-cloud/docs/using-app-passwords/;' +
+          'For github.com - personal access token instead of password.');
+      }
+      const isCommitButtonDisabled: string = await driverHelper.waitAndGetElementAttribute(webCheCodeLocators.ScmView.actionConstructor(commitChangesButtonLabel), 'aria-disabled');
+      expect(isCommitButtonDisabled).eql('true');
+    });
 
-        test('Stop the workspace', async function (): Promise<void> {
-            await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests.getWorkspaceName());
-            await browserTabsUtil.closeAllTabsExceptCurrent();
-        });
+    test('Stop the workspace', async function(): Promise<void> {
+      await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+      await browserTabsUtil.closeAllTabsExceptCurrent();
+    });
 
-        test('Delete the workspace', async function (): Promise<void> {
-            await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests.getWorkspaceName());
-        });
+    test('Delete the workspace', async function(): Promise<void> {
+      await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+    });
 
-        loginTests.logoutFromChe();
-    }
+    loginTests.logoutFromChe();
+  }
 });