@eclipse-che/che-e2e 7.43.0 → 7.44.1-dev-bc873f3

package/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts

@@ -44,7 +44,6 @@ const warningDialog: DialogWindow = e2eContainer.get(CLASSES.DialogWindow);
 const debugView: DebugView = e2eContainer.get(CLASSES.DebugView);
 const welcomeControllerJavaFileName: string = 'WelcomeController.java';
 
-
 const SpringAppLocators = {
     springTitleLocator: By.xpath('//div[@class=\'container-fluid\']//h2[text()=\'Welcome\']'),
     springMenuButtonLocator: By.css('button[data-target=\'#main-navbar\']'),
@@ -56,6 +55,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}`;
+
     const workspaceRootFolderName: string = 'src';
 
     suite('Open factory URL', async () => {
@@ -76,139 +76,138 @@ suite('Workspace creation via factory url', async () => {
             await projectTree.waitProjectImported(projectName, workspaceRootFolderName);
         });
     });
-    });
+});
 
-    suite('Language server validation', async () => {
-        test('Java LS initialization', async () => {
-            await projectTree.expandPathAndOpenFile(pathToJavaFolder, javaFileName);
-            await editor.selectTab(javaFileName);
-            try {
-                await ide.checkLsInitializationStart('Activating Language Support for Java');
-                await ide.waitStatusBarTextAbsence('Activating Language Support for Java', 900_000);
-            } catch (err) {
-                if (!(err instanceof error.TimeoutError)) {
-                    throw err;
-                }
-
-                console.log('Known flakiness has occurred https://github.com/eclipse/che/issues/17864');
-                await ide.waitStatusBarContains('Activating Java Test Runner');
-                await ide.waitStatusBarTextAbsence('Activating Java Test Runner', 900_000);
+suite('Language server validation', async () => {
+    test('Java LS initialization', async () => {
+        await projectTree.expandPathAndOpenFile(pathToJavaFolder, javaFileName);
+        await editor.selectTab(javaFileName);
+        try {
+            await ide.checkLsInitializationStart('Activating Language Support for Java');
+            await ide.waitStatusBarTextAbsence('Activating Language Support for Java', 900_000);
+        } catch (err) {
+            if (!(err instanceof error.TimeoutError)) {
+                throw err;
             }
 
-            await checkJavaPathCompletion();
-        });
+            console.log('Known flakiness has occurred https://github.com/eclipse/che/issues/17864');
+            await ide.waitStatusBarContains('Activating Java Test Runner');
+            await ide.waitStatusBarTextAbsence('Activating Java Test Runner', 900_000);
+        }
 
-        test('Autocomplete', async () => {
-            await editor.moveCursorToLineAndChar(javaFileName, 32, 17);
-            await editor.pressControlSpaceCombination(javaFileName);
-            await editor.waitSuggestionContainer();
-            await editor.waitSuggestion(javaFileName, 'SpringApplication - org.springframework.boot');
-        });
+        await checkJavaPathCompletion();
+    });
 
-        test('Error highlighting', async () => {
-            await driverHelper.getDriver().sleep(TimeoutConstants.TS_SUGGESTION_TIMEOUT);   // workaround https://github.com/eclipse/che/issues/19004
+    test('Autocomplete', async () => {
+        await editor.moveCursorToLineAndChar(javaFileName, 32, 17);
+        await editor.pressControlSpaceCombination(javaFileName);
+        await editor.waitSuggestionContainer();
+        await editor.waitSuggestion(javaFileName, 'SpringApplication - org.springframework.boot');
+    });
 
-            const textForErrorDisplaying: string = '$';
-            await editor.type(javaFileName, textForErrorDisplaying, 30);
+    test('Error highlighting', async () => {
+        await driverHelper.getDriver().sleep(TimeoutConstants.TS_SUGGESTION_TIMEOUT);   // workaround https://github.com/eclipse/che/issues/19004
 
-            try {
-                await editor.waitErrorInLine(30, javaFileName, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT);
-            } 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);
-            }
-            await editor.performKeyCombination(javaFileName, Key.chord(Key.BACK_SPACE));
-            await editor.waitErrorInLineDisappearance(30, javaFileName);
-        });
+        const textForErrorDisplaying: string = '$';
+        await editor.type(javaFileName, textForErrorDisplaying, 30);
 
-        test('Suggestion', async () => {
-            await editor.moveCursorToLineAndChar(javaFileName, 32, 21);
-            await editor.pressControlSpaceCombination(javaFileName);
-            await editor.waitSuggestionWithScrolling(javaFileName, 'run(Class<?> primarySource, String... args) : ConfigurableApplicationContext', 120_000);
-        });
+        try {
+            await editor.waitErrorInLine(30, javaFileName, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT);
+        } catch (err) {
+            Logger.debug('Workaround for the https://github.com/eclipse/che/issues/18974.');
+            await browserTabsUtil.refreshPage();
+            await ide.waitIde();
+            await editor.waitErrorInLine(30, javaFileName, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT * 2);
+        }
+        await editor.performKeyCombination(javaFileName, Key.chord(Key.BACK_SPACE));
+        await editor.waitErrorInLineDisappearance(30, javaFileName);
+    });
 
-        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);
-        });
-});
-    suite('Validation of workspace build and run', async () => {
-        test('Build application', async () => {
-           const taskName: string = 'build';
-           await topMenu.runTask(`${taskName}, ${globalTaskScope}`);
-           await terminal.waitIconSuccess(taskName, 500_000);
-        });
+    test('Suggestion', async () => {
+        await editor.moveCursorToLineAndChar(javaFileName, 32, 21);
+        await editor.pressControlSpaceCombination(javaFileName);
+        await editor.waitSuggestionWithScrolling(javaFileName, 'run(Class<?> primarySource, String... args) : ConfigurableApplicationContext', 120_000);
+    });
 
-        test('Run application', async () => {
-           const taskName: string = 'run-with-hsqldb';
-           await topMenu.runTask(`${taskName}, ${globalTaskScope}`);
-           await ide.waitNotification('Process 8080-tcp is now listening on port 8080. Open it ?', 120_000);
-            // devWs specific. After running test application we can open it just in the new window.
-            // the preview widget is not available yet.
-           await ide.clickOnNotificationButton('Process 8080-tcp is now listening on port 8080. Open it ?', 'Open In New Tab');
-       });
-        // this is DevWorkspace test specific since Theia does not provide yet preview as a widget
-        test('Check the running application', async () => {
-            await switchAppWindowAndCheck(SpringAppLocators.springTitleLocator);
-       });
-
-        test('Close the terminal running tasks', async () => {
-            await terminal.rejectTerminalProcess('run-with-hsqldb');
-            await terminal.closeTerminalTab('run-with-hsqldb');
-            await warningDialog.waitAndCloseIfAppear();
-            await terminal.closeTerminalTab('build');
-       });
+    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);
+    });
 });
 
-    suite('Validation of debug functionality', async () => {
-        let urlToPetClinicApp = '';
-        test('Launch debug', async () => {
-            const taskName: string = 'run-debug';
-            await topMenu.runTask(`${taskName}, ${globalTaskScope}`);
-            await ide.waitNotification('Process 8080-tcp is now listening on port 8080. Open it ?', 180_000);
-            await ide.clickOnNotificationButton('Process 8080-tcp is now listening on port 8080. Open it ?', 'Open In New Tab');
-        });
+suite('Validation of workspace build and run', async () => {
+    const mavenBuildTaskName: string = 'maven-build';
+    const runAppTaskName: string = 'run-with-hsqldb';
+    test('Build application', async () => {
+        await topMenu.runTask(`${mavenBuildTaskName}, ${globalTaskScope}`);
+        await terminal.waitIconSuccess(mavenBuildTaskName, 500_000);
+    });
 
-        test('Check content of the launched application', async () => {
-            const mainWindowHandle: string = await browserTabsUtil.getCurrentWindowHandle();
-            await browserTabsUtil.waitAndSwitchToAnotherWindow(mainWindowHandle, TimeoutConstants.TS_EDITOR_TAB_INTERACTION_TIMEOUT);
-            urlToPetClinicApp = await browserTabsUtil.getCurrentUrl();
-            await browserTabsUtil.switchToWindow(mainWindowHandle);
-        });
+    test('Run application', async () => {
+        await topMenu.runTask(`${runAppTaskName}, ${globalTaskScope}`);
+        await ide.waitNotification('Process 8080-tcp is now listening on port 8080. Open it ?', 120_000);
+        // devWs specific. After running test application we can open it just in the new window.
+        // the preview widget is not available yet.
+        await ide.clickOnNotificationButton('Process 8080-tcp is now listening on port 8080. Open it ?', 'Open In New Tab');
+    });
+    // this is DevWorkspace test specific since Theia does not provide yet preview as a widget
+    test('Check the running application', async () => {
+        await switchAppWindowAndCheck(SpringAppLocators.springTitleLocator);
+    });
 
-        test('Open debug view', async () => {
-            await projectTree.expandPathAndOpenFile(pathToJavaFolder + '/system', welcomeControllerJavaFileName);
-            await editor.selectTab(welcomeControllerJavaFileName);
-            await topMenu.selectOption('View', 'Debug');
-            await ide.waitLeftToolbarButton(LeftToolbarButton.Debug);
-        });
+    test('Close the terminal running tasks', async () => {
+        await terminal.rejectTerminalProcess(runAppTaskName);
+        await terminal.closeTerminalTab(runAppTaskName);
+        await warningDialog.waitAndCloseIfAppear();
+        await terminal.closeTerminalTab(mavenBuildTaskName);
+    });
+});
 
-        test('Choose debug configuration', async () => {
-            await debugView.clickOnDebugConfigurationDropDown();
-            await debugView.clickOnDebugConfigurationItem('Debug (Attach) - Remote (java-spring-petclinic)');
-        });
+suite('Validation of debug functionality', async () => {
+    let urlToPetClinicApp = '';
+    test('Launch debug', async () => {
+        const taskName: string = 'run-debug';
+        await topMenu.runTask(`${taskName}, ${globalTaskScope}`);
+        await ide.waitNotification('Process 8080-tcp is now listening on port 8080. Open it ?', 180_000);
+        await ide.clickOnNotificationButton('Process 8080-tcp is now listening on port 8080. Open it ?', 'Open In New Tab');
+    });
 
-        test('Run debug', async () => {
-            await debugView.clickOnRunDebugButton();
-            await waitDebugToConnect();
-        });
+    test('Check content of the launched application', async () => {
+        const mainWindowHandle: string = await browserTabsUtil.getCurrentWindowHandle();
+        await browserTabsUtil.waitAndSwitchToAnotherWindow(mainWindowHandle, TimeoutConstants.TS_EDITOR_TAB_INTERACTION_TIMEOUT);
+        urlToPetClinicApp = await browserTabsUtil.getCurrentUrl();
+        await browserTabsUtil.switchToWindow(mainWindowHandle);
+    });
 
-        test('Activate breakpoint', async () => {
-            await editor.selectTab(welcomeControllerJavaFileName);
-            await editor.activateBreakpoint(welcomeControllerJavaFileName, 27);
-        });
+    test('Open debug view', async () => {
+        await projectTree.expandPathAndOpenFile(pathToJavaFolder + '/system', welcomeControllerJavaFileName);
+        await editor.selectTab(welcomeControllerJavaFileName);
+        await topMenu.selectOption('View', 'Debug');
+        await ide.waitLeftToolbarButton(LeftToolbarButton.Debug);
+    });
 
-        test('Check debugger stop at the breakpoint', async () => {
-            await sendRequestToDebugApp(urlToPetClinicApp);
-            await waitStoppedBreakpoint(27);
-        });
+    test('Choose debug configuration', async () => {
+        await debugView.clickOnDebugConfigurationDropDown();
+        await debugView.clickOnDebugConfigurationItem('Debug (Attach) - Remote (java-spring-petclinic)');
+    });
+
+    test('Run debug', async () => {
+        await debugView.clickOnRunDebugButton();
+        await waitDebugToConnect();
+    });
 
+    test('Activate breakpoint', async () => {
+        await editor.selectTab(welcomeControllerJavaFileName);
+        await editor.activateBreakpoint(welcomeControllerJavaFileName, 27);
     });
 
+    test('Check debugger stop at the breakpoint', async () => {
+        await sendRequestToDebugApp(urlToPetClinicApp);
+        await waitStoppedBreakpoint(27);
+    });
+});
+
 async function checkJavaPathCompletion() {
     if (await ide.isNotificationPresent('Classpath is incomplete. Only syntax errors will be reported')) {
         const classpathText: string = fs.readFileSync('./files/happy-path/petclinic-classpath.txt', 'utf8');
@@ -268,19 +267,20 @@ async function waitStoppedBreakpoint(lineNumber: number) {
 // for avoiding this problem we send http request with axios and set the request timeout. We expect that request will fail with
 // timeout error, we check it in the catch block and wait breakpoint activating in the WebDriver after this.
 async function sendRequestToDebugApp(urlToApp: string) {
-  const httpClient = axios.create();
-  httpClient.defaults.timeout = 1000;
+    const httpClient = axios.create();
+    httpClient.defaults.timeout = 1000;
     try {
       await httpClient.get(urlToApp);
     } catch (error) {
-      if (error.message === 'timeout of 1000ms exceeded') {
-      console.log('>>>>The debugger is set >>>>>>>>>>>>>>>>>>> ' + error.message);
-      }
-      else {
-          const {data} = await httpClient.get(urlToApp);
-          console.log('>>>>>>>seems the app. is not set under debug properly: >>>>>>>>>>>>>>'+ data)
-      }
-  }
+        if (error instanceof Error) {
+            if (error.message === 'timeout of 1000ms exceeded') {
+                console.log('>>>>The debugger is set >>>>>>>>>>>>>>>>>>> ' + error.message);
+            } else {
+                const {data} = await httpClient.get(urlToApp);
+                console.log('>>>>>>>seems the app. is not set under debug properly: >>>>>>>>>>>>>>' + data);
+            }
+        }
+    }
 }
 
 async function waitDebugToConnect() {
@@ -292,4 +292,3 @@ async function waitDebugToConnect() {
         await debugView.waitForDebuggerToConnect();
     }
 }
-

package/tests/plugins/GitHubPullRequestPlugin.spec.ts

@@ -20,7 +20,6 @@ import { GitHubPullRequestPlugin } from '../../pageobjects/ide/plugins/GitHubPul
 import { GitLoginPage } from '../../pageobjects/third-parties/GitLoginPage';
 import { GitOauthAppsSettings } from '../../pageobjects/third-parties/GitOauthAppsSettings';
 import { WorkspaceNameHandler } from '../../utils/WorkspaceNameHandler';
-import { KeycloackUrlHandler } from '../../utils/KeycloackUrlHandler';
 import { GitPlugin } from '../../pageobjects/ide/plugins/GitPlugin';
 import { TopMenu } from '../../pageobjects/ide/TopMenu';
 import { QuickOpenContainer } from '../../pageobjects/ide/QuickOpenContainer';
@@ -48,6 +47,8 @@ const branchName: string =  workspaceNameHandler.generateWorkspaceName('ghPrPlug
 const projectName: string = 'Spoon-Knife';
 const oAuthAppName: string = 'eclipse-che';
 const changedFile: string = 'README.md';
+// added call back url, but needs to be re-verified
+const identityCallbackUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/api/oauth/callback`;
 const currentDate: string = Date.now().toString();
 let workspaceName: string;
 
@@ -66,7 +67,7 @@ suite(`The 'GitHubPullRequestPlugin' test`, async () => {
             await gitOauthAppsSettings.scrollToUpdateApplicationButton();
 
             await gitOauthAppsSettings.typeHomePageUrl(TestConstants.TS_SELENIUM_BASE_URL);
-            await gitOauthAppsSettings.typeCallbackUrl(KeycloackUrlHandler.getIdentityCallbackUrl());
+            await gitOauthAppsSettings.typeCallbackUrl(identityCallbackUrl);
             await gitOauthAppsSettings.clickUpdateApplicationButton();
         });
     });

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/tests/plugins/TypescriptPlugin.spec.ts

@@ -24,8 +24,10 @@ import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
 import { Logger } from '../../utils/Logger';
 import CheReporter from '../../driver/CheReporter';
-import { WorkspaceNameHandler } from '../../utils/WorkspaceNameHandler';
+import { PreferencesHandler } from '../../utils/PreferencesHandler';
+import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
 
+const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
@@ -35,20 +37,19 @@ const topMenu: TopMenu = e2eContainer.get(CLASSES.TopMenu);
 const debugView: DebugView = e2eContainer.get(CLASSES.DebugView);
 const terminal: Terminal = e2eContainer.get(CLASSES.Terminal);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
-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/TypescriptNodeDebug2PluginTest.yaml';
+const devfileUrl: string = 'https://github.com/che-samples/web-nodejs-sample/tree/typescript-plugin';
 const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;
 const codeNavigationClassName: string = 'OpenDefinition.ts';
-const projectName: string = 'nodejs-web-app';
+const projectName: string = 'web-nodejs-sample';
 const subRootFolder: string = 'app';
 const sampleBodyLocator: By = By.xpath(`//body[text()='Hello World!']`);
-
 const fileFolderPath: string = `${projectName}`;
 const debugFileFolderPath: string = `${projectName}/app`;
 const debugFile: string = 'app.js';
 const tabTitle: string = 'typescript-node-debug.ts';
-let workspaceName: string;
+let workspaceName: string = 'typescript-plugin';
 
 suite(`The 'TypescriptPlugin and Node-debug' tests`, async () => {
     suite('Create workspace', async () => {
@@ -56,16 +57,12 @@ suite(`The 'TypescriptPlugin and Node-debug' tests`, 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(projectName, subRootFolder);
+            await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
         });
     });
 
@@ -106,15 +103,15 @@ suite(`The 'TypescriptPlugin and Node-debug' tests`, async () => {
         let currentWindow: string = '';
         let applicationPreviewWindow: string = '';
 
-        test('Run application in debug mode', async () => {
-            await topMenu.runTask('run the web app (debugging enabled), Global');
-            await ide.waitNotification('Process nodejs is now listening on port 3000.');
-
+        test('Open application in the new editor window', async () => {
             currentWindow = await browserTabsUtil.getCurrentWindowHandle();
-        });
 
-        test('Open application in the new editor window', async () => {
-            await ide.clickOnNotificationButton('Process nodejs is now listening on port 3000.', 'Open In New Tab');
+            await topMenu.runTask('run-the-web-app, Global');
+            await ide.waitNotification('A new process is now listening on port 3000', TimeoutConstants.TS_DEBUGGER_CONNECTION_TIMEOUT);
+            await ide.clickOnNotificationButton('A new process is now listening on port 3000', 'yes');
+
+            await ide.waitNotification('Redirect is now enabled on port 3000.', TimeoutConstants.TS_DEBUGGER_CONNECTION_TIMEOUT);
+            await ide.clickOnNotificationButton('Redirect is now enabled on port 3000.', 'Open In New Tab');
             await browserTabsUtil.waitAndSwitchToAnotherWindow(currentWindow, 60_000);
             await browserTabsUtil.waitContentAvailableInTheNewTab(sampleBodyLocator, 60_000);
 
@@ -123,7 +120,6 @@ suite(`The 'TypescriptPlugin and Node-debug' tests`, async () => {
 
         test('Switch back to the IDE window', async () => {
             await browserTabsUtil.switchToWindow(currentWindow);
-            await ide.waitAndSwitchToIdeFrame(60_000);
         });
 
         test('Activate breakpoint', async () => {
@@ -135,12 +131,8 @@ suite(`The 'TypescriptPlugin and Node-debug' tests`, async () => {
             await topMenu.selectOption('View', 'Debug');
             await ide.waitLeftToolbarButton(LeftToolbarButton.Debug);
 
-            // workaround for the issue: https://github.com/eclipse/che/issues/20067
-            await debugView.clickOnDebugConfigurationDropDown();
-            await debugView.clickOnDebugConfigurationItem('Add Configuration...');
-
             await debugView.clickOnDebugConfigurationDropDown();
-            await debugView.clickOnDebugConfigurationItem('Attach to Remote (nodejs-web-app)');
+            await debugView.clickOnDebugConfigurationItem('Attach (web-nodejs-sample)');
             await debugView.clickOnRunDebugButton();
         });
 
@@ -160,7 +152,6 @@ suite(`The 'TypescriptPlugin and Node-debug' tests`, async () => {
 
         test('Check breakpoint stopped', async () => {
             await browserTabsUtil.switchToWindow(currentWindow);
-            await ide.waitAndSwitchToIdeFrame(60000);
 
             await editor.waitStoppedDebugBreakpoint(debugFile, 19, 60_000);
         });