@eclipse-che/che-e2e 7.45.0-dev-564dd1b → 7.45.0-dev-ac76942

package/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.ts

@@ -1,5 +1,5 @@
 // /*********************************************************************
-//  * Copyright (c) 2020 Red Hat, Inc.
+//  * Copyright (c) 2022 Red Hat, Inc.
 //  *
 //  * This program and the accompanying materials are made
 //  * available under the terms of the Eclipse Public License 2.0
@@ -9,30 +9,27 @@
 //  **********************************************************************/
 
 import { e2eContainer } from '../../../inversify.config';
-import { CLASSES, TYPES } from '../../../inversify.types';
+import { CLASSES } from '../../../inversify.types';
 import { TestConstants } from '../../../TestConstants';
 import { ProjectAndFileTests } from '../../../testsLibrary/ProjectAndFileTests';
 import CheReporter from '../../../driver/CheReporter';
 import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
-import { WorkspaceNameHandler } from '../../../utils/WorkspaceNameHandler';
-import { TestWorkspaceUtil } from '../../../utils/workspace/TestWorkspaceUtil';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import { PreferencesHandler } from '../../../utils/PreferencesHandler';
 
+const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
+const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
-const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler);
-const testWorkspaceUtils: TestWorkspaceUtil = e2eContainer.get<TestWorkspaceUtil>(TYPES.WorkspaceUtil);
 
-let workspaceName: string;
+let factoryUrl : string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=https://github.com/che-samples/console-java-simple/tree/java1.11`;
+const workspaceSampleName: string = 'console-java-simple';
+const workspaceRootFolderName: string = 'src';
+const fileFolderPath: string = `${workspaceSampleName}/${workspaceRootFolderName}/main/java/org/eclipse/che/examples`;
+const tabTitle: string = 'HelloWorld.java';
+let workspaceName: string = 'console-java-simple';
 
-// the suite expect user to be logged in
 suite('Workspace creation via factory url', async () => {
-
-    let factoryUrl : string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=https://github.com/che-samples/console-java-simple/tree/java1.11`;
-    const workspaceSampleName: string = 'console-java-simple';
-    const workspaceRootFolderName: string = 'src';
-    const fileFolderPath: string = `${workspaceSampleName}/${workspaceRootFolderName}/main/java/org/eclipse/che/examples`;
-    const tabTitle: string = 'HelloWorld.java';
-
     suite('Open factory URL', async () => {
         test(`Navigating to factory URL`, async () => {
             await browserTabsUtil.navigateTo(factoryUrl);
@@ -40,8 +37,13 @@ suite('Workspace creation via factory url', async () => {
     });
 
     suite('Wait workspace readyness', async () => {
-        projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName, true, true);
+        projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName);
+
+        test('Set confirmExit preference to never', async () => {
+            CheReporter.registerRunningWorkspace(workspaceName);
 
+            await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
+        });
     });
 
     suite('Check imported project', async () => {
@@ -51,10 +53,7 @@ suite('Workspace creation via factory url', async () => {
 
     suite ('Stopping and deleting the workspace', async () => {
         test('Stop and remove workspace', async () => {
-            workspaceName = await workspaceNameHandler.getNameFromUrl();
-            CheReporter.registerRunningWorkspace(workspaceName);
-
-            await testWorkspaceUtils.cleanUpRunningWorkspace(workspaceName);
+            await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
         });
     });
 

package/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts

@@ -43,7 +43,6 @@ const terminal: Terminal = e2eContainer.get(CLASSES.Terminal);
 const warningDialog: DialogWindow = e2eContainer.get(CLASSES.DialogWindow);
 const debugView: DebugView = e2eContainer.get(CLASSES.DebugView);
 const welcomeControllerJavaFileName: string = 'WelcomeController.java';
-const factoryUrl : string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=https://raw.githubusercontent.com/eclipse/che-devfile-registry/master/devfiles/java-maven/devfile.yaml`;
 
 const SpringAppLocators = {
     springTitleLocator: By.xpath('//div[@class=\'container-fluid\']//h2[text()=\'Welcome\']'),
@@ -55,7 +54,7 @@ const SpringAppLocators = {
 
 // this test checks only workspace created from "web-nodejs-sample" https://github.com/devfile/devworkspace-operator/blob/main/samples/flattened_theia-next.yaml.
 suite('Workspace creation via factory url', async () => {
-    // let factoryUrl : string = `${TestConstants.TS_SELENIUM_DEVWORKSPACE_URL}`;
+    let factoryUrl : string = `${TestConstants.TS_SELENIUM_DEVWORKSPACE_URL}`;
 
     const workspaceRootFolderName: string = 'src';
 
@@ -117,7 +116,6 @@ suite('Language server validation', async () => {
         } catch (err) {
             Logger.debug('Workaround for the https://github.com/eclipse/che/issues/18974.');
             await browserTabsUtil.refreshPage();
-            await ide.waitAndSwitchToIdeFrame();
             await ide.waitIde();
             await editor.waitErrorInLine(30, javaFileName, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT * 2);
         }
@@ -131,7 +129,7 @@ suite('Language server validation', async () => {
         await editor.waitSuggestionWithScrolling(javaFileName, 'run(Class<?> primarySource, String... args) : ConfigurableApplicationContext', 120_000);
     });
 
-    test('Codenavigation', async () => {
+    test('CodeNavigation', async () => {
         await editor.moveCursorToLineAndChar(javaFileName, 32, 17);
         await editor.performKeyCombination(javaFileName, Key.chord(Key.CONTROL, Key.F12));
         await editor.waitEditorAvailable(codeNavigationClassName, TimeoutConstants.TS_EDITOR_TAB_INTERACTION_TIMEOUT * 4);

package/tests/plugins/JavaPlugin.spec.ts

@@ -7,14 +7,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
-import { WorkspaceNameHandler } from '../..';
 import 'reflect-metadata';
 import { e2eContainer } from '../../inversify.config';
 import { CLASSES } from '../../inversify.types';
 import { Ide } from '../../pageobjects/ide/Ide';
 import { TimeoutConstants } from '../../TimeoutConstants';
 import { TestConstants } from '../../TestConstants';
-import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
 import { Key } from 'selenium-webdriver';
 import { Editor } from '../../pageobjects/ide/Editor';
 import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
@@ -22,24 +20,24 @@ import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTest
 import { Logger } from '../../utils/Logger';
 import CheReporter from '../../driver/CheReporter';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
+import { PreferencesHandler } from '../../utils/PreferencesHandler';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
-const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
 const editor: Editor = e2eContainer.get(CLASSES.Editor);
-const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler);
+const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
 
-const devfileUrl: string = 'https://raw.githubusercontent.com/eclipse/che/main/tests/e2e/files/devfiles/plugins/Java11PluginTest.yaml';
-const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;
+const devFileUrl: string = 'https://github.com/che-samples/java-guestbook/tree/devfilev2';
+const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devFileUrl}`;
 const codeNavigationClassName: string = 'String.class';
-const sampleName: string = 'console-java-simple';
-const subRootFolder: string = 'src';
+const projectName: string = 'java-guestbook';
+const subRootFolder: string = 'backend';
 
-const fileFolderPath: string = `${sampleName}/src/main/java/org/eclipse/che/examples`;
-const tabTitle: string = 'HelloWorld.java';
-let workspaceName: string;
+const fileFolderPath: string = `${projectName}/backend/src/main/java/cloudcode/guestbook/backend`;
+const tabTitle: string = 'GuestBookEntry.java';
+let workspaceName: string = 'java-guestbook';
 
 suite(`The 'JavaPlugin' test`, async () => {
     suite('Create workspace', async () => {
@@ -47,16 +45,12 @@ suite(`The 'JavaPlugin' test`, async () => {
             await browserTabsUtil.navigateTo(factoryUrl);
         });
 
+        projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
+
         test('Wait until created workspace is started', async () => {
-            await ide.waitAndSwitchToIdeFrame();
-            workspaceName = await workspaceNameHandler.getNameFromUrl();
             CheReporter.registerRunningWorkspace(workspaceName);
 
-            await ide.waitIde(TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
-            await ide.waitNotificationAndClickOnButton('Do you trust the authors of', 'Yes, I trust', 60_000);
-
-            await projectTree.openProjectTreeContainer();
-            await projectTree.waitProjectImported(sampleName, subRootFolder);
+            await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
         });
     });
 
@@ -66,28 +60,28 @@ suite(`The 'JavaPlugin' test`, async () => {
     });
 
     suite('Language server validation', async () => {
-        test('Wait until Java LS is initialised', async () => {
+        test('Wait until Java LS is initialized', async () => {
             await ide.checkLsInitializationStart('Activating');
             await ide.waitStatusBarTextAbsence('Activating', 900_000);
         });
 
         test('Autocomplete', async () => {
-            await editor.moveCursorToLineAndChar(tabTitle, 10, 20);
+            await editor.moveCursorToLineAndChar(tabTitle, 15, 1);
             await editor.pressControlSpaceCombination(tabTitle);
             await editor.waitSuggestionContainer();
-            await editor.waitSuggestion(tabTitle, 'close() : void');
+            await editor.waitSuggestion(tabTitle, 'clone() : Object');
         });
 
         test('Error highlighting', async () => {
             const textForErrorDisplaying: string = '$';
-            await editor.type(tabTitle, textForErrorDisplaying, 10);
-            await editor.waitErrorInLine(10, tabTitle, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT);
+            await editor.type(tabTitle, textForErrorDisplaying, 15);
+            await editor.waitErrorInLine(15, tabTitle, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT);
             await editor.performKeyCombination(tabTitle, Key.chord(Key.BACK_SPACE));
-            await editor.waitErrorInLineDisappearance(10, tabTitle);
+            await editor.waitErrorInLineDisappearance(15, tabTitle);
         });
 
-        test('Codenavigation', async () => {
-            await editor.moveCursorToLineAndChar(tabTitle, 9, 12);
+        test('CodeNavigation', async () => {
+            await editor.moveCursorToLineAndChar(tabTitle, 9, 14);
             await editor.performKeyCombination(tabTitle, Key.chord(Key.CONTROL, Key.F12));
             await editor.waitEditorAvailable(codeNavigationClassName, 60_000);
         });

package/tests/plugins/PythonPlugin.spec.ts

@@ -10,7 +10,6 @@
 import 'reflect-metadata';
 import { e2eContainer } from '../../inversify.config';
 import { CLASSES } from '../../inversify.types';
-import { Ide } from '../../pageobjects/ide/Ide';
 import { TimeoutConstants } from '../../TimeoutConstants';
 import { TestConstants } from '../../TestConstants';
 import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
@@ -20,23 +19,24 @@ import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTest
 import { Logger } from '../../utils/Logger';
 import CheReporter from '../../driver/CheReporter';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
-import { WorkspaceNameHandler } from '../../utils/WorkspaceNameHandler';
+import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
+import { PreferencesHandler } from '../../utils/PreferencesHandler';
 
+const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
-const ide: Ide = e2eContainer.get(CLASSES.Ide);
 const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
 const editor: Editor = e2eContainer.get(CLASSES.Editor);
-const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler);
+const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
 
-const devfileUrl: string = 'https://raw.githubusercontent.com/eclipse/che/main/tests/e2e/files/devfiles/plugins/PythonPluginTest.yaml';
-const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;
-const sampleName: string = 'python-hello-world';
-const subRootFile: string = 'README.md';
+const devFileUrl: string = 'https://github.com/che-samples/python-hello-world/tree/devfilev2';
+const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devFileUrl}`;
+const projectName: string = 'python-hello-world';
+const subRootFolder: string = '.vscode';
 
-const fileFolderPath: string = `${sampleName}`;
+const fileFolderPath: string = `${projectName}`;
 const tabTitle: string = 'hello-world.py';
-let workspaceName: string;
+let workspaceName: string = 'python-hello-world';
 
 suite(`The 'PythonPlugin' test`, async () => {
     suite('Create workspace', async () => {
@@ -44,16 +44,12 @@ suite(`The 'PythonPlugin' test`, async () => {
             await browserTabsUtil.navigateTo(factoryUrl);
         });
 
+        projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
+
         test('Wait until created workspace is started', async () => {
-            await ide.waitAndSwitchToIdeFrame();
-            workspaceName = await workspaceNameHandler.getNameFromUrl();
             CheReporter.registerRunningWorkspace(workspaceName);
 
-            await ide.waitIde(TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
-            await ide.waitNotificationAndClickOnButton('Do you trust the authors of', 'Yes, I trust', 60_000);
-
-            await projectTree.openProjectTreeContainer();
-            await projectTree.waitProjectImported(sampleName, subRootFile);
+            await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
         });
     });
 

package/testsLibrary/CodeExecutionTests.ts

@@ -140,8 +140,7 @@ export class CodeExecutionTests {
                 // https://issues.redhat.com/browse/CRW-2175
                 if (err instanceof error.TimeoutError) {
                     Logger.warn(`CodeExecutionTests.verifyRunningApplication application not located, probably blocked by preloader or content not available. Retrying.`);
-                    await this.driverHelper.getDriver().switchTo().defaultContent();
-                    await this.ide.waitAndSwitchToIdeFrame();
+                    await this.ide.waitIde();
                     await this.previewWidget.refreshPage();
                     await this.previewWidget.waitContentAvailable(locator, applicationCheckTimeout, polling);
                 }

package/testsLibrary/LanguageServerTests.ts

@@ -19,7 +19,6 @@ import { DebugView } from '../pageobjects/ide/DebugView';
 import { Key, error } from 'selenium-webdriver';
 import { Logger } from '../utils/Logger';
 import { BrowserTabsUtil } from '../utils/BrowserTabsUtil';
-import { DriverHelper } from '../utils/DriverHelper';
 
 @injectable()
 export class LanguageServerTests {
@@ -29,8 +28,7 @@ export class LanguageServerTests {
         @inject(CLASSES.Ide) private readonly ide: Ide,
         @inject(CLASSES.TopMenu) private readonly topMenu: TopMenu,
         @inject(CLASSES.DebugView) private readonly debugView: DebugView,
-        @inject(CLASSES.BrowserTabsUtil) private readonly browserTabsUtil: BrowserTabsUtil,
-        @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
+        @inject(CLASSES.BrowserTabsUtil) private readonly browserTabsUtil: BrowserTabsUtil) { }
 
     public errorHighlighting(openedTab: string, textToWrite: string, line: number) {
         test('Error highlighting', async () => {
@@ -164,9 +162,7 @@ export class LanguageServerTests {
             } catch (err) {
                 // debug config is probably missing, refresh IDE and try again https://github.com/eclipse/che/issues/19887
                 await this.browserTabsUtil.refreshPage();
-                await this.driverHelper.wait(TimeoutConstants.TS_IDE_LOAD_TIMEOUT);
-                await this.ide.waitAndSwitchToIdeFrame();
-                await this.driverHelper.wait(TimeoutConstants.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM);
+                await this.ide.waitIde();
                 await this.debugView.clickOnRunDebugButton();
             }
         });
@@ -187,9 +183,7 @@ export class LanguageServerTests {
             } catch (err) {
                 // debug config is probably missing, refresh IDE and try again https://github.com/eclipse/che/issues/19887
                 await this.browserTabsUtil.refreshPage();
-                await this.driverHelper.wait(TimeoutConstants.TS_IDE_LOAD_TIMEOUT);
-                await this.ide.waitAndSwitchToIdeFrame();
-                await this.driverHelper.wait(TimeoutConstants.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM);
+                await this.ide.waitIde();
                 await this.debugView.clickOnDebugConfigurationDropDown();
                 await this.debugView.clickOnDebugConfigurationItem(configurationName);
                 await this.debugView.clickOnRunDebugButton();

package/testsLibrary/ProjectAndFileTests.ts

@@ -48,7 +48,6 @@ export class ProjectAndFileTests {
 
     public waitWorkspaceReadinessNoSubfolder(sampleName : string, checkNotification: boolean = true) {
         test('Wait for workspace readiness', async () => {
-            await this.ide.waitAndSwitchToIdeFrame();
             await this.ide.waitIde(TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
             if (checkNotification) {
                 await this.ide.waitNotificationAndClickOnButton('Do you trust the authors of', 'Yes, I trust', 60_000);