@eclipse-che/che-e2e 7.46.1-dev-5e33fd3 → 7.48.0-dev-29d4f0d

package/tests/plugins/VscodeXmlPlugin.spec.ts

@@ -10,27 +10,31 @@
 
 import { Key } from 'selenium-webdriver';
 import { e2eContainer } from '../../inversify.config';
-import { Ide } from '../../pageobjects/ide/Ide';
 import { CLASSES } from '../../inversify.types';
 import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
 import { Editor } from '../../pageobjects/ide/Editor';
 import { TestConstants } from '../../TestConstants';
-import { TimeoutConstants } from '../../TimeoutConstants';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
 import { Logger } from '../../utils/Logger';
+import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../driver/CheReporter';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
+import { PreferencesHandler } from '../../utils/PreferencesHandler';
+import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
 
-const ide: Ide = e2eContainer.get(CLASSES.Ide);
+const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
 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://raw.githubusercontent.com/eclipse/che/main/tests/e2e/files/devfiles/plugins/VscodeXmlPlugin.yaml';
+const devfileUrl: string = '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 = 'nodejs-web-app';
+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 () => {
@@ -38,18 +42,12 @@ suite('The "VscodeXmlPlugin" userstory', async () => {
             await browserTabsUtil.navigateTo(factoryUrl);
         });
 
-        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+        projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
 
         test('Wait until created workspace is started', async () => {
-            await ide.waitIde(TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
-            await ide.waitNotificationAndClickOnButton('Do you trust the authors of', 'Yes, I trust', 60_000);
-        });
-    });
+            CheReporter.registerRunningWorkspace(workspaceName);
 
-    suite('Check workspace readiness to work', async () => {
-        test('Wait until project is imported', async () => {
-            await projectTree.openProjectTreeContainer();
-            await projectTree.waitProjectImported(projectName, 'app');
+            await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
         });
     });
 
@@ -103,7 +101,7 @@ suite('The "VscodeXmlPlugin" userstory', async () => {
     suite('Delete workspace', async () => {
         test('Stop and remove workspace', async () => {
             if (TestConstants.TS_DELETE_PLUGINS_TEST_WORKSPACE === 'true') {
-                await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+                await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
                 return;
             }
 

package/tests/plugins/VscodeYamlPlugin.spec.ts

@@ -16,6 +16,7 @@ import { Editor } from '../../pageobjects/ide/Editor';
 import { TestConstants } from '../../TestConstants';
 import { Logger } from '../../utils/Logger';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../driver/CheReporter';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { PreferencesHandler } from '../../utils/PreferencesHandler';
 import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
@@ -35,17 +36,19 @@ const pathToFile: string = `${projectName}`;
 const yamlFileName: string = 'routes.yaml';
 const yamlSchema = { 'yaml-schema.json': '*.yaml' };
 
+let workspaceName: string = 'yaml-plugin';
+
 suite('The "VscodeYamlPlugin" userstory', async () => {
     suite('Create workspace', async () => {
         test('Create workspace using factory', async () => {
             await browserTabsUtil.navigateTo(factoryUrl);
         });
 
-        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
-
         projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
 
-        test('Set confirmExit preference to never', async () => {
+        test('Wait until created workspace is started', async () => {
+            CheReporter.registerRunningWorkspace(workspaceName);
+
             await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
         });
     });
@@ -94,7 +97,7 @@ suite('The "VscodeYamlPlugin" userstory', async () => {
     suite('Delete workspace', async () => {
         test('Stop and remove workspace', async () => {
             if (TestConstants.TS_DELETE_PLUGINS_TEST_WORKSPACE === 'true') {
-                await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+                await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
                 return;
             }
 

package/testsLibrary/CodeExecutionTests.ts

@@ -22,8 +22,6 @@ import { PreviewWidget } from '../pageobjects/ide/PreviewWidget';
 import { RightToolBar } from '../pageobjects/ide/RightToolBar';
 import { Logger } from '../utils/Logger';
 import { QuickOpenContainer } from '../pageobjects/ide/QuickOpenContainer';
-import { WorkspaceHandlingTests } from './WorkspaceHandlingTests';
-import { BrowserTabsUtil } from '../utils/BrowserTabsUtil';
 
 @injectable()
 export class CodeExecutionTests {
@@ -38,9 +36,7 @@ export class CodeExecutionTests {
         @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper,
         @inject(CLASSES.PreviewWidget) private readonly previewWidget: PreviewWidget,
         @inject(CLASSES.RightToolBar) private readonly rightToolBar: RightToolBar,
-        @inject(CLASSES.QuickOpenContainer) private readonly quickOpenContainer: QuickOpenContainer,
-        @inject(CLASSES.BrowserTabsUtil) private readonly browserTabsUtil: BrowserTabsUtil,
-        @inject(CLASSES.WorkspaceHandlingTests) private readonly workspaceHandlingTests: WorkspaceHandlingTests) {}
+        @inject(CLASSES.QuickOpenContainer) private readonly quickOpenContainer: QuickOpenContainer) {}
 
     public runTask(taskName: string, timeout: number) {
         test(`Run command '${taskName}'`, async () => {
@@ -70,7 +66,6 @@ export class CodeExecutionTests {
     public runTaskWithDialogShellAndOpenLink(taskName: string, expectedDialogText: string, timeout: number) {
         test(`Run command '${taskName}' expecting dialog shell`, async () => {
             await this.runTaskUsingQuickOpenContainer(taskName);
-            this.workspaceHandlingTests.setWindowHandle(await this.browserTabsUtil.getCurrentWindowHandle());
             await this.dialogWindow.waitDialogAndOpenLink(expectedDialogText, timeout);
         });
     }
@@ -112,7 +107,6 @@ export class CodeExecutionTests {
         test(`Run command '${taskName}' expecting notification`, async () => {
             await this.runTaskUsingQuickOpenContainer(taskName);
             await this.ide.waitNotification(notificationText, timeout);
-            this.workspaceHandlingTests.setWindowHandle(await this.browserTabsUtil.getCurrentWindowHandle());
             await this.ide.clickOnNotificationButton(notificationText, buttonText);
             CodeExecutionTests.lastApplicationUrl = await this.previewWidget.getUrl();
         });
@@ -122,7 +116,6 @@ export class CodeExecutionTests {
         test(`Run command '${taskName}' expecting notification`, async () => {
             await this.runTaskUsingQuickOpenContainer(taskName);
             await this.ide.waitNotification(notificationText, timeout);
-            this.workspaceHandlingTests.setWindowHandle(await this.browserTabsUtil.getCurrentWindowHandle());
             await this.ide.clickOnNotificationButton(notificationText, 'Open In Preview');
             CodeExecutionTests.lastApplicationUrl = await this.previewWidget.getUrl();
         });
@@ -132,7 +125,6 @@ export class CodeExecutionTests {
         test(`Run command '${taskName}' expecting notification with unexposed port`, async () => {
             await this.runTaskUsingQuickOpenContainer(taskName);
             await this.ide.waitNotificationAndConfirm(notificationText, timeout);
-            this.workspaceHandlingTests.setWindowHandle(await this.browserTabsUtil.getCurrentWindowHandle());
             await this.ide.waitNotificationAndOpenLink(portOpenText, timeout);
             CodeExecutionTests.lastApplicationUrl = await this.previewWidget.getUrl();
         });

package/testsLibrary/WorkspaceHandlingTests.ts

@@ -15,56 +15,39 @@ import { Dashboard } from '../pageobjects/dashboard/Dashboard';
 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 { DriverHelper } from '../utils/DriverHelper';
-import { Ide } from '../pageobjects/ide/Ide';
-import { By, error } from 'selenium-webdriver';
+import { Logger } from '..';
 
 @injectable()
 export class WorkspaceHandlingTests {
 
-    private static START_WORKSPACE_PAGE_NAME_LOCATOR: By = By.xpath(`//div[@class="ui-container"]/div[@class="pf-c-page"]//div[@class="pf-c-content"]/h1`);
     private static workspaceName: string = 'undefined';
-    private static parentGUID: string;
 
     public static getWorkspaceName(): string {
         return WorkspaceHandlingTests.workspaceName;
     }
 
-    public static setWorkspaceName(workspaceName: string) {
-        WorkspaceHandlingTests.workspaceName = workspaceName;
-    }
-
-    public setWindowHandle(guid: string) {
-        WorkspaceHandlingTests.parentGUID = guid;
-    }
-
-    public getWindowHandle(): string {
-        return WorkspaceHandlingTests.parentGUID;
-    }
-
     constructor(
         @inject(CLASSES.Dashboard) private readonly dashboard: Dashboard,
         @inject(CLASSES.CreateWorkspace) private readonly createWorkspace: CreateWorkspace,
         @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.BrowserTabsUtil) private readonly browserTabsUtil: BrowserTabsUtil) {}
 
     public createAndOpenWorkspace(stack: string) {
-        test(`Create and open new workspace, stack:${stack}`, async () => {
+        test(`Open 'New Workspace' page`, async () => {
             await this.dashboard.waitPage();
             await this.dashboard.clickCreateWorkspaceButton();
             await this.createWorkspace.waitPage();
-            WorkspaceHandlingTests.parentGUID = await this.browserTabsUtil.getCurrentWindowHandle();
+            const parentGUID = await this.browserTabsUtil.getCurrentWindowHandle();
             await this.createWorkspace.clickOnSample(stack);
-            await this.browserTabsUtil.waitAndSwitchToAnotherWindow(WorkspaceHandlingTests.parentGUID, TimeoutConstants.TS_IDE_LOAD_TIMEOUT);
+            await this.browserTabsUtil.switchToWindow(parentGUID);
+            WorkspaceHandlingTests.workspaceName = await this.dashboard.getRecentWorkspaceName(10000);
+            Logger.debug(`Workspace Name is: ${WorkspaceHandlingTests.workspaceName}`);
+            await this.browserTabsUtil.waitAndSwitchToAnotherWindow(parentGUID, 10000);
         });
     }
 
     public openExistingWorkspace(workspaceName: string) {
-        test('Open and start existing workspace', async () => {
+        test('Start workspace', async () => {
             await this.dashboard.waitPage();
             await this.dashboard.clickWorkspacesButton();
             await this.workspaces.waitPage();
@@ -72,46 +55,6 @@ export class WorkspaceHandlingTests {
         });
     }
 
-    public obtainWorkspaceNameFromStartingPage() {
-        test('Obtain workspace name from workspace loader page', async() => {
-            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);
-                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();
-                Logger.info(`Obtained workspace name from workspace loader page: ${WorkspaceHandlingTests.workspaceName}`);
-            } catch (err) {
-                Logger.error(`Failed to obtain workspace name from workspace loader page: ${err}`);
-                throw err;
-            }
-        });
-    }
-
-    public switchBackToFirstOpenIdeTabFromLeftToRight() {
-        test('WorkspaceHandlingTests.switchBackToIdeTab', async () => {
-            let tabs = await this.driverHelper.getDriver().getAllWindowHandles();
-            Logger.trace(`WorkspaceHandlingTests.switchBackToIdeTab Found ${tabs.length} window handles, iterating...`);
-            for (let i = 0; i < tabs.length; i++) {
-                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`);
-                    return;
-                } catch (err) {
-                    if (err instanceof error.TimeoutError) {
-                        Logger.warn(`WorkspaceHandlingTests.switchBackToIdeTab Locator timed out, trying with another window handle.`);
-                        continue;
-                    }
-                    Logger.error(`WorkspaceHandlingTests.switchBackToIdeTab Received unexpected exception while trying to locate IDE tab:${err}`);
-                    throw err;
-                }
-            }
-            Logger.error(`WorkspaceHandlingTests.switchBackToIdeTab Failed to locate IDE tab, out of window handles.`);
-        });
-    }
-
     public async stopWorkspace(workspaceName: string) {
         await this.dashboard.openDashboard();
         await this.dashboard.stopWorkspaceByUI(workspaceName);