@eclipse-che/che-e2e 7.84.0-next-c9a069f → 7.84.0-next-77799bf
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -28,10 +28,12 @@ suite('"Check workspace idle timeout" test', function () {
|
|
|
28
28
|
const kubernetesCommandLineToolsExecutor = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.KubernetesCommandLineToolsExecutor);
|
|
29
29
|
const shellExecutor = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ShellExecutor);
|
|
30
30
|
const testWorkspaceUtil = inversify_config_1.e2eContainer.get(inversify_types_1.TYPES.WorkspaceUtil);
|
|
31
|
-
const browserTabsUtil = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.BrowserTabsUtil);
|
|
32
31
|
const stackName = 'Empty Workspace';
|
|
33
32
|
const cheClusterName = 'devspaces';
|
|
34
33
|
let stopWorkspaceTimeout = 0;
|
|
34
|
+
async function checkDialogButton(buttonName) {
|
|
35
|
+
await driverHelper.waitVisibility(monaco_page_objects_1.By.xpath(`//div[@class='dialog-buttons']//a[text()='${buttonName}']`));
|
|
36
|
+
}
|
|
35
37
|
suiteSetup(function () {
|
|
36
38
|
kubernetesCommandLineToolsExecutor.loginToOcp();
|
|
37
39
|
shellExecutor.executeCommand('oc project openshift-devspaces');
|
|
@@ -56,19 +58,17 @@ suite('"Check workspace idle timeout" test', function () {
|
|
|
56
58
|
await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
|
|
57
59
|
await projectAndFileTests.performTrustAuthorDialog();
|
|
58
60
|
});
|
|
59
|
-
test('Wait idle timeout dialog and
|
|
61
|
+
test('Wait idle timeout dialog and check Dialog buttons', async function () {
|
|
60
62
|
await driverHelper.waitVisibility(webCheCodeLocators.Dialog.details, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
|
|
61
63
|
const dialog = new monaco_page_objects_1.ModalDialog();
|
|
62
64
|
(0, chai_1.expect)(await dialog.getDetails()).includes('Your workspace has stopped due to inactivity.');
|
|
63
|
-
await
|
|
65
|
+
await checkDialogButton('Cancel');
|
|
66
|
+
await checkDialogButton('Return to dashboard');
|
|
67
|
+
await checkDialogButton('Restart your workspace');
|
|
64
68
|
});
|
|
65
69
|
test('Check that the workspace has Stopped state', async function () {
|
|
66
|
-
await dashboard.waitPage();
|
|
67
|
-
await workspaces.waitWorkspaceWithStoppedStatus(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
|
|
68
|
-
});
|
|
69
|
-
suiteTeardown('Open dashboard and close all other tabs', async function () {
|
|
70
70
|
await dashboard.openDashboard();
|
|
71
|
-
await
|
|
71
|
+
await workspaces.waitWorkspaceWithStoppedStatus(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
|
|
72
72
|
});
|
|
73
73
|
suiteTeardown('Stop and delete the workspace by API', async function () {
|
|
74
74
|
await testWorkspaceUtil.deleteWorkspaceByName(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkspaceIdleTimeout.spec.js","sourceRoot":"","sources":["../../../specs/miscellaneous/WorkspaceIdleTimeout.spec.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,qEAA8D;AAC9D,mEAA+D;AAC/D,uFAAoF;AAGpF,8CAAyD;AAGzD,yEAAsE;AAGtE,
|
|
1
|
+
{"version":3,"file":"WorkspaceIdleTimeout.spec.js","sourceRoot":"","sources":["../../../specs/miscellaneous/WorkspaceIdleTimeout.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -18,12 +18,11 @@ import { Workspaces } from '../../pageobjects/dashboard/Workspaces';
|
|
|
18
18
|
import { TIMEOUT_CONSTANTS } from '../../constants/TIMEOUT_CONSTANTS';
|
|
19
19
|
import { DriverHelper } from '../../utils/DriverHelper';
|
|
20
20
|
import { CheCodeLocatorLoader } from '../../pageobjects/ide/CheCodeLocatorLoader';
|
|
21
|
-
import { Locators, ModalDialog } from 'monaco-page-objects';
|
|
21
|
+
import { By, Locators, ModalDialog } from 'monaco-page-objects';
|
|
22
22
|
import { expect } from 'chai';
|
|
23
23
|
import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
|
|
24
24
|
import { ShellExecutor } from '../../utils/ShellExecutor';
|
|
25
25
|
import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
|
|
26
|
-
import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
|
|
27
26
|
|
|
28
27
|
suite('"Check workspace idle timeout" test', function (): void {
|
|
29
28
|
const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
|
|
@@ -39,12 +38,15 @@ suite('"Check workspace idle timeout" test', function (): void {
|
|
|
39
38
|
);
|
|
40
39
|
const shellExecutor: ShellExecutor = e2eContainer.get(CLASSES.ShellExecutor);
|
|
41
40
|
const testWorkspaceUtil: ITestWorkspaceUtil = e2eContainer.get(TYPES.WorkspaceUtil);
|
|
42
|
-
const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
|
|
43
41
|
|
|
44
42
|
const stackName: string = 'Empty Workspace';
|
|
45
43
|
const cheClusterName: string = 'devspaces';
|
|
46
44
|
let stopWorkspaceTimeout: number = 0;
|
|
47
45
|
|
|
46
|
+
async function checkDialogButton(buttonName: string): Promise<void> {
|
|
47
|
+
await driverHelper.waitVisibility(By.xpath(`//div[@class='dialog-buttons']//a[text()='${buttonName}']`));
|
|
48
|
+
}
|
|
49
|
+
|
|
48
50
|
suiteSetup(function (): void {
|
|
49
51
|
kubernetesCommandLineToolsExecutor.loginToOcp();
|
|
50
52
|
shellExecutor.executeCommand('oc project openshift-devspaces');
|
|
@@ -84,21 +86,18 @@ suite('"Check workspace idle timeout" test', function (): void {
|
|
|
84
86
|
await projectAndFileTests.performTrustAuthorDialog();
|
|
85
87
|
});
|
|
86
88
|
|
|
87
|
-
test('Wait idle timeout dialog and
|
|
89
|
+
test('Wait idle timeout dialog and check Dialog buttons', async function (): Promise<void> {
|
|
88
90
|
await driverHelper.waitVisibility(webCheCodeLocators.Dialog.details, TIMEOUT_CONSTANTS.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
|
|
89
91
|
const dialog: ModalDialog = new ModalDialog();
|
|
90
92
|
expect(await dialog.getDetails()).includes('Your workspace has stopped due to inactivity.');
|
|
91
|
-
await
|
|
93
|
+
await checkDialogButton('Cancel');
|
|
94
|
+
await checkDialogButton('Return to dashboard');
|
|
95
|
+
await checkDialogButton('Restart your workspace');
|
|
92
96
|
});
|
|
93
97
|
|
|
94
98
|
test('Check that the workspace has Stopped state', async function (): Promise<void> {
|
|
95
|
-
await dashboard.waitPage();
|
|
96
|
-
await workspaces.waitWorkspaceWithStoppedStatus(WorkspaceHandlingTests.getWorkspaceName());
|
|
97
|
-
});
|
|
98
|
-
|
|
99
|
-
suiteTeardown('Open dashboard and close all other tabs', async function (): Promise<void> {
|
|
100
99
|
await dashboard.openDashboard();
|
|
101
|
-
await
|
|
100
|
+
await workspaces.waitWorkspaceWithStoppedStatus(WorkspaceHandlingTests.getWorkspaceName());
|
|
102
101
|
});
|
|
103
102
|
|
|
104
103
|
suiteTeardown('Stop and delete the workspace by API', async function (): Promise<void> {
|