@eclipse-che/che-e2e 7.46.1-dev-e59785f → 7.46.1-dev-c4fc12d

package/tests/devfiles/Python.spec.ts

@@ -14,6 +14,7 @@ import { e2eContainer } from '../../inversify.config';
 import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
 import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
@@ -32,6 +33,9 @@ suite(`${workspaceStack} test`, async () => {
     suite(`Create ${workspaceStack} workspace`, async () => {
         workspaceHandlingTests.createAndOpenWorkspace(workspaceStack);
         workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+        test('Register running workspace', async () => {
+            CheReporter.registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+        });
         projectAndFileTests.waitWorkspaceReadinessNoSubfolder(workspaceSampleName, false);
     });
 

package/tests/devfiles/PythonDjango.spec.ts

@@ -13,6 +13,7 @@ import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
 import { e2eContainer } from '../../inversify.config';
 import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
@@ -34,6 +35,9 @@ suite(`${workspaceStack} test`, async () => {
     suite(`Create ${workspaceStack} workspace`, async () => {
         workspaceHandlingTests.createAndOpenWorkspace(workspaceStack);
         workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+        test('Register running workspace', async () => {
+            CheReporter.registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+        });
         projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName, false);
     });
 

package/tests/devfiles/Quarkus.spec.ts

@@ -14,6 +14,7 @@ import { e2eContainer } from '../../inversify.config';
 import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
 import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
@@ -34,6 +35,9 @@ suite(`${workspaceStack} test`, async () => {
     suite(`Create ${workspaceStack}`, async () => {
         workspaceHandlingTests.createAndOpenWorkspace(workspaceStack);
         workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+        test('Register running workspace', async () => {
+            CheReporter.registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+        });
         projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName, false);
     });
 

package/tests/devfiles/Scala.spec.ts

@@ -14,6 +14,7 @@ import { e2eContainer } from '../../inversify.config';
 import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
 import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
@@ -34,6 +35,9 @@ suite.skip(`${stack} test`, async () => {
     suite (`Create ${stack} workspace`, async () => {
         workspaceHandlingTests.createAndOpenWorkspace(stack);
         workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+        test('Register running workspace', async () => {
+            CheReporter.registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+        });
         projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName, false);
     });
 

package/tests/e2e/FactoryUrl.spec.ts

@@ -9,7 +9,7 @@
 //  **********************************************************************/
 
 import { e2eContainer } from '../../inversify.config';
-import { CLASSES } from '../../inversify.types';
+import { CLASSES, TYPES } from '../../inversify.types';
 import { TestConstants } from '../../TestConstants';
 import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
@@ -18,7 +18,7 @@ import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTest
 
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
-const testWorkspaceUtils: TestWorkspaceUtil = e2eContainer.get<TestWorkspaceUtil>(CLASSES.WorkspaceUtil);
+const testWorkspaceUtils: TestWorkspaceUtil = e2eContainer.get<TestWorkspaceUtil>(TYPES.WorkspaceUtil);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get<WorkspaceHandlingTests>(CLASSES.WorkspaceHandlingTests);
 
 const factoryUrl : string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=https://raw.githubusercontent.com/eclipse/che-devfile-registry/master/devfiles/java-maven/devfile.yaml`;

package/tests/e2e/GitPublishBranch.spec.ts

@@ -18,12 +18,13 @@ import { QuickOpenContainer } from '../../pageobjects/ide/QuickOpenContainer';
 import { ICheLoginPage } from '../../pageobjects/login/ICheLoginPage';
 import { TestConstants } from '../../TestConstants';
 import { DriverHelper } from '../../utils/DriverHelper';
-import { TestWorkspaceUtil } from '../../utils/workspace/TestWorkspaceUtil';
 import { TopMenu } from '../../pageobjects/ide/TopMenu';
 import { WorkspaceNameHandler } from '../../utils/WorkspaceNameHandler';
 import { By } from 'selenium-webdriver';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
+import CheReporter from '../../driver/CheReporter';
 
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
@@ -34,7 +35,7 @@ const topMenu: TopMenu = e2eContainer.get(CLASSES.TopMenu);
 const loginPage: ICheLoginPage = e2eContainer.get<ICheLoginPage>(TYPES.CheLogin);
 const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
 const gitPlugin: GitPlugin = e2eContainer.get(CLASSES.GitPlugin);
-const testWorkspaceUtils: TestWorkspaceUtil = e2eContainer.get<TestWorkspaceUtil>(CLASSES.WorkspaceUtil);
+const testWorkspaceUtils: ITestWorkspaceUtil = e2eContainer.get<ITestWorkspaceUtil>(TYPES.WorkspaceUtil);
 const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler);
 
 const workspacePrefixUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/dashboard/#/ide/${TestConstants.TS_SELENIUM_USERNAME}/`;
@@ -54,6 +55,7 @@ suite('Publish branch in git extension', async () => {
         await browserTabsUtil.navigateTo(workspacePrefixUrl + wsNameGitPublishBranch);
         await loginPage.login();
         WorkspaceHandlingTests.setWorkspaceName(wsNameGitPublishBranch);
+        CheReporter.registerRunningWorkspace(wsNameGitPublishBranch);
         await ide.waitWorkspaceAndIde();
         await projectTree.openProjectTreeContainer();
         await driverHelper.wait(15000);

package/tests/e2e/GitSelfSignCert.spec.ts

@@ -17,26 +17,27 @@ import { QuickOpenContainer } from '../../pageobjects/ide/QuickOpenContainer';
 import { ICheLoginPage } from '../../pageobjects/login/ICheLoginPage';
 import { TestConstants } from '../../TestConstants';
 import { DriverHelper } from '../../utils/DriverHelper';
-import { TestWorkspaceUtil } from '../../utils/workspace/TestWorkspaceUtil';
 import { TopMenu } from '../../pageobjects/ide/TopMenu';
 import { TimeoutConstants } from '../../TimeoutConstants';
 import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
 import { Editor } from '../../pageobjects/ide/Editor';
+import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
+import CheReporter from '../../driver/CheReporter';
 
- const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
- const ide: Ide = e2eContainer.get(CLASSES.Ide);
- const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
- const quickOpenContainer: QuickOpenContainer = e2eContainer.get(CLASSES.QuickOpenContainer);
- const topMenu: TopMenu = e2eContainer.get(CLASSES.TopMenu);
- const loginPage: ICheLoginPage = e2eContainer.get<ICheLoginPage>(TYPES.CheLogin);
- const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
- const gitPlugin: GitPlugin = e2eContainer.get(CLASSES.GitPlugin);
- const testWorkspaceUtils: TestWorkspaceUtil = e2eContainer.get<TestWorkspaceUtil>(CLASSES.WorkspaceUtil);
- const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
- const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
- const editor: Editor = e2eContainer.get(CLASSES.Editor);
+const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
+const ide: Ide = e2eContainer.get(CLASSES.Ide);
+const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
+const quickOpenContainer: QuickOpenContainer = e2eContainer.get(CLASSES.QuickOpenContainer);
+const topMenu: TopMenu = e2eContainer.get(CLASSES.TopMenu);
+const loginPage: ICheLoginPage = e2eContainer.get<ICheLoginPage>(TYPES.CheLogin);
+const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
+const gitPlugin: GitPlugin = e2eContainer.get(CLASSES.GitPlugin);
+const testWorkspaceUtils: ITestWorkspaceUtil = e2eContainer.get<ITestWorkspaceUtil>(TYPES.WorkspaceUtil);
+const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
+const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
+const editor: Editor = e2eContainer.get(CLASSES.Editor);
 
 const workspaceName = 'gitSelfSignCert';
 
@@ -49,6 +50,7 @@ suite('Checking git + self sign cert', async () => {
         const wsConfig = await testWorkspaceUtils.getBaseDevfile();
         wsConfig.metadata!.name = workspaceName;
         WorkspaceHandlingTests.setWorkspaceName(workspaceName);
+        CheReporter.registerRunningWorkspace(workspaceName);
         await browserTabsUtil.navigateTo(TestConstants.TS_SELENIUM_BASE_URL);
         await loginPage.login();
         await testWorkspaceUtils.createWsFromDevFile(wsConfig);

package/tests/e2e/GitSsh.spec.ts

@@ -22,12 +22,13 @@ import { DriverHelper } from '../../utils/DriverHelper';
 import { WorkspaceNameHandler } from '../../utils/WorkspaceNameHandler';
 import { CheGitApi } from '../../utils/VCS/CheGitApi';
 import { GitHubUtil } from '../../utils/VCS/github/GitHubUtil';
-import { TestWorkspaceUtil } from '../../utils/workspace/TestWorkspaceUtil';
 import { TopMenu } from '../../pageobjects/ide/TopMenu';
 import { TimeoutConstants } from '../../TimeoutConstants';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { Dashboard } from '../..';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
+import CheReporter from '../../driver/CheReporter';
 
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
@@ -39,7 +40,7 @@ const gitHubUtils: GitHubUtil = e2eContainer.get<GitHubUtil>(CLASSES.GitHubUtil)
 const cheGitAPI: CheGitApi = e2eContainer.get(CLASSES.CheGitApi);
 const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
 const gitPlugin: GitPlugin = e2eContainer.get(CLASSES.GitPlugin);
-const testWorkspaceUtils: TestWorkspaceUtil = e2eContainer.get<TestWorkspaceUtil>(CLASSES.WorkspaceUtil);
+const testWorkspaceUtils: ITestWorkspaceUtil = e2eContainer.get<ITestWorkspaceUtil>(TYPES.WorkspaceUtil);
 const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler);
@@ -62,6 +63,7 @@ suite('Git with ssh workflow', async () => {
         await dashboard.openDashboard();
         await browserTabsUtil.navigateTo(workspacePrefixUrl + wsNameCheckGeneratingKeys);
         WorkspaceHandlingTests.setWorkspaceName(wsNameCheckGeneratingKeys);
+        CheReporter.registerRunningWorkspace(wsNameCheckGeneratingKeys);
         await ide.waitWorkspaceAndIde();
         await projectTree.openProjectTreeContainer();
         await driverHelper.wait(TimeoutConstants.TS_PROJECT_TREE_TIMEOUT);
@@ -112,6 +114,7 @@ suite('Git with ssh workflow', async () => {
         await dashboard.openDashboard();
         await browserTabsUtil.navigateTo(workspacePrefixUrl + wsNameCheckPropagatingKeys);
         WorkspaceHandlingTests.setWorkspaceName(wsNameCheckPropagatingKeys);
+        CheReporter.registerRunningWorkspace(wsNameCheckGeneratingKeys);
         await ide.waitWorkspaceAndIde();
         await projectTree.openProjectTreeContainer();
         await driverHelper.wait(TimeoutConstants.TS_PROJECT_TREE_TIMEOUT);

package/tests/e2e/OpenshiftConnector.spec.ts

@@ -23,15 +23,16 @@ import { ICheLoginPage } from '../../pageobjects/login/ICheLoginPage';
 import { TestConstants } from '../../TestConstants';
 import { DriverHelper } from '../../utils/DriverHelper';
 import { PreferencesHandler, TerminalRendererType } from '../../utils/PreferencesHandler';
-import { TestWorkspaceUtil } from '../../utils/workspace/TestWorkspaceUtil';
 import { TimeoutConstants } from '../../TimeoutConstants';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
+import CheReporter from '../../driver/CheReporter';
 
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
 const loginPage: ICheLoginPage = e2eContainer.get<ICheLoginPage>(TYPES.CheLogin);
-const testWorkspaceUtils: TestWorkspaceUtil = e2eContainer.get<TestWorkspaceUtil>(CLASSES.WorkspaceUtil);
+const testWorkspaceUtils: ITestWorkspaceUtil = e2eContainer.get<ITestWorkspaceUtil>(TYPES.WorkspaceUtil);
 const openshiftPlugin: OpenshiftPlugin = e2eContainer.get(CLASSES.OpenshiftPlugin);
 const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
 const quickOpenContainer: QuickOpenContainer = e2eContainer.get(CLASSES.QuickOpenContainer);
@@ -78,6 +79,7 @@ suite('Openshift connector user story', async () => {
     await dashboard.openDashboard();
     await browserTabsUtil.navigateTo(workspacePrefixUrl + wsName);
     WorkspaceHandlingTests.setWorkspaceName(wsName);
+    CheReporter.registerRunningWorkspace(wsName);
     await ide.waitWorkspaceAndIde();
     await projectTree.openProjectTreeContainer();
     await projectTree.waitProjectImported(projectName, 'index.js');

package/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts

@@ -25,6 +25,7 @@ import { TopMenu } from '../../pageobjects/ide/TopMenu';
 import * as fs from 'fs';
 import axios from 'axios';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../driver/CheReporter';
 
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
 const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
@@ -66,6 +67,7 @@ suite('Workspace creation via factory url', async () => {
 
         test('Register running workspace', async () => {
             WorkspaceHandlingTests.setWorkspaceName(projectName);
+            CheReporter.registerRunningWorkspace(projectName);
         });
 
         test('Register running workspace', async () => {

package/tests/e2e_happy_path/HappyPath.spec.ts

@@ -29,6 +29,7 @@ import { Logger } from '../../utils/Logger';
 import { RightToolBar } from '../../pageobjects/ide/RightToolBar';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../driver/CheReporter';
 
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
@@ -76,6 +77,7 @@ suite('Validation of workspace start', async () => {
 
     test('Register running workspace', async () => {
         WorkspaceHandlingTests.setWorkspaceName(workspaceName);
+        CheReporter.registerRunningWorkspace(workspaceName);
     });
 
     test('Wait for workspace readiness', async () => {

package/tests/load_test/LoadTest.spec.ts

@@ -42,5 +42,3 @@ suite('Load test suite', async () => {
     });
 
 });
-
-

package/tests/plugins/VscodeXmlPlugin.spec.ts

@@ -14,11 +14,8 @@ import { CLASSES } from '../../inversify.types';
 import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
 import { Editor } from '../../pageobjects/ide/Editor';
 import { TestConstants } from '../../TestConstants';
-import { Logger } from '../../utils/Logger';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
-import { PreferencesHandler } from '../../utils/PreferencesHandler';
 import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
 
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
@@ -26,15 +23,12 @@ const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
 const editor: Editor = e2eContainer.get(CLASSES.Editor);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
-
-const devfileUrl: string = 'https://github.com/che-samples/web-nodejs-sample/tree/xml-plugin';
+const devfileUrl: string = TestConstants.TS_TEST_WORKSPACE_DEVFILE_REPO || 'https://github.com/che-samples/web-nodejs-sample/tree/xml-plugin';
 const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;
 const projectName: string = 'web-nodejs-sample';
 const pathToFile: string = `${projectName}`;
 const xmlFileName: string = 'hello.xml';
 const subRootFolder: string = 'app';
-let workspaceName: string = 'xml-plugin';
 
 suite('The "VscodeXmlPlugin" userstory', async () => {
     suite('Create workspace', async () => {
@@ -45,10 +39,6 @@ suite('The "VscodeXmlPlugin" userstory', async () => {
         workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
 
         projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
-
-        test('Set confirmExit preference to never', async () => {
-            await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
-        });
     });
 
     suite('Check the "vscode-xml" plugin', async () => {
@@ -98,14 +88,10 @@ suite('The "VscodeXmlPlugin" userstory', async () => {
 
     });
 
-    suite('Delete workspace', async () => {
+    suite ('Stopping and deleting the workspace', async () => {
         test('Stop and remove workspace', async () => {
-            if (TestConstants.TS_DELETE_PLUGINS_TEST_WORKSPACE === 'true') {
-                await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
-                return;
-            }
-
-            Logger.info(`As far as the "TS_DELETE_PLUGINS_TEST_WORKSPACE" value is "false the workspace deletion is skipped"`);
+            await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
         });
     });
+
 });

package/tests/plugins/VscodeYamlPlugin.spec.ts

@@ -14,7 +14,6 @@ import { CLASSES } from '../../inversify.types';
 import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
 import { Editor } from '../../pageobjects/ide/Editor';
 import { TestConstants } from '../../TestConstants';
-import { Logger } from '../../utils/Logger';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { PreferencesHandler } from '../../utils/PreferencesHandler';
@@ -27,7 +26,7 @@ const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUti
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
 
-const devfileUrl: string = 'https://github.com/che-samples/web-nodejs-sample/tree/yaml-plugin';
+const devfileUrl: string = TestConstants.TS_TEST_WORKSPACE_DEVFILE_REPO || 'https://github.com/che-samples/web-nodejs-sample/tree/yaml-plugin';
 const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;
 const projectName: string = 'web-nodejs-sample';
 const subRootFolder: string = 'app';
@@ -44,10 +43,6 @@ suite('The "VscodeYamlPlugin" userstory', async () => {
         workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
 
         projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
-
-        test('Set confirmExit preference to never', async () => {
-            await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
-        });
     });
 
     suite('Check the "vscode-yaml" plugin', async () => {
@@ -91,14 +86,10 @@ suite('The "VscodeYamlPlugin" userstory', async () => {
 
     });
 
-    suite('Delete workspace', async () => {
+    suite ('Stopping and deleting the workspace', async () => {
         test('Stop and remove workspace', async () => {
-            if (TestConstants.TS_DELETE_PLUGINS_TEST_WORKSPACE === 'true') {
-                await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
-                return;
-            }
-
-            Logger.info(`As far as the "TS_DELETE_PLUGINS_TEST_WORKSPACE" value is "false the workspace deletion is skipped"`);
+            await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
         });
     });
+
 });

package/testsLibrary/CodeExecutionTests.ts

@@ -36,9 +36,7 @@ export class CodeExecutionTests {
         @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper,
         @inject(CLASSES.QuickOpenContainer) private readonly quickOpenContainer: QuickOpenContainer,
         @inject(CLASSES.BrowserTabsUtil) private readonly browserTabsUtil: BrowserTabsUtil,
-        @inject(CLASSES.WorkspaceHandlingTests) private readonly workspaceHandlingTests: WorkspaceHandlingTests
-
-     ) {}
+        @inject(CLASSES.WorkspaceHandlingTests) private readonly workspaceHandlingTests: WorkspaceHandlingTests) {}
 
     public runTask(taskName: string, timeout: number) {
         test(`Run command '${taskName}'`, async () => {

package/testsLibrary/WorkspaceHandlingTests.ts

@@ -16,9 +16,10 @@ import { CreateWorkspace } from '../pageobjects/dashboard/CreateWorkspace';
 import { Workspaces } from '../pageobjects/dashboard/Workspaces';
 import { BrowserTabsUtil } from '../utils/BrowserTabsUtil';
 import { Logger } from '../utils/Logger';
-import { TimeoutConstants } from '../TimeoutConstants';
+import { ApiUrlResolver } from '../utils/workspace/ApiUrlResolver';
 import { DriverHelper } from '../utils/DriverHelper';
 import { Ide } from '../pageobjects/ide/Ide';
+import { TimeoutConstants } from '../TimeoutConstants';
 import { By, error } from 'selenium-webdriver';
 
 @injectable()
@@ -50,11 +51,14 @@ export class WorkspaceHandlingTests {
         @inject(CLASSES.Workspaces) private readonly workspaces: Workspaces,
         @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper,
         @inject(CLASSES.BrowserTabsUtil) private readonly browserTabsUtil: BrowserTabsUtil,
-        @inject(CLASSES.Ide) private readonly ide: Ide) {}
+        @inject(CLASSES.Ide) private readonly ide: Ide,
+        @inject(CLASSES.ApiUrlResolver) private readonly apiUrlResolver: ApiUrlResolver) {}
 
     public createAndOpenWorkspace(stack: string) {
         test(`Create and open new workspace, stack:${stack}`, async () => {
             await this.dashboard.waitPage();
+            Logger.debug(`Fetching user kubernetes namespace, storing auth token by getting workspaces API URL.`);
+            await this.apiUrlResolver.getWorkspacesApiUrl();
             await this.dashboard.clickCreateWorkspaceButton();
             await this.createWorkspace.waitPage();
             WorkspaceHandlingTests.parentGUID = await this.browserTabsUtil.getCurrentWindowHandle();
@@ -66,6 +70,8 @@ export class WorkspaceHandlingTests {
     public openExistingWorkspace(workspaceName: string) {
         test('Open and start existing workspace', async () => {
             await this.dashboard.waitPage();
+            Logger.debug(`Fetching user kubernetes namespace, storing auth token by getting workspaces API URL.`);
+            await this.apiUrlResolver.getWorkspacesApiUrl();
             await this.dashboard.clickWorkspacesButton();
             await this.workspaces.waitPage();
             await this.workspaces.clickOpenButton(workspaceName);
@@ -77,7 +83,7 @@ export class WorkspaceHandlingTests {
             try {
                 await this.driverHelper.waitVisibility(WorkspaceHandlingTests.START_WORKSPACE_PAGE_NAME_LOCATOR, TimeoutConstants.TS_WAIT_LOADER_PRESENCE_TIMEOUT);
                 // it takes a while to update the element with the workspace name
-                await this.driverHelper.wait(10_000);
+                await this.driverHelper.wait(TimeoutConstants.TS_IDE_LOAD_TIMEOUT);
                 let startingWorkspaceLineContent = await this.driverHelper.getDriver().findElement(WorkspaceHandlingTests.START_WORKSPACE_PAGE_NAME_LOCATOR).getAttribute('innerHTML');
                 // cutting away leading text
                 WorkspaceHandlingTests.workspaceName = startingWorkspaceLineContent.substring('Starting workspace '.length).trim();
@@ -97,7 +103,7 @@ export class WorkspaceHandlingTests {
                 await this.browserTabsUtil.switchToWindow(tabs[i]);
                 try {
                     await this.ide.waitIde(TimeoutConstants.TS_IDE_LOAD_TIMEOUT);
-                    Logger.info(`WorkspaceHandlingTests.switchBackToIdeTab located and switched to IDE tab`);
+                    Logger.debug(`WorkspaceHandlingTests.switchBackToIdeTab located and switched to IDE tab`);
                     return;
                 } catch (err) {
                     if (err instanceof error.TimeoutError) {

package/utils/requestHandlers/CheApiRequestHandler.ts

@@ -100,7 +100,7 @@ export class CheApiRequestHandler {
     }
 
     async patch(relativeUrl: string, patchParams: object): Promise<AxiosResponse> {
-       return await axios.patch(this.assembleUrl(relativeUrl), patchParams, await this.headerHandler.get());
+        return await axios.patch(this.assembleUrl(relativeUrl), patchParams, await this.headerHandler.get());
     }
 
     private assembleUrl(relativeUrl: string): string {

package/utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.ts

@@ -12,13 +12,28 @@ import { IAuthorizationHeaderHandler } from './IAuthorizationHeaderHandler';
 import { inject, injectable } from 'inversify';
 import { DriverHelper } from '../../DriverHelper';
 import { CLASSES } from '../../../inversify.types';
+import { Logger } from '../../Logger';
 
 @injectable()
 export class CheMultiuserAuthorizationHeaderHandler implements IAuthorizationHeaderHandler {
+    private authorizationToken: string = '';
+
     constructor(@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
 
     async get(): Promise<AxiosRequestConfig> {
-        let token = await this.driverHelper.getDriver().manage().getCookie('_oauth_proxy');
-        return { headers: { 'cookie': `_oauth_proxy=${token.value}` } };
+        try {
+            let token = await this.driverHelper.getDriver().manage().getCookie('_oauth_proxy');
+            if (this.authorizationToken !== token.value) {
+                this.authorizationToken = token.value;
+            }
+        } catch (err) {
+            if (this.authorizationToken.length > 0) {
+                Logger.warn(`Could not obtain _oauth_proxy cookie from chromedriver, browser session may have been killed. Using stored value.`);
+            } else {
+                throw new Error(`Could not obtain _oauth_proxy cookie from chromedriver, browser session may have been killed. No stored token present!`);
+            }
+        }
+
+        return { headers: { 'cookie': `_oauth_proxy=${this.authorizationToken}` } };
     }
 }

package/utils/workspace/ApiUrlResolver.ts

@@ -1,5 +1,3 @@
-import { IApiUrlResolver } from './IApiUrlResolver';
-
 /*********************************************************************
  * Copyright (c) 2019 Red Hat, Inc.
  *
@@ -9,19 +7,44 @@ import { IApiUrlResolver } from './IApiUrlResolver';
  *
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
-import { injectable } from 'inversify';
-
+import { inject, injectable } from 'inversify';
+import { CLASSES } from '../../inversify.types';
+import { Logger } from '../Logger';
+import { CheApiRequestHandler } from '../requestHandlers/CheApiRequestHandler';
 
 @injectable()
-export class ApiUrlResolver implements IApiUrlResolver {
-    private  dashboardApiUrl: string = 'dashboard/api/namespace';
+export class ApiUrlResolver {
+    private static readonly DASHBOARD_API_URL: string = 'dashboard/api/namespace';
+    private static readonly KUBERNETES_API_URL: string = 'api/kubernetes/namespace';
+
+    private userNamespace: string = '';
 
-    public getWorkspaceApiUrl(namespace: string, workspaceName: string) {
-        return `${this.getWorkspacesApiUrl(namespace)}/${workspaceName}`;
+    constructor(@inject(CLASSES.CheApiRequestHandler) private readonly processRequestHandler: CheApiRequestHandler) {}
+
+    public async getWorkspaceApiUrl(workspaceName: string): Promise<string> {
+        return `${await this.getWorkspacesApiUrl()}/${workspaceName}`;
     }
 
-    public getWorkspacesApiUrl(namespace: string) {
-        return `${this.dashboardApiUrl}/${namespace}-che/devworkspaces`;
+    public async getWorkspacesApiUrl(): Promise<string> {
+        const namespace = await this.obtainUserNamespace();
+        return `${ApiUrlResolver.DASHBOARD_API_URL}/${namespace}/devworkspaces`;
     }
-}
 
+    public getKubernetesApiUrl(): string {
+        return ApiUrlResolver.KUBERNETES_API_URL;
+    }
+
+    private async obtainUserNamespace() : Promise<string> {
+        Logger.debug(`ApiUrlResolver.obtainUserNamespace ${this.userNamespace}`);
+        if (this.userNamespace.length === 0) {
+            Logger.trace(`ApiUrlResolver.obtainUserNamespace USER_NAMESPACE.length = 0, calling kubernetes API`);
+            const kubernetesResponse = await this.processRequestHandler.get(ApiUrlResolver.KUBERNETES_API_URL);
+            if (kubernetesResponse.status !== 200) {
+                throw new Error(`Cannot get user namespace from kubernetes API. Code: ${kubernetesResponse.status} Data: ${kubernetesResponse.data}`);
+            }
+            this.userNamespace = kubernetesResponse.data[0].name;
+            Logger.debug(`ApiUrlResolver.obtainUserNamespace kubeapi success: ${this.userNamespace}`);
+        }
+        return this.userNamespace;
+    }
+}