@eclipse-che/che-e2e 7.122.0-next-4d9831f → 7.123.0-next

package/configs/inversify.config.ts

@@ -63,6 +63,7 @@ import { NotificationHandler } from '../pageobjects/ide/NotificationHandler';
 import { SourceControlView } from '../pageobjects/ide/SourceControlView';
 import { GitHubExtensionDialog } from '../pageobjects/ide/GitHubExtensionDialog';
 import { AiCodeSignInDialog } from '../pageobjects/ide/AiCodeSignInDialog';
+import { RestartWorkspaceDialog } from '../pageobjects/ide/RestartWorkspaceDialog';
 
 const e2eContainer: Container = new Container({ defaultScope: 'Transient', skipBaseClassChecks: true });
 
@@ -111,6 +112,7 @@ e2eContainer.bind<NotificationHandler>(CLASSES.NotificationHandler).to(Notificat
 e2eContainer.bind<SourceControlView>(CLASSES.SourceControlView).to(SourceControlView);
 e2eContainer.bind<GitHubExtensionDialog>(CLASSES.GitHubExtensionDialog).to(GitHubExtensionDialog);
 e2eContainer.bind<AiCodeSignInDialog>(CLASSES.AiCodeSignInDialog).to(AiCodeSignInDialog);
+e2eContainer.bind<RestartWorkspaceDialog>(CLASSES.RestartWorkspaceDialog).to(RestartWorkspaceDialog);
 
 if (BASE_TEST_CONSTANTS.TS_PLATFORM === Platform.OPENSHIFT) {
 	if (OAUTH_CONSTANTS.TS_SELENIUM_VALUE_OPENSHIFT_OAUTH) {

package/configs/inversify.types.ts

@@ -60,7 +60,8 @@ const CLASSES: any = {
 	NotificationHandler: 'NotificationHandler',
 	SourceControlView: 'SourceControlView',
 	GitHubExtensionDialog: 'GitHubExtensionDialog',
-	AiCodeSignInDialog: 'AiCodeSignInDialog'
+	AiCodeSignInDialog: 'AiCodeSignInDialog',
+	RestartWorkspaceDialog: 'RestartWorkspaceDialog'
 };
 
 const EXTERNAL_CLASSES: any = {

package/index.ts

@@ -5,19 +5,19 @@ export * from './configs/mocharc';
 export * from './driver/ChromeDriver';
 export * from './driver/IDriver';
 export * from './utils/BrowserTabsUtil';
-export * from './utils/DevWorkspaceConfigurationHelper';
 export * from './utils/DevfilesHelper';
+export * from './utils/DevWorkspaceConfigurationHelper';
 export * from './utils/DriverHelper';
 export * from './utils/IContextParams';
 export * from './utils/IKubernetesCommandLineToolsExecutor';
 export * from './utils/KubernetesCommandLineToolsExecutor';
 export * from './utils/Logger';
-export * from './utils/ScreenCatcher';
-export * from './utils/ShellExecutor';
-export * from './utils/StringUtil';
 export * from './utils/request-handlers/CheApiRequestHandler';
 export * from './utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler';
 export * from './utils/request-handlers/headers/IAuthorizationHeaderHandler';
+export * from './utils/ScreenCatcher';
+export * from './utils/ShellExecutor';
+export * from './utils/StringUtil';
 export * from './utils/workspace/ApiUrlResolver';
 export * from './utils/workspace/ITestWorkspaceUtil';
 export * from './utils/workspace/TestWorkspaceUtil';
@@ -26,8 +26,8 @@ export * from './pageobjects/dashboard/CreateWorkspace';
 export * from './pageobjects/dashboard/Dashboard';
 export * from './pageobjects/dashboard/TrustAuthorPopup';
 export * from './pageobjects/dashboard/UserPreferences';
-export * from './pageobjects/dashboard/Workspaces';
 export * from './pageobjects/dashboard/workspace-details/WorkspaceDetails';
+export * from './pageobjects/dashboard/Workspaces';
 export * from './pageobjects/git-providers/OauthPage';
 export * from './pageobjects/ide/AiCodeSignInDialog';
 export * from './pageobjects/ide/CheCodeLocatorLoader';
@@ -36,6 +36,7 @@ export * from './pageobjects/ide/ExplorerView';
 export * from './pageobjects/ide/ExtensionsView';
 export * from './pageobjects/ide/GitHubExtensionDialog';
 export * from './pageobjects/ide/NotificationHandler';
+export * from './pageobjects/ide/RestartWorkspaceDialog';
 export * from './pageobjects/ide/RestrictedModeButton';
 export * from './pageobjects/ide/SourceControlView';
 export * from './pageobjects/ide/ViewsMoreActionsButton';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@eclipse-che/che-e2e",
-	"version": "7.122.0-next-4d9831f",
+	"version": "7.123.0-next",
 	"description": "",
 	"main": "dist/index.js",
 	"scripts": {

package/pageobjects/dashboard/workspace-details/WorkspaceDetails.ts

@@ -26,6 +26,10 @@ export class WorkspaceDetails {
 	private static readonly ENABLED_SAVE_BUTTON: By = By.css('button[name="save-button"][aria-disabled="false"]');
 	private static readonly WORKSPACE_DETAILS_LOADER: By = By.css('workspace-details-overview md-progress-linear');
 	private static readonly STORAGE_TYPE_INFO_BUTTON: By = By.css('span[aria-label="More info for storage type"]');
+	private static readonly STORAGE_TYPE_VALUE: By = By.xpath(
+		'//span[@aria-label="More info for storage type"]/ancestor::div[contains(@class, "pf-v6-c-form__group")]' +
+			'//div[contains(@class, "pf-v6-c-form__group-control")]/span'
+	);
 	private static readonly CLOSE_STORAGE_TYPE_INFO_BUTTON: By = By.xpath('//button[@aria-label="Close"]');
 	private static readonly STORAGE_TYPE_DOC_LINK: By = By.xpath('//div/p/a');
 	private static readonly DEVFILE_DOC_LINK: By = By.xpath('//a[text()="Devfile Documentation"]');
@@ -126,6 +130,12 @@ export class WorkspaceDetails {
 		await this.clickOnTab(tabTitle, timeout);
 	}
 
+	async getStorageTypeValue(timeout: number = TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<string> {
+		Logger.debug();
+
+		return await this.driverHelper.waitAndGetText(WorkspaceDetails.STORAGE_TYPE_VALUE, timeout);
+	}
+
 	async clickStorageTypeInfo(): Promise<void> {
 		Logger.debug();
 

package/pageobjects/ide/RestartWorkspaceDialog.ts

@@ -0,0 +1,74 @@
+/** *******************************************************************
+ * copyright (c) 2026 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ **********************************************************************/
+import { inject, injectable } from 'inversify';
+import { CLASSES } from '../../configs/inversify.types';
+import { By, Key, WebElement } from 'selenium-webdriver';
+import { DriverHelper } from '../../utils/DriverHelper';
+import { Logger } from '../../utils/Logger';
+import { TIMEOUT_CONSTANTS } from '../../constants/TIMEOUT_CONSTANTS';
+
+@injectable()
+export class RestartWorkspaceDialog {
+	private static readonly RESTART_BUTTON: By = By.xpath('//div[@class="dialog-buttons"]//a[text()="Restart"]');
+	private static readonly RESTART_WORKSPACE_BUTTON: By = By.xpath('//div[@class="dialog-buttons"]//a[text()="Restart your workspace"]');
+	private static readonly RESTART_WITH_DEFAULT_DEVFILE_BUTTON: By = By.xpath('//span[text()="Restart with default devfile"]');
+	private static readonly ERROR_DIALOG_TEXT: By = By.xpath('//*[@class="dialog-message-text"]');
+	private static readonly ERROR_DIALOG_DETAIL: By = By.xpath('//*[@class="dialog-message-detail"]');
+
+	constructor(
+		@inject(CLASSES.DriverHelper)
+		private readonly driverHelper: DriverHelper
+	) {}
+
+	async restartFromLocalDevfile(projectName: string): Promise<void> {
+		Logger.debug();
+
+		await this.driverHelper.getDriver().actions().keyDown(Key.CONTROL).sendKeys('p').keyUp(Key.CONTROL).perform();
+		await this.driverHelper.wait(TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING);
+
+		await this.driverHelper.getDriver().actions().sendKeys('>Dev Spaces: Restart Workspace from Local Devfile').perform();
+		await this.driverHelper.wait(TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING);
+		await this.driverHelper.getDriver().actions().sendKeys(Key.ENTER).perform();
+		await this.driverHelper.wait(TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING);
+
+		await this.driverHelper.getDriver().actions().sendKeys(`/projects/${projectName}/devfile.yaml`).perform();
+		await this.driverHelper.wait(TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING);
+		await this.driverHelper.getDriver().actions().sendKeys(Key.ENTER).perform();
+		await this.driverHelper.wait(TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING);
+
+		await this.driverHelper.waitAndClick(RestartWorkspaceDialog.RESTART_BUTTON);
+	}
+
+	async confirmRestartWorkspace(timeout: number = TIMEOUT_CONSTANTS.TS_COMMON_PLUGIN_TEST_TIMEOUT): Promise<void> {
+		Logger.debug();
+
+		await this.driverHelper.waitAndClick(RestartWorkspaceDialog.RESTART_WORKSPACE_BUTTON, timeout);
+	}
+
+	async clickRestartWithDefaultDevfile(timeout: number = TIMEOUT_CONSTANTS.TS_SELENIUM_START_WORKSPACE_TIMEOUT): Promise<void> {
+		Logger.debug();
+
+		await this.driverHelper.waitAndClick(RestartWorkspaceDialog.RESTART_WITH_DEFAULT_DEVFILE_BUTTON, timeout);
+	}
+
+	async getErrorDialogText(timeout: number = TIMEOUT_CONSTANTS.TS_COMMON_PLUGIN_TEST_TIMEOUT): Promise<string> {
+		Logger.debug();
+
+		const element: WebElement = await this.driverHelper.waitVisibility(RestartWorkspaceDialog.ERROR_DIALOG_TEXT, timeout);
+		return element.getText();
+	}
+
+	async getErrorDetailText(timeout: number = TIMEOUT_CONSTANTS.TS_COMMON_PLUGIN_TEST_TIMEOUT): Promise<string> {
+		Logger.debug();
+
+		const element: WebElement = await this.driverHelper.waitVisibility(RestartWorkspaceDialog.ERROR_DIALOG_DETAIL, timeout);
+		return element.getText();
+	}
+}

package/specs/restart-tests/RestartFromLocalDevfile.spec.ts

@@ -0,0 +1,351 @@
+/** *******************************************************************
+ * copyright (c) 2026 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ **********************************************************************/
+
+import { ContainerTerminal, KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
+import { expect } from 'chai';
+import { ShellString } from 'shelljs';
+import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
+import { TIMEOUT_CONSTANTS } from '../../constants/TIMEOUT_CONSTANTS';
+import { e2eContainer } from '../../configs/inversify.config';
+import { CLASSES } from '../../configs/inversify.types';
+import { ShellExecutor } from '../../utils/ShellExecutor';
+import { Logger } from '../../utils/Logger';
+import { LoginTests } from '../../tests-library/LoginTests';
+import { WorkspaceHandlingTests } from '../../tests-library/WorkspaceHandlingTests';
+import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
+import { Workspaces } from '../../pageobjects/dashboard/Workspaces';
+import { WorkspaceDetails } from '../../pageobjects/dashboard/workspace-details/WorkspaceDetails';
+import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
+import { DriverHelper } from '../../utils/DriverHelper';
+import { ProjectAndFileTests } from '../../tests-library/ProjectAndFileTests';
+import { RestartWorkspaceDialog } from '../../pageobjects/ide/RestartWorkspaceDialog';
+import { By } from 'selenium-webdriver';
+import { registerRunningWorkspace } from '../MochaHooks';
+
+suite(`Test case with empty workspace (per-user storage) ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void {
+	const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
+	const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
+	const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
+	const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
+	const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
+	const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
+	const containerTerminal: ContainerTerminal = e2eContainer.get(CLASSES.ContainerTerminal);
+	const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = e2eContainer.get(
+		CLASSES.KubernetesCommandLineToolsExecutor
+	);
+	const shellExecutor: ShellExecutor = e2eContainer.get(CLASSES.ShellExecutor);
+	const restartWorkspaceDialog: RestartWorkspaceDialog = e2eContainer.get(CLASSES.RestartWorkspaceDialog);
+	const testFileName: string = 'test-new-file.txt';
+	const testFileContent: string = 'test file content for restart verification';
+	const gitRepository: string = BASE_TEST_CONSTANTS.IS_CLUSTER_DISCONNECTED()
+		? 'https://gh.crw-qe.com/test-automation-only/devfile-with-typo'
+		: 'https://github.com/dmytro-ndp/devfile-with-typo';
+	const projectName: string = 'devfile-with-typo';
+	let currentTabHandle: string = 'undefined';
+	const editorXpath: string = '//*[@id="editor-selector-card-che-incubator/che-code/latest"]';
+	const xPathToWaitFor: string = '//*[@id="workbench.parts.sidebar"]';
+	const cheClusterName: string = 'devspaces';
+	let originalStorageStrategy: string = '';
+
+	suiteSetup('Login into Che and set per-user storage strategy', async function (): Promise<void> {
+		kubernetesCommandLineToolsExecutor.loginToOcp();
+		shellExecutor.executeCommand('oc project openshift-devspaces');
+
+		originalStorageStrategy = shellExecutor
+			.executeCommand(`oc get checluster/${cheClusterName} -o "jsonpath={.spec.devEnvironments.storage.pvcStrategy}"`)
+			.stdout.trim();
+
+		if (originalStorageStrategy !== 'per-user') {
+			const patchResult: ShellString = shellExecutor.executeCommand(
+				`oc patch checluster ${cheClusterName} --type=merge ` +
+					'-p \'{"spec":{"devEnvironments":{"storage":{"pvcStrategy":"per-user"}}}}\''
+			);
+			expect(patchResult.code).to.equal(0, 'Failed to patch CheCluster to set per-user storage strategy');
+		}
+
+		await loginTests.loginIntoChe();
+	});
+
+	function clearCurrentTabHandle(): void {
+		currentTabHandle = 'undefined';
+	}
+
+	test('Create Empty workspace', async function (): Promise<void> {
+		await dashboard.openDashboard();
+		currentTabHandle = await browserTabsUtil.getCurrentWindowHandle();
+		await dashboard.clickCreateWorkspaceButton();
+		await workspaceHandlingTests.createAndOpenWorkspaceWithSpecificEditorAndSample(editorXpath, 'Empty Workspace', xPathToWaitFor);
+		registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+	});
+
+	test('Setup workspace context for API operations', function (): void {
+		kubernetesCommandLineToolsExecutor.workspaceName = WorkspaceHandlingTests.getWorkspaceName();
+		kubernetesCommandLineToolsExecutor.getPodAndContainerNames();
+	});
+
+	test('Clone devfile-with-typo repository', function (): void {
+		const cloneOutput: ShellString = containerTerminal.gitClone(gitRepository);
+		expect(cloneOutput.stdout + cloneOutput.stderr).includes('Cloning');
+	});
+
+	test('Accept the project as a trusted one', async function (): Promise<void> {
+		await projectAndFileTests.performTrustAuthorDialog();
+	});
+
+	test('Verify cloned project exists', function (): void {
+		expect(containerTerminal.ls().stdout).includes(projectName);
+	});
+
+	test('Create new file in project root', function (): void {
+		const output: ShellString = containerTerminal.execInContainerCommand(
+			`echo "${testFileContent}" > /projects/${projectName}/${testFileName}`
+		);
+		expect(output.code).to.equal(0);
+	});
+
+	test('Restart workspace from local devfile with bad image', async function (): Promise<void> {
+		await restartWorkspaceDialog.restartFromLocalDevfile(projectName);
+		Logger.info('Waiting for "Restart Workspace" confirmation popup');
+		await restartWorkspaceDialog.confirmRestartWorkspace();
+	});
+
+	test('Wait for workspace start failure and restart', async function (): Promise<void> {
+		Logger.info('Waiting for workspace to enter Failed phase and restart with default devfile');
+		await restartWorkspaceDialog.clickRestartWithDefaultDevfile();
+		await driverHelper.waitVisibility(By.xpath(xPathToWaitFor), TIMEOUT_CONSTANTS.TS_IDE_START_TIMEOUT);
+	});
+
+	test('Re-initialize workspace context after restart', function (): void {
+		kubernetesCommandLineToolsExecutor.getPodAndContainerNames();
+	});
+
+	test('Verify project exists with cloned files after restart', function (): void {
+		expect(containerTerminal.ls().stdout).includes(projectName);
+		expect(containerTerminal.ls(`/projects/${projectName}`).stdout).includes('devfile.yaml');
+	});
+
+	test('Verify new file is present in project root after restart', function (): void {
+		const output: ShellString = containerTerminal.execInContainerCommand(`cat /projects/${projectName}/${testFileName}`);
+		expect(output.stdout.trim()).to.equal(testFileContent);
+	});
+
+	test('Verify devfile schema validation error on invalid env declaration', async function (): Promise<void> {
+		Logger.info('Appending invalid env declaration to devfile.yaml');
+		const appendOutput: ShellString = containerTerminal.execInContainerCommand(
+			`echo "    env:" >> /projects/${projectName}/devfile.yaml && ` +
+				`echo "      - name: test-env" >> /projects/${projectName}/devfile.yaml && ` +
+				`echo "        value: true" >> /projects/${projectName}/devfile.yaml`
+		);
+		expect(appendOutput.code).to.equal(0, 'Failed to append invalid env content to devfile.yaml');
+
+		Logger.info('Restart from local devfile');
+		await restartWorkspaceDialog.restartFromLocalDevfile(projectName);
+
+		Logger.info('Check error popup');
+		const dialogText: string = await restartWorkspaceDialog.getErrorDialogText();
+		Logger.info(`Error dialog title text: ${dialogText}`);
+
+		const detailText: string = await restartWorkspaceDialog.getErrorDetailText();
+		Logger.info(`Error dialog detail text: ${detailText}`);
+
+		expect(detailText).to.equal(
+			'Devfile schema validation failed. Error: 0: instance.components[0] is not allowed to have the additional property "env"'
+		);
+	});
+
+	suiteTeardown('Delete DevWorkspace', async function (): Promise<void> {
+		Logger.debug('Delete DevWorkspace. After each test.');
+		if (currentTabHandle !== 'undefined') {
+			await browserTabsUtil.switchToWindow(currentTabHandle);
+		}
+
+		await dashboard.openDashboard();
+		await browserTabsUtil.closeAllTabsExceptCurrent();
+
+		if (WorkspaceHandlingTests.getWorkspaceName() !== 'undefined') {
+			Logger.debug('Workspace name is defined. Deleting workspace...');
+			await dashboard.deleteStoppedWorkspaceByUI(WorkspaceHandlingTests.getWorkspaceName());
+		}
+
+		WorkspaceHandlingTests.clearWorkspaceName();
+		clearCurrentTabHandle();
+		registerRunningWorkspace('');
+
+		if (originalStorageStrategy !== '' && originalStorageStrategy !== 'per-user') {
+			const restoreResult: ShellString = shellExecutor.executeCommand(
+				`oc patch checluster ${cheClusterName} --type=merge ` +
+					`-p '{"spec":{"devEnvironments":{"storage":{"pvcStrategy":"${originalStorageStrategy}"}}}}'`
+			);
+			expect(restoreResult.code).to.equal(0, 'Failed to restore CheCluster storage strategy');
+		}
+	});
+});
+
+suite(`Test case with pvc-fail workspace (bad image restart) ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void {
+	const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
+	const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
+	const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
+	const workspaces: Workspaces = e2eContainer.get(CLASSES.Workspaces);
+	const workspaceDetails: WorkspaceDetails = e2eContainer.get(CLASSES.WorkspaceDetails);
+	const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
+	const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
+	const containerTerminal: ContainerTerminal = e2eContainer.get(CLASSES.ContainerTerminal);
+	const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = e2eContainer.get(
+		CLASSES.KubernetesCommandLineToolsExecutor
+	);
+	const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
+	const shellExecutor: ShellExecutor = e2eContainer.get(CLASSES.ShellExecutor);
+	const restartWorkspaceDialog: RestartWorkspaceDialog = e2eContainer.get(CLASSES.RestartWorkspaceDialog);
+	const testFileName: string = 'test-new-file.txt';
+	const testFileContent: string = 'test file content for pvc-fail restart verification';
+	const gitRepository: string = 'https://github.com/cgruver/test-workspace/tree/pvc-fail';
+	const projectName: string = 'test-workspace';
+	let currentTabHandle: string = 'undefined';
+	const xPathToWaitFor: string = '//*[@id="workbench.parts.sidebar"]';
+	const editorXpath: string = '//*[@id="editor-selector-card-che-incubator/che-code/latest"]';
+	const cheClusterName: string = 'devspaces';
+	let originalStorageStrategy: string = '';
+
+	suiteSetup('Skip suite on disconnected clusters', function (): void {
+		if (BASE_TEST_CONSTANTS.IS_CLUSTER_DISCONNECTED()) {
+			Logger.info('Test cluster is disconnected. Skipping pvc-fail workspace suite.');
+			this.skip();
+		}
+	});
+
+	suiteSetup('Login into Che and set per-workspace storage strategy', async function (): Promise<void> {
+		kubernetesCommandLineToolsExecutor.loginToOcp();
+		shellExecutor.executeCommand('oc project openshift-devspaces');
+
+		originalStorageStrategy = shellExecutor
+			.executeCommand(`oc get checluster/${cheClusterName} -o "jsonpath={.spec.devEnvironments.storage.pvcStrategy}"`)
+			.stdout.trim();
+
+		if (originalStorageStrategy !== 'per-workspace') {
+			const patchResult: ShellString = shellExecutor.executeCommand(
+				`oc patch checluster ${cheClusterName} --type=merge ` +
+					'-p \'{"spec":{"devEnvironments":{"storage":{"pvcStrategy":"per-workspace"}}}}\''
+			);
+			expect(patchResult.code).to.equal(0, 'Failed to patch CheCluster to set per-workspace storage strategy');
+		}
+
+		await loginTests.loginIntoChe();
+	});
+
+	function clearCurrentTabHandle(): void {
+		currentTabHandle = 'undefined';
+	}
+
+	test('Create workspace from test-workspace pvc-fail branch', async function (): Promise<void> {
+		await dashboard.openDashboard();
+		currentTabHandle = await browserTabsUtil.getCurrentWindowHandle();
+		await dashboard.clickCreateWorkspaceButton();
+		await workspaceHandlingTests.createAndOpenWorkspaceWithSpecificEditorAndGitUrl(editorXpath, gitRepository, xPathToWaitFor);
+		registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+	});
+
+	test('Accept the project as a trusted one', async function (): Promise<void> {
+		await projectAndFileTests.performTrustAuthorDialog();
+	});
+
+	test('Setup workspace context for API operations', function (): void {
+		kubernetesCommandLineToolsExecutor.workspaceName = WorkspaceHandlingTests.getWorkspaceName();
+		kubernetesCommandLineToolsExecutor.getPodAndContainerNames();
+	});
+
+	test('Create new file in project folder', function (): void {
+		const output: ShellString = containerTerminal.execInContainerCommand(
+			`echo "${testFileContent}" > /projects/${projectName}/${testFileName}`
+		);
+		expect(output.code).to.equal(0);
+	});
+
+	test('Modify devfile to point to bad image location', function (): void {
+		Logger.info('Replacing ":latest" with ":badimage" in devfile.yaml using sed');
+		const output: ShellString = containerTerminal.execInContainerCommand(
+			`sed -i 's/:latest/:badimage/g' /projects/${projectName}/devfile.yaml`
+		);
+		expect(output.code).to.equal(0, 'Failed to replace :latest with :badimage in devfile.yaml');
+
+		const verifyOutput: ShellString = containerTerminal.execInContainerCommand(`cat /projects/${projectName}/devfile.yaml`);
+		expect(verifyOutput.stdout).to.include(':badimage');
+		expect(verifyOutput.stdout).to.not.include(':latest');
+	});
+
+	test('Restart workspace from local devfile with bad image', async function (): Promise<void> {
+		await restartWorkspaceDialog.restartFromLocalDevfile(projectName);
+		Logger.info('Waiting for "Restart Workspace" confirmation popup');
+		await restartWorkspaceDialog.confirmRestartWorkspace();
+	});
+
+	test('Wait for workspace start failure and restart with default devfile', async function (): Promise<void> {
+		Logger.info('Waiting for workspace to enter Failed phase and restart with default devfile');
+		await restartWorkspaceDialog.clickRestartWithDefaultDevfile();
+		await driverHelper.waitVisibility(By.xpath(xPathToWaitFor), TIMEOUT_CONSTANTS.TS_IDE_START_TIMEOUT);
+	});
+
+	test('Re-initialize workspace context after restart', function (): void {
+		kubernetesCommandLineToolsExecutor.getPodAndContainerNames();
+	});
+
+	test('Verify project exists after restart with default devfile', function (): void {
+		expect(containerTerminal.ls().stdout).includes(projectName);
+		expect(containerTerminal.ls(`/projects/${projectName}`).stdout).includes('devfile.yaml');
+	});
+
+	test('Verify new file is present after restart with default devfile', function (): void {
+		const output: ShellString = containerTerminal.execInContainerCommand(`cat /projects/${projectName}/${testFileName}`);
+		expect(output.stdout.trim()).to.equal(testFileContent);
+	});
+
+	test('Verify storage type is per-workspace in workspace details', async function (): Promise<void> {
+		const workspaceName: string = WorkspaceHandlingTests.getWorkspaceName();
+
+		Logger.info('Opening Workspaces page');
+		await dashboard.openDashboard();
+		await dashboard.clickWorkspacesButton();
+		await workspaces.waitPage();
+
+		Logger.info(`Opening workspace details for: ${workspaceName}`);
+		await workspaces.clickWorkspaceListItemLink(workspaceName);
+		await workspaceDetails.waitWorkspaceTitle(workspaceName);
+
+		Logger.info('Verifying storage type is per-workspace on Overview tab');
+		const storageTypeValue: string = await workspaceDetails.getStorageTypeValue();
+		expect(storageTypeValue).to.equal('per-workspace');
+	});
+
+	suiteTeardown('Delete DevWorkspace', async function (): Promise<void> {
+		Logger.debug('Delete DevWorkspace. After each test.');
+		if (currentTabHandle !== 'undefined') {
+			await browserTabsUtil.switchToWindow(currentTabHandle);
+		}
+
+		await dashboard.openDashboard();
+		await browserTabsUtil.closeAllTabsExceptCurrent();
+
+		if (WorkspaceHandlingTests.getWorkspaceName() !== 'undefined') {
+			Logger.debug('Workspace name is defined. Deleting workspace...');
+			await dashboard.deleteStoppedWorkspaceByUI(WorkspaceHandlingTests.getWorkspaceName());
+		}
+
+		WorkspaceHandlingTests.clearWorkspaceName();
+		clearCurrentTabHandle();
+		registerRunningWorkspace('');
+
+		if (originalStorageStrategy !== '' && originalStorageStrategy !== 'per-workspace') {
+			const restoreResult: ShellString = shellExecutor.executeCommand(
+				`oc patch checluster ${cheClusterName} --type=merge ` +
+					`-p '{"spec":{"devEnvironments":{"storage":{"pvcStrategy":"${originalStorageStrategy}"}}}}'`
+			);
+			expect(restoreResult.code).to.equal(0, 'Failed to restore CheCluster storage strategy');
+		}
+	});
+});

package/dist/configs/inversify.config.js

@@ -1,121 +0,0 @@
-"use strict";
-/** *******************************************************************
- * copyright (c) 2019-2023 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- **********************************************************************/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.e2eContainer = void 0;
-require("reflect-metadata");
-const inversify_1 = require("inversify");
-const ChromeDriver_1 = require("../driver/ChromeDriver");
-const inversify_types_1 = require("./inversify.types");
-const TestWorkspaceUtil_1 = require("../utils/workspace/TestWorkspaceUtil");
-const OcpUserLoginPage_1 = require("../pageobjects/login/openshift/OcpUserLoginPage");
-const RegularUserOcpCheLoginPage_1 = require("../pageobjects/login/openshift/RegularUserOcpCheLoginPage");
-const DriverHelper_1 = require("../utils/DriverHelper");
-const Dashboard_1 = require("../pageobjects/dashboard/Dashboard");
-const Workspaces_1 = require("../pageobjects/dashboard/Workspaces");
-const WorkspaceDetails_1 = require("../pageobjects/dashboard/workspace-details/WorkspaceDetails");
-const ScreenCatcher_1 = require("../utils/ScreenCatcher");
-const OcpLoginPage_1 = require("../pageobjects/login/openshift/OcpLoginPage");
-const CheMultiuserAuthorizationHeaderHandler_1 = require("../utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler");
-const CheApiRequestHandler_1 = require("../utils/request-handlers/CheApiRequestHandler");
-const CreateWorkspace_1 = require("../pageobjects/dashboard/CreateWorkspace");
-const BrowserTabsUtil_1 = require("../utils/BrowserTabsUtil");
-const WorkspaceHandlingTests_1 = require("../tests-library/WorkspaceHandlingTests");
-const ApiUrlResolver_1 = require("../utils/workspace/ApiUrlResolver");
-const ProjectAndFileTests_1 = require("../tests-library/ProjectAndFileTests");
-const LoginTests_1 = require("../tests-library/LoginTests");
-const RedHatLoginPage_1 = require("../pageobjects/login/openshift/RedHatLoginPage");
-const OcpRedHatLoginPage_1 = require("../pageobjects/login/openshift/OcpRedHatLoginPage");
-const OcpMainPage_1 = require("../pageobjects/openshift/OcpMainPage");
-const OcpImportFromGitPage_1 = require("../pageobjects/openshift/OcpImportFromGitPage");
-const OcpApplicationPage_1 = require("../pageobjects/openshift/OcpApplicationPage");
-const StringUtil_1 = require("../utils/StringUtil");
-const KubernetesLoginPage_1 = require("../pageobjects/login/kubernetes/KubernetesLoginPage");
-const DexLoginPage_1 = require("../pageobjects/login/kubernetes/DexLoginPage");
-const OAUTH_CONSTANTS_1 = require("../constants/OAUTH_CONSTANTS");
-const BASE_TEST_CONSTANTS_1 = require("../constants/BASE_TEST_CONSTANTS");
-const CheCodeLocatorLoader_1 = require("../pageobjects/ide/CheCodeLocatorLoader");
-const loader_1 = require("monaco-page-objects/out/locators/loader");
-const OauthPage_1 = require("../pageobjects/git-providers/OauthPage");
-const DevfilesHelper_1 = require("../utils/DevfilesHelper");
-const main_1 = require("@eclipse-che/che-devworkspace-generator/lib/main");
-const KubernetesCommandLineToolsExecutor_1 = require("../utils/KubernetesCommandLineToolsExecutor");
-const ShellExecutor_1 = require("../utils/ShellExecutor");
-const UserPreferences_1 = require("../pageobjects/dashboard/UserPreferences");
-const WebTerminalPage_1 = require("../pageobjects/webterminal/WebTerminalPage");
-const TrustAuthorPopup_1 = require("../pageobjects/dashboard/TrustAuthorPopup");
-const ViewsMoreActionsButton_1 = require("../pageobjects/ide/ViewsMoreActionsButton");
-const RestrictedModeButton_1 = require("../pageobjects/ide/RestrictedModeButton");
-const CommandPalette_1 = require("../pageobjects/ide/CommandPalette");
-const ExtensionsView_1 = require("../pageobjects/ide/ExtensionsView");
-const ExplorerView_1 = require("../pageobjects/ide/ExplorerView");
-const NotificationHandler_1 = require("../pageobjects/ide/NotificationHandler");
-const SourceControlView_1 = require("../pageobjects/ide/SourceControlView");
-const GitHubExtensionDialog_1 = require("../pageobjects/ide/GitHubExtensionDialog");
-const AiCodeSignInDialog_1 = require("../pageobjects/ide/AiCodeSignInDialog");
-const e2eContainer = new inversify_1.Container({ defaultScope: 'Transient', skipBaseClassChecks: true });
-exports.e2eContainer = e2eContainer;
-e2eContainer.bind(inversify_types_1.TYPES.Driver).to(ChromeDriver_1.ChromeDriver).inSingletonScope();
-e2eContainer.bind(inversify_types_1.TYPES.WorkspaceUtil).to(TestWorkspaceUtil_1.TestWorkspaceUtil);
-e2eContainer.bind(inversify_types_1.TYPES.OcpLogin).to(OcpUserLoginPage_1.OcpUserLoginPage);
-e2eContainer.bind(inversify_types_1.TYPES.IAuthorizationHeaderHandler).to(CheMultiuserAuthorizationHeaderHandler_1.CheMultiuserAuthorizationHeaderHandler);
-e2eContainer.bind(inversify_types_1.CLASSES.BrowserTabsUtil).to(BrowserTabsUtil_1.BrowserTabsUtil);
-e2eContainer.bind(inversify_types_1.CLASSES.DriverHelper).to(DriverHelper_1.DriverHelper);
-e2eContainer.bind(inversify_types_1.CLASSES.Dashboard).to(Dashboard_1.Dashboard);
-e2eContainer.bind(inversify_types_1.CLASSES.Workspaces).to(Workspaces_1.Workspaces);
-e2eContainer.bind(inversify_types_1.CLASSES.WorkspaceDetails).to(WorkspaceDetails_1.WorkspaceDetails);
-e2eContainer.bind(inversify_types_1.CLASSES.ScreenCatcher).to(ScreenCatcher_1.ScreenCatcher);
-e2eContainer.bind(inversify_types_1.CLASSES.OcpLoginPage).to(OcpLoginPage_1.OcpLoginPage);
-e2eContainer.bind(inversify_types_1.CLASSES.DexLoginPage).to(DexLoginPage_1.DexLoginPage);
-e2eContainer.bind(inversify_types_1.CLASSES.CheCodeLocatorLoader).to(CheCodeLocatorLoader_1.CheCodeLocatorLoader);
-e2eContainer.bind(inversify_types_1.CLASSES.LocatorLoader).to(loader_1.LocatorLoader);
-e2eContainer.bind(inversify_types_1.CLASSES.OauthPage).to(OauthPage_1.OauthPage);
-e2eContainer.bind(inversify_types_1.CLASSES.OcpMainPage).to(OcpMainPage_1.OcpMainPage);
-e2eContainer.bind(inversify_types_1.CLASSES.OcpImportFromGitPage).to(OcpImportFromGitPage_1.OcpImportFromGitPage);
-e2eContainer.bind(inversify_types_1.CLASSES.OcpApplicationPage).to(OcpApplicationPage_1.OcpApplicationPage);
-e2eContainer.bind(inversify_types_1.CLASSES.CheApiRequestHandler).to(CheApiRequestHandler_1.CheApiRequestHandler);
-e2eContainer.bind(inversify_types_1.CLASSES.CreateWorkspace).to(CreateWorkspace_1.CreateWorkspace);
-e2eContainer.bind(inversify_types_1.CLASSES.ProjectAndFileTests).to(ProjectAndFileTests_1.ProjectAndFileTests);
-e2eContainer.bind(inversify_types_1.CLASSES.LoginTests).to(LoginTests_1.LoginTests);
-e2eContainer.bind(inversify_types_1.CLASSES.StringUtil).to(StringUtil_1.StringUtil);
-e2eContainer.bind(inversify_types_1.CLASSES.ApiUrlResolver).to(ApiUrlResolver_1.ApiUrlResolver);
-e2eContainer.bind(inversify_types_1.CLASSES.WorkspaceHandlingTests).to(WorkspaceHandlingTests_1.WorkspaceHandlingTests);
-e2eContainer.bind(inversify_types_1.CLASSES.RedHatLoginPage).to(RedHatLoginPage_1.RedHatLoginPage);
-e2eContainer.bind(inversify_types_1.CLASSES.DevfilesRegistryHelper).to(DevfilesHelper_1.DevfilesHelper);
-e2eContainer.bind(inversify_types_1.CLASSES.KubernetesCommandLineToolsExecutor).to(KubernetesCommandLineToolsExecutor_1.KubernetesCommandLineToolsExecutor);
-e2eContainer.bind(inversify_types_1.CLASSES.ShellExecutor).to(ShellExecutor_1.ShellExecutor);
-e2eContainer.bind(inversify_types_1.CLASSES.ContainerTerminal).to(KubernetesCommandLineToolsExecutor_1.ContainerTerminal);
-e2eContainer.bind(inversify_types_1.CLASSES.WebTerminalPage).to(WebTerminalPage_1.WebTerminalPage);
-e2eContainer.bind(inversify_types_1.CLASSES.UserPreferences).to(UserPreferences_1.UserPreferences);
-e2eContainer.bind(inversify_types_1.EXTERNAL_CLASSES.Generator).to(main_1.Main);
-e2eContainer.bind(inversify_types_1.EXTERNAL_CLASSES.LocatorLoader).to(loader_1.LocatorLoader);
-e2eContainer.bind(inversify_types_1.EXTERNAL_CLASSES.LocatorLoader).to(loader_1.LocatorLoader);
-e2eContainer.bind(inversify_types_1.CLASSES.TrustAuthorPopup).to(TrustAuthorPopup_1.TrustAuthorPopup);
-e2eContainer.bind(inversify_types_1.CLASSES.ViewsMoreActionsButton).to(ViewsMoreActionsButton_1.ViewsMoreActionsButton);
-e2eContainer.bind(inversify_types_1.CLASSES.RestrictedModeButton).to(RestrictedModeButton_1.RestrictedModeButton);
-e2eContainer.bind(inversify_types_1.CLASSES.CommandPalette).to(CommandPalette_1.CommandPalette);
-e2eContainer.bind(inversify_types_1.CLASSES.ExtensionsView).to(ExtensionsView_1.ExtensionsView);
-e2eContainer.bind(inversify_types_1.CLASSES.ExplorerView).to(ExplorerView_1.ExplorerView);
-e2eContainer.bind(inversify_types_1.CLASSES.NotificationHandler).to(NotificationHandler_1.NotificationHandler);
-e2eContainer.bind(inversify_types_1.CLASSES.SourceControlView).to(SourceControlView_1.SourceControlView);
-e2eContainer.bind(inversify_types_1.CLASSES.GitHubExtensionDialog).to(GitHubExtensionDialog_1.GitHubExtensionDialog);
-e2eContainer.bind(inversify_types_1.CLASSES.AiCodeSignInDialog).to(AiCodeSignInDialog_1.AiCodeSignInDialog);
-if (BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_PLATFORM === BASE_TEST_CONSTANTS_1.Platform.OPENSHIFT) {
-    if (OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_VALUE_OPENSHIFT_OAUTH) {
-        e2eContainer.bind(inversify_types_1.TYPES.CheLogin).to(RegularUserOcpCheLoginPage_1.RegularUserOcpCheLoginPage);
-    }
-    else {
-        e2eContainer.bind(inversify_types_1.TYPES.CheLogin).to(OcpRedHatLoginPage_1.OcpRedHatLoginPage);
-    }
-}
-else {
-    e2eContainer.bind(inversify_types_1.TYPES.CheLogin).to(KubernetesLoginPage_1.KubernetesLoginPage);
-}
-//# sourceMappingURL=inversify.config.js.map