[Selenium] Stabilize OpenshiftConnector and GitSsh typescript tests (e…

…clipse-che#18687)
xiaochen2050 · Dec 22, 2020 · ecd2d2f · ecd2d2f
1 parent c4e03c1
commit ecd2d2f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/tests/e2e/tests/e2e/GitSsh.spec.ts b/tests/e2e/tests/e2e/GitSsh.spec.ts
@@ -56,7 +56,7 @@ suite('Git with ssh workflow', async () => {
         await loginPage.login();
         await ide.waitWorkspaceAndIde();
         await projectTree.openProjectTreeContainer();
-        await driverHelper.wait(TimeoutConstants.TS_DEBUGGER_CONNECTION_TIMEOUT);
+        await driverHelper.wait(TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
     });
 
     test('Generate a SSH key', async () => {
@@ -100,8 +100,8 @@ suite('Git with ssh workflow', async () => {
         await testWorkspaceUtils.createWsFromDevFile(data);
         await driverHelper.navigateToUrl(workspacePrefixUrl + wsNameCheckPropagatingKeys);
         await ide.waitWorkspaceAndIde();
-        await driverHelper.wait(5000);
         await projectTree.openProjectTreeContainer();
+        await driverHelper.wait(TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
         await cloneTestRepo();
         await projectTree.waitItem('Spoon-Knife');
     });

diff --git a/tests/e2e/tests/e2e/OpenshiftConnector.spec.ts b/tests/e2e/tests/e2e/OpenshiftConnector.spec.ts
@@ -23,8 +23,7 @@ import { TestConstants } from '../../TestConstants';
 import { DriverHelper } from '../../utils/DriverHelper';
 import { PreferencesHandler, TerminalRendererType } from '../../utils/PreferencesHandler';
 import { TestWorkspaceUtil } from '../../utils/workspace/TestWorkspaceUtil';
-import { WorkspaceNameHandler } from '../../utils/WorkspaceNameHandler';
-import * as workspaceHandling from '../../testsLibrary/WorksapceHandlingTests';
+import { TimeoutConstants } from '../../TimeoutConstants';
 
 
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
@@ -114,9 +113,10 @@ suite('Openshift connector user story', async () => {
     await quickOpenContainer.clickOnContainerItem(TestConstants.TS_TEST_OPENSHIFT_PLUGIN_COMPONENT_TYPE);
     await quickOpenContainer.clickOnContainerItem(TestConstants.TS_TEST_OPENSHIFT_PLUGIN_COMPONENT_VERSION);
 
-    await openshiftPlugin.clickOnItemInTree(TestConstants.TS_TEST_OPENSHIFT_PLUGIN_PROJECT);
-    await openshiftPlugin.clickOnItemInTree('node-js-app');
-    await openshiftPlugin.clickOnItemInTree('component-node-js');
+    await driverHelper.wait(TimeoutConstants.TS_PROJECT_TREE_TIMEOUT);
+    await openshiftPlugin.waitItemInTree(TestConstants.TS_TEST_OPENSHIFT_PLUGIN_PROJECT);
+    await openshiftPlugin.waitItemInTree('node-js-app');
+    await openshiftPlugin.waitItemInTree('component-node-js');
   });
 
   test('Push new component', async () => {
@@ -127,17 +127,10 @@ suite('Openshift connector user story', async () => {
     await terminal.selectTabByPrefixAndWaitText('OpenShift: Push', 'Changes successfully pushed to component', 120_000);
   });
 
-  suite ('Stopping and deleting the workspace', async () => {
-    let workspaceName = 'not defined';
-    suiteSetup( async () => {
-        workspaceName = await WorkspaceNameHandler.getNameFromUrl();
-    });
-    test (`Stop workspace`, async () => {
-        await workspaceHandling.stopWorkspace(workspaceName);
-    });
-    test (`Remove workspace`, async () => {
-        await workspaceHandling.removeWorkspace(workspaceName);
+  suite('Cleanup', async () => {
+    test('Remove test workspace', async () => {
+        await testWorkspaceUtils.cleanUpAllWorkspaces();
     });
-  });
+});
 
 });