diff --git a/tests/e2e/tests/e2e/GitPublishBranch.spec.ts b/tests/e2e/tests/e2e/GitPublishBranch.spec.ts index 9437ac4014b..75c4399bb57 100644 --- a/tests/e2e/tests/e2e/GitPublishBranch.spec.ts +++ b/tests/e2e/tests/e2e/GitPublishBranch.spec.ts @@ -28,7 +28,7 @@ const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.Work const workspacePrefixUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/dashboard/#/ide/${TestConstants.TS_SELENIUM_USERNAME}/`; const wsNameGitPublishBranch = workspaceNameHandler.generateWorkspaceName('checkGitPublishBranch-', 5); -const changedFile = 'README.md'; +// const changedFile = 'README.md'; const branchName = workspaceNameHandler.generateWorkspaceName('checkGitPublishBranch', 5); const file = `https://github.com/${TestConstants.TS_GITHUB_TEST_REPO}/blob/${branchName}/README.md`; diff --git a/tests/e2e/tests/e2e/GitSelfSignCert.spec.ts b/tests/e2e/tests/e2e/GitSelfSignCert.spec.ts index f9f671a744e..12f19c19193 100644 --- a/tests/e2e/tests/e2e/GitSelfSignCert.spec.ts +++ b/tests/e2e/tests/e2e/GitSelfSignCert.spec.ts @@ -31,8 +31,8 @@ const workspaceName = 'gitSelfSignCert'; suite('Checking git + self sign cert', async () => { const workspacePrefixUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/dashboard/#/ide/${TestConstants.TS_SELENIUM_USERNAME}/`; - const gitProjectUrl = `https://${TestConstants.TS_SELF_HOSTED_GIT_SERVER_URL}/maxura/gitService.git`; - const committedFile = 'README.md'; + // const gitProjectUrl = `https://${TestConstants.TS_SELF_HOSTED_GIT_SERVER_URL}/maxura/gitService.git`; + // const committedFile = 'README.md'; suiteSetup(async function () { const wsConfig = await testWorkspaceUtils.getBaseDevfile(); diff --git a/tests/e2e/tests/e2e/OpenshiftConnector.spec.ts b/tests/e2e/tests/e2e/OpenshiftConnector.spec.ts index 80faf3ebd4d..83fbdea20de 100644 --- a/tests/e2e/tests/e2e/OpenshiftConnector.spec.ts +++ b/tests/e2e/tests/e2e/OpenshiftConnector.spec.ts @@ -8,27 +8,25 @@ * SPDX-License-Identifier: EPL-2.0 **********************************************************************/ -import { Key } from 'selenium-webdriver'; import { e2eContainer } from '../../inversify.config'; import { CLASSES, TYPES } from '../../inversify.types'; import { Dashboard } from '../../pageobjects/dashboard/Dashboard'; import { ICheLoginPage } from '../../pageobjects/login/ICheLoginPage'; import { TestConstants } from '../../TestConstants'; -import { DriverHelper } from '../../utils/DriverHelper'; +// import { DriverHelper } from '../../utils/DriverHelper'; import { PreferencesHandler, TerminalRendererType } from '../../utils/PreferencesHandler'; -import { TimeoutConstants } from '../../TimeoutConstants'; import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil'; import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil'; import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests'; import CheReporter from '../../driver/CheReporter'; -const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper); +// const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper); const loginPage: ICheLoginPage = e2eContainer.get(TYPES.CheLogin); const testWorkspaceUtils: ITestWorkspaceUtil = e2eContainer.get(TYPES.WorkspaceUtil); const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard); const preferencesHalder: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler); -const projectName: string = 'node-js'; -const selectSugestionSuffix: string = '(Press \'Enter\' to confirm your input or \'Escape\' to cancel)'; +// const projectName: string = 'node-js'; +// const selectSugestionSuffix: string = '(Press \'Enter\' to confirm your input or \'Escape\' to cancel)'; const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil); suite('Openshift connector user story', async () => { diff --git a/tests/e2e/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts b/tests/e2e/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts index 35f55ca12a1..9a7156aab70 100644 --- a/tests/e2e/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts +++ b/tests/e2e/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts @@ -11,25 +11,23 @@ import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil'; import { CLASSES } from '../../inversify.types'; import { DriverHelper } from '../../utils/DriverHelper'; import { e2eContainer } from '../../inversify.config'; -import { Key, error, By } from 'selenium-webdriver'; -import { Logger } from '../../utils/Logger'; +import { By } from 'selenium-webdriver'; import { TestConstants } from '../../TestConstants'; import { TimeoutConstants } from '../../TimeoutConstants'; -import * as fs from 'fs'; import axios from 'axios'; import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests'; import CheReporter from '../../driver/CheReporter'; const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil); const projectName: string = 'java-spring-petclinic'; -const workspaceRootFolderName: string = 'src'; -const pathToJavaFolder: string = `${projectName}/${workspaceRootFolderName}/main/java/org/springframework/samples/petclinic`; -const javaFileName: string = 'PetClinicApplication.java'; -const classPathFilename: string = '.classpath'; +// const workspaceRootFolderName: string = 'src'; +// const pathToJavaFolder: string = `${projectName}/${workspaceRootFolderName}/main/java/org/springframework/samples/petclinic`; +// const javaFileName: string = 'PetClinicApplication.java'; +// const classPathFilename: string = '.classpath'; const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper); -const codeNavigationClassName: string = 'SpringApplication.class'; -const globalTaskScope = 'Global'; -const welcomeControllerJavaFileName: string = 'WelcomeController.java'; +// const codeNavigationClassName: string = 'SpringApplication.class'; +// const globalTaskScope = 'Global'; +// const welcomeControllerJavaFileName: string = 'WelcomeController.java'; const SpringAppLocators = { springTitleLocator: By.xpath('//div[@class=\'container-fluid\']//h2[text()=\'Welcome\']'), @@ -43,7 +41,7 @@ const SpringAppLocators = { suite('Workspace creation via factory url', async () => { let factoryUrl : string = `${TestConstants.TS_SELENIUM_DEVWORKSPACE_URL}`; - const workspaceRootFolderName: string = 'src'; + // const workspaceRootFolderName: string = 'src'; suite('Open factory URL', async () => { // this is DevWorkspace test specific - we create the test ws. using factory instead of chectl @@ -125,8 +123,8 @@ suite('Language server validation', async () => { }); suite('Validation of workspace build and run', async () => { - const mavenBuildTaskName: string = 'maven-build'; - const runAppTaskName: string = 'run-with-hsqldb'; + // 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); diff --git a/tests/e2e/tests/e2e_happy_path/HappyPath.spec.ts b/tests/e2e/tests/e2e_happy_path/HappyPath.spec.ts index 7bbc7b7a223..fecef6c2071 100644 --- a/tests/e2e/tests/e2e_happy_path/HappyPath.spec.ts +++ b/tests/e2e/tests/e2e_happy_path/HappyPath.spec.ts @@ -9,45 +9,42 @@ **********************************************************************/ import { e2eContainer } from '../../inversify.config'; -import { DriverHelper } from '../../utils/DriverHelper'; +// import { DriverHelper } from '../../utils/DriverHelper'; import { CLASSES } from '../../inversify.types'; import { TestConstants } from '../../TestConstants'; -import { By, Key, error } from 'selenium-webdriver'; +// import { By } from 'selenium-webdriver'; import { Workspaces } from '../../pageobjects/dashboard/Workspaces'; import { Dashboard } from '../../pageobjects/dashboard/Dashboard'; -import { TimeoutConstants } from '../../TimeoutConstants'; -import { Logger } from '../../utils/Logger'; -import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil'; +// import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil'; import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests'; import CheReporter from '../../driver/CheReporter'; -import * as fs from 'fs'; -const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper); +// const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper); const workspaces: Workspaces = e2eContainer.get(CLASSES.Workspaces); const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard); -const projectName: string = 'petclinic'; -const workspaceRootFolderName: string = 'src'; +// const projectName: string = 'petclinic'; +// const workspaceRootFolderName: string = 'src'; const workspaceName: string = TestConstants.TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME; -const pathToJavaFolder: string = `${projectName}/${workspaceRootFolderName}/main/java/org/springframework/samples/petclinic`; -const pathToChangedJavaFileFolder: string = `${projectName}/${workspaceRootFolderName}/main/java/org/springframework/samples/petclinic/system`; -const classPathFilename: string = '.classpath'; -const javaFileName: string = 'PetClinicApplication.java'; -const weclomeControllerJavaFileName: string = 'WelcomeController.java'; -const changedJavaFileName: string = 'CrashController.java'; -const textForErrorMessageChange: string = 'HHHHHHHHHHHHH'; -const codeNavigationClassName: string = 'SpringApplication.class'; -const pathToYamlFolder: string = projectName; -const yamlFileName: string = 'devfile.yaml'; -const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil); -const globalTaskScope = 'Global'; - -const SpringAppLocators = { +// const pathToJavaFolder: string = `${projectName}/${workspaceRootFolderName}/main/java/org/springframework/samples/petclinic`; +// const pathToChangedJavaFileFolder: string = `${projectName}/${workspaceRootFolderName}/main/java/org/springframework/samples/petclinic/system`; +// const classPathFilename: string = '.classpath'; +// const javaFileName: string = 'PetClinicApplication.java'; +// const weclomeControllerJavaFileName: string = 'WelcomeController.java'; +// const changedJavaFileName: string = 'CrashController.java'; +// const textForErrorMessageChange: string = 'HHHHHHHHHHHHH'; +// const codeNavigationClassName: string = 'SpringApplication.class'; +// const pathToYamlFolder: string = projectName; +// const yamlFileName: string = 'devfile.yaml'; +// const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil); +// const globalTaskScope = 'Global'; + +/*const SpringAppLocators = { springTitleLocator: By.xpath('//div[@class=\'container-fluid\']//h2[text()=\'Welcome\']'), springMenuButtonLocator: By.css('button[data-target=\'#main-navbar\']'), springErrorButtonLocator: By.xpath('//div[@id=\'main-navbar\']//span[text()=\'Error\']'), springHomeButtonLocator: By.className('navbar-brand'), springErrorMessageLocator: By.xpath(`//h2[text()='Something happened...']`) -}; +};*/ suite('Validation of workspace start', async () => { test('Start workspace', async () => { diff --git a/tests/e2e/tests/plugins/GitHubPullRequestPlugin.spec.ts b/tests/e2e/tests/plugins/GitHubPullRequestPlugin.spec.ts index 1f3a84d18ed..e01cdf924d1 100644 --- a/tests/e2e/tests/plugins/GitHubPullRequestPlugin.spec.ts +++ b/tests/e2e/tests/plugins/GitHubPullRequestPlugin.spec.ts @@ -10,32 +10,30 @@ import 'reflect-metadata'; import { e2eContainer } from '../../inversify.config'; import { CLASSES } from '../../inversify.types'; -import { TimeoutConstants } from '../../TimeoutConstants'; import { TestConstants } from '../../TestConstants'; import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests'; import { Logger } from '../../utils/Logger'; import { GitLoginPage } from '../../pageobjects/third-parties/GitLoginPage'; import { GitOauthAppsSettings } from '../../pageobjects/third-parties/GitOauthAppsSettings'; -import { WorkspaceNameHandler } from '../../utils/WorkspaceNameHandler'; +// import { WorkspaceNameHandler } from '../../utils/WorkspaceNameHandler'; import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil'; -import { Key } from 'selenium-webdriver'; const workspaceHandling: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests); const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil); const githubLoginPage: GitLoginPage = e2eContainer.get(CLASSES.GitLoginPage); const gitOauthAppsSettings: GitOauthAppsSettings = e2eContainer.get(CLASSES.GitOauthAppsSettings); -const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler); +// const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler); const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests); const devfileUrl: string = `https://raw.githubusercontent.com/eclipse/che/main/tests/e2e/files/devfiles/plugins/GitHubPullRequestPlugin.yaml`; const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`; -const branchName: string = workspaceNameHandler.generateWorkspaceName('ghPrPlugin-', 10); -const projectName: string = 'Spoon-Knife'; +// const branchName: string = workspaceNameHandler.generateWorkspaceName('ghPrPlugin-', 10); +// const projectName: string = 'Spoon-Knife'; const oAuthAppName: string = 'eclipse-che'; -const changedFile: string = 'README.md'; +// 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(); +// const currentDate: string = Date.now().toString(); suite(`The 'GitHubPullRequestPlugin' test`, async () => { suite('Setup github', async () => { diff --git a/tests/e2e/tests/plugins/InstallPluginUsingUI.spec.ts b/tests/e2e/tests/plugins/InstallPluginUsingUI.spec.ts index 89769f80c1d..2afafa43741 100644 --- a/tests/e2e/tests/plugins/InstallPluginUsingUI.spec.ts +++ b/tests/e2e/tests/plugins/InstallPluginUsingUI.spec.ts @@ -10,7 +10,6 @@ import 'reflect-metadata'; import { e2eContainer } from '../../inversify.config'; import { CLASSES } from '../../inversify.types'; -import { TimeoutConstants } from '../../TimeoutConstants'; import { TestConstants } from '../../TestConstants'; import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil'; import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests'; @@ -23,7 +22,7 @@ const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES. const devfileUrl: string = 'https://raw.githubusercontent.com/eclipse/che/main/tests/e2e/files/devfiles/plugins/InstallPluginUsingUI.yaml'; const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`; -const pluginTitle: string = 'java11'; +// const pluginTitle: string = 'java11'; suite(`The 'InstallPluginUsingUI' test`, async () => { suite('Create workspace', async () => { diff --git a/tests/e2e/tests/plugins/JavaPlugin.spec.ts b/tests/e2e/tests/plugins/JavaPlugin.spec.ts index 78b4aa0e442..ac67a6e4b11 100644 --- a/tests/e2e/tests/plugins/JavaPlugin.spec.ts +++ b/tests/e2e/tests/plugins/JavaPlugin.spec.ts @@ -10,9 +10,7 @@ import 'reflect-metadata'; import { e2eContainer } from '../../inversify.config'; import { CLASSES } from '../../inversify.types'; -import { TimeoutConstants } from '../../TimeoutConstants'; import { TestConstants } from '../../TestConstants'; -import { Key } from 'selenium-webdriver'; import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests'; import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests'; import { Logger } from '../../utils/Logger'; @@ -26,7 +24,7 @@ const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.Preferen 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 codeNavigationClassName: string = 'String.class'; const projectName: string = 'java-guestbook'; const subRootFolder: string = 'backend'; diff --git a/tests/e2e/tests/plugins/PhpPlugin.spec.ts b/tests/e2e/tests/plugins/PhpPlugin.spec.ts index 4e23b6a0585..cb72bdd31f1 100644 --- a/tests/e2e/tests/plugins/PhpPlugin.spec.ts +++ b/tests/e2e/tests/plugins/PhpPlugin.spec.ts @@ -10,9 +10,7 @@ import 'reflect-metadata'; import { e2eContainer } from '../../inversify.config'; import { CLASSES } from '../../inversify.types'; -import { TimeoutConstants } from '../../TimeoutConstants'; import { TestConstants } from '../../TestConstants'; -import { Key } from 'selenium-webdriver'; import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil'; import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests'; import { Logger } from '../../utils/Logger'; @@ -22,11 +20,11 @@ const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUti const devfileUrl: string = 'https://raw.githubusercontent.com/eclipse/che/main/tests/e2e/files/devfiles/plugins/PhpPluginTest.yaml'; const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`; -const projectName: string = 'php-web-simple'; -const subRootFolder: string = 'README.md'; +// const projectName: string = 'php-web-simple'; +// const subRootFolder: string = 'README.md'; -const fileFolderPath: string = `${projectName}`; -const tabTitle: string = 'index.php'; +// const fileFolderPath: string = `${projectName}`; +// const tabTitle: string = 'index.php'; suite(`The 'PhpPlugin' tests`, async () => { suite('Create workspace', async () => { diff --git a/tests/e2e/tests/plugins/PythonPlugin.spec.ts b/tests/e2e/tests/plugins/PythonPlugin.spec.ts index 38477468d26..8361aa5fab5 100644 --- a/tests/e2e/tests/plugins/PythonPlugin.spec.ts +++ b/tests/e2e/tests/plugins/PythonPlugin.spec.ts @@ -10,9 +10,7 @@ import 'reflect-metadata'; import { e2eContainer } from '../../inversify.config'; import { CLASSES } from '../../inversify.types'; -import { TimeoutConstants } from '../../TimeoutConstants'; import { TestConstants } from '../../TestConstants'; -import { Key } from 'selenium-webdriver'; import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests'; import { Logger } from '../../utils/Logger'; import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil'; @@ -29,8 +27,8 @@ const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devFil const projectName: string = 'python-hello-world'; const subRootFolder: string = '.vscode'; -const fileFolderPath: string = `${projectName}`; -const tabTitle: string = 'hello-world.py'; +// const fileFolderPath: string = `${projectName}`; +// const tabTitle: string = 'hello-world.py'; suite(`The 'PythonPlugin' test`, async () => { suite('Create workspace', async () => { diff --git a/tests/e2e/tests/plugins/TypescriptPlugin.spec.ts b/tests/e2e/tests/plugins/TypescriptPlugin.spec.ts index bd82e62e66a..0db7f5ba3cb 100644 --- a/tests/e2e/tests/plugins/TypescriptPlugin.spec.ts +++ b/tests/e2e/tests/plugins/TypescriptPlugin.spec.ts @@ -11,9 +11,8 @@ import 'reflect-metadata'; import { DriverHelper } from '../../utils/DriverHelper'; import { e2eContainer } from '../../inversify.config'; import { CLASSES } from '../../inversify.types'; -import { TimeoutConstants } from '../../TimeoutConstants'; import { TestConstants } from '../../TestConstants'; -import { Key, By } from 'selenium-webdriver'; +import { By } from 'selenium-webdriver'; import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil'; import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests'; import { Logger } from '../../utils/Logger'; @@ -28,14 +27,14 @@ const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.Preferen 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 codeNavigationClassName: string = 'OpenDefinition.ts'; 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'; +// const fileFolderPath: string = `${projectName}`; +// const debugFileFolderPath: string = `${projectName}/app`; +// const debugFile: string = 'app.js'; +// const tabTitle: string = 'typescript-node-debug.ts'; suite(`The 'TypescriptPlugin and Node-debug' tests`, async () => { suite('Create workspace', async () => { diff --git a/tests/e2e/tests/plugins/VscodeKubernetesPlugin.spec.ts b/tests/e2e/tests/plugins/VscodeKubernetesPlugin.spec.ts index 8d16fa3aeb7..99e8db91dba 100644 --- a/tests/e2e/tests/plugins/VscodeKubernetesPlugin.spec.ts +++ b/tests/e2e/tests/plugins/VscodeKubernetesPlugin.spec.ts @@ -10,7 +10,6 @@ import 'reflect-metadata'; import { e2eContainer } from '../../inversify.config'; import { CLASSES } from '../../inversify.types'; -import { TimeoutConstants } from '../../TimeoutConstants'; import { TestConstants } from '../../TestConstants'; import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests'; import { Logger } from '../../utils/Logger'; @@ -21,8 +20,8 @@ const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUti const devfileUrl: string = 'https://raw.githubusercontent.com/eclipse/che/main/tests/e2e/files/devfiles/plugins/VscodeKubernetesPlugin.yaml'; const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`; -const sampleName: string = 'nodejs-web-app'; -const subRootFolder: string = 'app'; +// const sampleName: string = 'nodejs-web-app'; +// const subRootFolder: string = 'app'; suite(`The 'VscodeKubernetesPlugin' test`, async () => { suite('Create workspace', async () => { diff --git a/tests/e2e/tests/plugins/VscodeShellcheckPlugin.spec.ts b/tests/e2e/tests/plugins/VscodeShellcheckPlugin.spec.ts index 04266372144..ddb3bc53c75 100644 --- a/tests/e2e/tests/plugins/VscodeShellcheckPlugin.spec.ts +++ b/tests/e2e/tests/plugins/VscodeShellcheckPlugin.spec.ts @@ -10,10 +10,8 @@ import 'reflect-metadata'; import { e2eContainer } from '../../inversify.config'; import { CLASSES } from '../../inversify.types'; -import { TimeoutConstants } from '../../TimeoutConstants'; import { TestConstants } from '../../TestConstants'; import { PreferencesHandler } from '../../utils/PreferencesHandler'; -import { Key } from 'selenium-webdriver'; import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests'; import { Logger } from '../../utils/Logger'; import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil'; @@ -24,10 +22,10 @@ const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.Preferen const devfileUrl: string = 'https://raw.githubusercontent.com/eclipse/che/main/tests/e2e/files/devfiles/plugins/VscodeShellcheckPlugin.yaml'; const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`; -const sampleName: string = 'nodejs-web-app'; -const subRootFolder: string = 'app'; -const pathToFile: string = `${sampleName}`; -const fileName: string = 'test.sh'; +// const sampleName: string = 'nodejs-web-app'; +// const subRootFolder: string = 'app'; +// const pathToFile: string = `${sampleName}`; +// const fileName: string = 'test.sh'; suite(`The 'VscodeShellcheckPlugin' test`, async () => { suite('Create workspace', async () => { diff --git a/tests/e2e/tests/plugins/VscodeValePlugin.spec.ts b/tests/e2e/tests/plugins/VscodeValePlugin.spec.ts index 16489434884..cc461d5316a 100644 --- a/tests/e2e/tests/plugins/VscodeValePlugin.spec.ts +++ b/tests/e2e/tests/plugins/VscodeValePlugin.spec.ts @@ -8,11 +8,9 @@ * SPDX-License-Identifier: EPL-2.0 **********************************************************************/ -import { Key } from 'selenium-webdriver'; import { e2eContainer } from '../../inversify.config'; import { CLASSES } from '../../inversify.types'; import { TestConstants } from '../../TestConstants'; -import { TimeoutConstants } from '../../TimeoutConstants'; import { Logger } from '../../utils/Logger'; import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests'; import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil'; @@ -22,9 +20,9 @@ const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES. const devfileUrl: string = 'https://raw.githubusercontent.com/eclipse/che/main/tests/e2e/files/devfiles/plugins/VscodeValePlugin.yaml'; const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`; -const projectName: string = 'che-docs'; -const pathToFile: string = `${projectName}/modules/administration-guide/partials`; -const docFileName: string = 'assembly_authenticating-users.adoc'; +// const projectName: string = 'che-docs'; +// const pathToFile: string = `${projectName}/modules/administration-guide/partials`; +// const docFileName: string = 'assembly_authenticating-users.adoc'; suite('The "VscodeValePlugin" userstory', async () => { suite('Create workspace', async () => { diff --git a/tests/e2e/tests/plugins/VscodeXmlPlugin.spec.ts b/tests/e2e/tests/plugins/VscodeXmlPlugin.spec.ts index 93d9bf5796d..34f52e5502d 100644 --- a/tests/e2e/tests/plugins/VscodeXmlPlugin.spec.ts +++ b/tests/e2e/tests/plugins/VscodeXmlPlugin.spec.ts @@ -8,7 +8,6 @@ * SPDX-License-Identifier: EPL-2.0 **********************************************************************/ -import { Key } from 'selenium-webdriver'; import { e2eContainer } from '../../inversify.config'; import { CLASSES } from '../../inversify.types'; import { TestConstants } from '../../TestConstants'; @@ -25,8 +24,8 @@ const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.Preferen 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 pathToFile: string = `${projectName}`; +// const xmlFileName: string = 'hello.xml'; const subRootFolder: string = 'app'; suite('The "VscodeXmlPlugin" userstory', async () => { diff --git a/tests/e2e/tests/plugins/VscodeYamlPlugin.spec.ts b/tests/e2e/tests/plugins/VscodeYamlPlugin.spec.ts index 4f3fec78d8f..332e026cdc1 100644 --- a/tests/e2e/tests/plugins/VscodeYamlPlugin.spec.ts +++ b/tests/e2e/tests/plugins/VscodeYamlPlugin.spec.ts @@ -8,7 +8,6 @@ * SPDX-License-Identifier: EPL-2.0 **********************************************************************/ -import { Key } from 'selenium-webdriver'; import { e2eContainer } from '../../inversify.config'; import { CLASSES } from '../../inversify.types'; import { TestConstants } from '../../TestConstants'; @@ -26,8 +25,8 @@ const devfileUrl: string = TestConstants.TS_TEST_WORKSPACE_DEVFILE_REPO || 'http const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`; const projectName: string = 'web-nodejs-sample'; const subRootFolder: string = 'app'; -const pathToFile: string = `${projectName}`; -const yamlFileName: string = 'routes.yaml'; +// const pathToFile: string = `${projectName}`; +// const yamlFileName: string = 'routes.yaml'; const yamlSchema = { 'yaml-schema.json': '*.yaml' }; suite('The "VscodeYamlPlugin" userstory', async () => { diff --git a/tests/e2e/testsLibrary/CodeExecutionTests.ts b/tests/e2e/testsLibrary/CodeExecutionTests.ts index 8c2d057ddf8..2fc8e08f93b 100644 --- a/tests/e2e/testsLibrary/CodeExecutionTests.ts +++ b/tests/e2e/testsLibrary/CodeExecutionTests.ts @@ -12,7 +12,7 @@ import 'reflect-metadata'; import Axios from 'axios'; import { CLASSES } from '../inversify.types'; import { inject, injectable } from 'inversify'; -import { By, error, Key } from 'selenium-webdriver'; +import { By, error } from 'selenium-webdriver'; import { DriverHelper } from '../utils/DriverHelper'; import { Logger } from '../utils/Logger'; import { WorkspaceHandlingTests } from './WorkspaceHandlingTests'; @@ -65,7 +65,7 @@ export class CodeExecutionTests { test(`Run command '${taskName}' expecting dialog shell`, async () => { await this.runTaskUsingQuickOpenContainer(taskName); // await this.dialogWindow.waitDialog(expectedDialogText, timeout); - const dialogRedirectUrl: string = '';// await this.dialogWindow.getApplicationUrlFromDialog(expectedDialogText); + const dialogRedirectUrl: string = ''; // await this.dialogWindow.getApplicationUrlFromDialog(expectedDialogText); const augmentedPreviewUrl: string = dialogRedirectUrl + urlSubPath; // await this.dialogWindow.closeDialog(); // await this.dialogWindow.waitDialogDissappearance(); diff --git a/tests/e2e/testsLibrary/LanguageServerTests.ts b/tests/e2e/testsLibrary/LanguageServerTests.ts index 8733b1d78b7..fedf73ecefb 100644 --- a/tests/e2e/testsLibrary/LanguageServerTests.ts +++ b/tests/e2e/testsLibrary/LanguageServerTests.ts @@ -9,18 +9,16 @@ **********************************************************************/ import 'reflect-metadata'; -import { inject, injectable } from 'inversify'; -import { CLASSES } from '../inversify.types'; +import { injectable } from 'inversify'; +// import { CLASSES } from '../inversify.types'; import { TimeoutConstants } from '../TimeoutConstants'; -import { Key, error } from 'selenium-webdriver'; -import { Logger } from '../utils/Logger'; -import { BrowserTabsUtil } from '../utils/BrowserTabsUtil'; +// import { BrowserTabsUtil } from '../utils/BrowserTabsUtil'; @injectable() export class LanguageServerTests { - constructor( - @inject(CLASSES.BrowserTabsUtil) private readonly browserTabsUtil: BrowserTabsUtil) { } + /*constructor( + @inject(CLASSES.BrowserTabsUtil) private readonly browserTabsUtil: BrowserTabsUtil) { }*/ public errorHighlighting(openedTab: string, textToWrite: string, line: number) { /*test('Error highlighting', async () => { diff --git a/tests/e2e/testsLibrary/ProjectAndFileTests.ts b/tests/e2e/testsLibrary/ProjectAndFileTests.ts index 7f74bb06fa0..57f07f8494e 100644 --- a/tests/e2e/testsLibrary/ProjectAndFileTests.ts +++ b/tests/e2e/testsLibrary/ProjectAndFileTests.ts @@ -11,7 +11,6 @@ import 'reflect-metadata'; import { inject, injectable } from 'inversify'; import { By } from 'selenium-webdriver'; -import { TimeoutConstants } from '../TimeoutConstants'; import { DriverHelper } from '../utils/DriverHelper'; import { CLASSES } from '../inversify.types'; diff --git a/tests/e2e/utils/PreferencesHandler.ts b/tests/e2e/utils/PreferencesHandler.ts index 430a7c28a9b..4dca31d56db 100644 --- a/tests/e2e/utils/PreferencesHandler.ts +++ b/tests/e2e/utils/PreferencesHandler.ts @@ -12,7 +12,6 @@ import { injectable, inject } from 'inversify'; import { Logger } from './Logger'; import { CLASSES } from '../inversify.types'; import { CheApiRequestHandler } from './requestHandlers/CheApiRequestHandler'; -import { Key } from 'selenium-webdriver'; export enum TerminalRendererType { canvas = 'canvas',