@eclipse-che/che-e2e 7.46.1-dev-5e33fd3 → 7.48.0-dev-29d4f0d
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.
- package/dist/driver/CheReporter.js +5 -2
- package/dist/driver/CheReporter.js.map +1 -1
- package/dist/pageobjects/ide/ProjectTree.js +6 -12
- package/dist/pageobjects/ide/ProjectTree.js.map +1 -1
- package/dist/tests/devfiles/CSlashCPlusPlus.spec.js +10 -2
- package/dist/tests/devfiles/CSlashCPlusPlus.spec.js.map +1 -1
- package/dist/tests/devfiles/DevfileSmoke.spec.js +10 -2
- package/dist/tests/devfiles/DevfileSmoke.spec.js.map +1 -1
- package/dist/tests/devfiles/DotNetCore.spec.js +10 -2
- package/dist/tests/devfiles/DotNetCore.spec.js.map +1 -1
- package/dist/tests/devfiles/Go.spec.js +10 -2
- package/dist/tests/devfiles/Go.spec.js.map +1 -1
- package/dist/tests/devfiles/JavaMaven.spec.js +10 -2
- package/dist/tests/devfiles/JavaMaven.spec.js.map +1 -1
- package/dist/tests/devfiles/JavaSpringBoot.spec.js +10 -2
- package/dist/tests/devfiles/JavaSpringBoot.spec.js.map +1 -1
- package/dist/tests/devfiles/JavaVertx.spec.js +10 -2
- package/dist/tests/devfiles/JavaVertx.spec.js.map +1 -1
- package/dist/tests/devfiles/NodeJS.spec.js +10 -2
- package/dist/tests/devfiles/NodeJS.spec.js.map +1 -1
- package/dist/tests/devfiles/PHPSimple.spec.js +10 -2
- package/dist/tests/devfiles/PHPSimple.spec.js.map +1 -1
- package/dist/tests/devfiles/Python.spec.js +10 -2
- package/dist/tests/devfiles/Python.spec.js.map +1 -1
- package/dist/tests/devfiles/PythonDjango.spec.js +10 -2
- package/dist/tests/devfiles/PythonDjango.spec.js.map +1 -1
- package/dist/tests/devfiles/Quarkus.spec.js +10 -2
- package/dist/tests/devfiles/Quarkus.spec.js.map +1 -1
- package/dist/tests/devfiles/Scala.spec.js +10 -2
- package/dist/tests/devfiles/Scala.spec.js.map +1 -1
- package/dist/tests/e2e/FactoryUrl.spec.js +9 -4
- package/dist/tests/e2e/FactoryUrl.spec.js.map +1 -1
- package/dist/tests/e2e/GitPublishBranch.spec.js +5 -2
- package/dist/tests/e2e/GitPublishBranch.spec.js.map +1 -1
- package/dist/tests/e2e/GitSelfSignCert.spec.js +0 -2
- package/dist/tests/e2e/GitSelfSignCert.spec.js.map +1 -1
- package/dist/tests/e2e/GitSsh.spec.js +6 -3
- package/dist/tests/e2e/GitSsh.spec.js.map +1 -1
- package/dist/tests/e2e/OpenshiftConnector.spec.js +5 -2
- package/dist/tests/e2e/OpenshiftConnector.spec.js.map +1 -1
- package/dist/tests/e2e/factories/DirectUrlFactoryWithKeepDirectoryTest.spec.js +7 -3
- package/dist/tests/e2e/factories/DirectUrlFactoryWithKeepDirectoryTest.spec.js.map +1 -1
- package/dist/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.js +7 -3
- package/dist/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.js.map +1 -1
- package/dist/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.js +7 -3
- package/dist/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.js.map +1 -1
- package/dist/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.js +2 -2
- package/dist/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.js.map +1 -1
- package/dist/tests/e2e_happy_path/HappyPath.spec.js +13 -13
- package/dist/tests/e2e_happy_path/HappyPath.spec.js.map +1 -1
- package/dist/tests/intelij/IntelijOpenWorkspace.spec.js +6 -2
- package/dist/tests/intelij/IntelijOpenWorkspace.spec.js.map +1 -1
- package/dist/tests/load_test/LoadTest.spec.js +5 -2
- package/dist/tests/load_test/LoadTest.spec.js.map +1 -1
- package/dist/tests/login/LinkCheAndOcpUsers.spec.js +2 -2
- package/dist/tests/login/LinkCheAndOcpUsers.spec.js.map +1 -1
- package/dist/tests/plugins/GitHubPullRequestPlugin.spec.js +9 -4
- package/dist/tests/plugins/GitHubPullRequestPlugin.spec.js.map +1 -1
- package/dist/tests/plugins/InstallPluginUsingUI.spec.js +10 -4
- package/dist/tests/plugins/InstallPluginUsingUI.spec.js.map +1 -1
- package/dist/tests/plugins/JavaPlugin.spec.js +8 -4
- package/dist/tests/plugins/JavaPlugin.spec.js.map +1 -1
- package/dist/tests/plugins/PhpPlugin.spec.js +10 -12
- package/dist/tests/plugins/PhpPlugin.spec.js.map +1 -1
- package/dist/tests/plugins/PythonPlugin.spec.js +8 -4
- package/dist/tests/plugins/PythonPlugin.spec.js.map +1 -1
- package/dist/tests/plugins/TypescriptPlugin.spec.js +8 -4
- package/dist/tests/plugins/TypescriptPlugin.spec.js.map +1 -1
- package/dist/tests/plugins/VscodeKubernetesPlugin.spec.js +10 -3
- package/dist/tests/plugins/VscodeKubernetesPlugin.spec.js.map +1 -1
- package/dist/tests/plugins/VscodeShellcheckPlugin.spec.js +10 -3
- package/dist/tests/plugins/VscodeShellcheckPlugin.spec.js.map +1 -1
- package/dist/tests/plugins/VscodeValePlugin.spec.js +10 -3
- package/dist/tests/plugins/VscodeValePlugin.spec.js.map +1 -1
- package/dist/tests/plugins/VscodeXmlPlugin.spec.js +14 -15
- package/dist/tests/plugins/VscodeXmlPlugin.spec.js.map +1 -1
- package/dist/tests/plugins/VscodeYamlPlugin.spec.js +8 -4
- package/dist/tests/plugins/VscodeYamlPlugin.spec.js.map +1 -1
- package/dist/testsLibrary/CodeExecutionTests.js +2 -14
- package/dist/testsLibrary/CodeExecutionTests.js.map +1 -1
- package/dist/testsLibrary/WorkspaceHandlingTests.js +11 -68
- package/dist/testsLibrary/WorkspaceHandlingTests.js.map +1 -1
- package/driver/CheReporter.ts +8 -2
- package/package.json +2 -2
- package/pageobjects/ide/ProjectTree.ts +8 -13
- package/tests/devfiles/CSlashCPlusPlus.spec.ts +9 -2
- package/tests/devfiles/DevfileSmoke.spec.ts +9 -2
- package/tests/devfiles/DotNetCore.spec.ts +9 -2
- package/tests/devfiles/Go.spec.ts +7 -2
- package/tests/devfiles/JavaMaven.spec.ts +9 -2
- package/tests/devfiles/JavaSpringBoot.spec.ts +9 -2
- package/tests/devfiles/JavaVertx.spec.ts +9 -2
- package/tests/devfiles/NodeJS.spec.ts +9 -2
- package/tests/devfiles/PHPSimple.spec.ts +9 -2
- package/tests/devfiles/Python.spec.ts +9 -2
- package/tests/devfiles/PythonDjango.spec.ts +9 -2
- package/tests/devfiles/Quarkus.spec.ts +9 -2
- package/tests/devfiles/Scala.spec.ts +10 -2
- package/tests/e2e/FactoryUrl.spec.ts +8 -4
- package/tests/e2e/GitPublishBranch.spec.ts +2 -2
- package/tests/e2e/GitSelfSignCert.spec.ts +65 -66
- package/tests/e2e/GitSsh.spec.ts +3 -3
- package/tests/e2e/OpenshiftConnector.spec.ts +2 -2
- package/tests/e2e/factories/DirectUrlFactoryWithKeepDirectoryTest.spec.ts +5 -2
- package/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.ts +5 -2
- package/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.ts +5 -2
- package/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts +2 -2
- package/tests/e2e_happy_path/HappyPath.spec.ts +10 -13
- package/tests/intelij/IntelijOpenWorkspace.spec.ts +4 -2
- package/tests/load_test/LoadTest.spec.ts +2 -2
- package/tests/login/LinkCheAndOcpUsers.spec.ts +3 -4
- package/tests/plugins/GitHubPullRequestPlugin.spec.ts +7 -4
- package/tests/plugins/InstallPluginUsingUI.spec.ts +9 -4
- package/tests/plugins/JavaPlugin.spec.ts +6 -4
- package/tests/plugins/PhpPlugin.spec.ts +9 -3
- package/tests/plugins/PythonPlugin.spec.ts +6 -4
- package/tests/plugins/TypescriptPlugin.spec.ts +6 -4
- package/tests/plugins/VscodeKubernetesPlugin.spec.ts +9 -3
- package/tests/plugins/VscodeShellcheckPlugin.spec.ts +9 -3
- package/tests/plugins/VscodeValePlugin.spec.ts +9 -3
- package/tests/plugins/VscodeXmlPlugin.spec.ts +14 -16
- package/tests/plugins/VscodeYamlPlugin.spec.ts +7 -4
- package/testsLibrary/CodeExecutionTests.ts +1 -9
- package/testsLibrary/WorkspaceHandlingTests.ts +9 -66
|
@@ -8,13 +8,16 @@
|
|
|
8
8
|
*
|
|
9
9
|
* SPDX-License-Identifier: EPL-2.0
|
|
10
10
|
**********************************************************************/
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
13
16
|
const inversify_config_1 = require("../../inversify.config");
|
|
14
17
|
const inversify_types_1 = require("../../inversify.types");
|
|
15
18
|
const TestConstants_1 = require("../../TestConstants");
|
|
16
19
|
const Logger_1 = require("../../utils/Logger");
|
|
17
|
-
const
|
|
20
|
+
const CheReporter_1 = __importDefault(require("../../driver/CheReporter"));
|
|
18
21
|
const projectAndFileTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectAndFileTests);
|
|
19
22
|
const projectTree = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectTree);
|
|
20
23
|
const editor = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.Editor);
|
|
@@ -28,14 +31,15 @@ const subRootFolder = 'app';
|
|
|
28
31
|
const pathToFile = `${projectName}`;
|
|
29
32
|
const yamlFileName = 'routes.yaml';
|
|
30
33
|
const yamlSchema = { 'yaml-schema.json': '*.yaml' };
|
|
34
|
+
let workspaceName = 'yaml-plugin';
|
|
31
35
|
suite('The "VscodeYamlPlugin" userstory', async () => {
|
|
32
36
|
suite('Create workspace', async () => {
|
|
33
37
|
test('Create workspace using factory', async () => {
|
|
34
38
|
await browserTabsUtil.navigateTo(factoryUrl);
|
|
35
39
|
});
|
|
36
|
-
workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
|
|
37
40
|
projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
|
|
38
|
-
test('
|
|
41
|
+
test('Wait until created workspace is started', async () => {
|
|
42
|
+
CheReporter_1.default.registerRunningWorkspace(workspaceName);
|
|
39
43
|
await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
|
|
40
44
|
});
|
|
41
45
|
});
|
|
@@ -73,7 +77,7 @@ suite('The "VscodeYamlPlugin" userstory', async () => {
|
|
|
73
77
|
suite('Delete workspace', async () => {
|
|
74
78
|
test('Stop and remove workspace', async () => {
|
|
75
79
|
if (TestConstants_1.TestConstants.TS_DELETE_PLUGINS_TEST_WORKSPACE === 'true') {
|
|
76
|
-
await workspaceHandlingTests.stopAndRemoveWorkspace(
|
|
80
|
+
await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
|
|
77
81
|
return;
|
|
78
82
|
}
|
|
79
83
|
Logger_1.Logger.info(`As far as the "TS_DELETE_PLUGINS_TEST_WORKSPACE" value is "false the workspace deletion is skipped"`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VscodeYamlPlugin.spec.js","sourceRoot":"","sources":["../../../tests/plugins/VscodeYamlPlugin.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE
|
|
1
|
+
{"version":3,"file":"VscodeYamlPlugin.spec.js","sourceRoot":"","sources":["../../../tests/plugins/VscodeYamlPlugin.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,10 +40,8 @@ const PreviewWidget_1 = require("../pageobjects/ide/PreviewWidget");
|
|
|
40
40
|
const RightToolBar_1 = require("../pageobjects/ide/RightToolBar");
|
|
41
41
|
const Logger_1 = require("../utils/Logger");
|
|
42
42
|
const QuickOpenContainer_1 = require("../pageobjects/ide/QuickOpenContainer");
|
|
43
|
-
const WorkspaceHandlingTests_1 = require("./WorkspaceHandlingTests");
|
|
44
|
-
const BrowserTabsUtil_1 = require("../utils/BrowserTabsUtil");
|
|
45
43
|
let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
|
|
46
|
-
constructor(terminal, topMenu, ide, dialogWindow, driverHelper, previewWidget, rightToolBar, quickOpenContainer
|
|
44
|
+
constructor(terminal, topMenu, ide, dialogWindow, driverHelper, previewWidget, rightToolBar, quickOpenContainer) {
|
|
47
45
|
this.terminal = terminal;
|
|
48
46
|
this.topMenu = topMenu;
|
|
49
47
|
this.ide = ide;
|
|
@@ -52,8 +50,6 @@ let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
|
|
|
52
50
|
this.previewWidget = previewWidget;
|
|
53
51
|
this.rightToolBar = rightToolBar;
|
|
54
52
|
this.quickOpenContainer = quickOpenContainer;
|
|
55
|
-
this.browserTabsUtil = browserTabsUtil;
|
|
56
|
-
this.workspaceHandlingTests = workspaceHandlingTests;
|
|
57
53
|
}
|
|
58
54
|
runTask(taskName, timeout) {
|
|
59
55
|
test(`Run command '${taskName}'`, async () => {
|
|
@@ -80,7 +76,6 @@ let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
|
|
|
80
76
|
runTaskWithDialogShellAndOpenLink(taskName, expectedDialogText, timeout) {
|
|
81
77
|
test(`Run command '${taskName}' expecting dialog shell`, async () => {
|
|
82
78
|
await this.runTaskUsingQuickOpenContainer(taskName);
|
|
83
|
-
this.workspaceHandlingTests.setWindowHandle(await this.browserTabsUtil.getCurrentWindowHandle());
|
|
84
79
|
await this.dialogWindow.waitDialogAndOpenLink(expectedDialogText, timeout);
|
|
85
80
|
});
|
|
86
81
|
}
|
|
@@ -123,7 +118,6 @@ let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
|
|
|
123
118
|
test(`Run command '${taskName}' expecting notification`, async () => {
|
|
124
119
|
await this.runTaskUsingQuickOpenContainer(taskName);
|
|
125
120
|
await this.ide.waitNotification(notificationText, timeout);
|
|
126
|
-
this.workspaceHandlingTests.setWindowHandle(await this.browserTabsUtil.getCurrentWindowHandle());
|
|
127
121
|
await this.ide.clickOnNotificationButton(notificationText, buttonText);
|
|
128
122
|
CodeExecutionTests_1.lastApplicationUrl = await this.previewWidget.getUrl();
|
|
129
123
|
});
|
|
@@ -132,7 +126,6 @@ let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
|
|
|
132
126
|
test(`Run command '${taskName}' expecting notification`, async () => {
|
|
133
127
|
await this.runTaskUsingQuickOpenContainer(taskName);
|
|
134
128
|
await this.ide.waitNotification(notificationText, timeout);
|
|
135
|
-
this.workspaceHandlingTests.setWindowHandle(await this.browserTabsUtil.getCurrentWindowHandle());
|
|
136
129
|
await this.ide.clickOnNotificationButton(notificationText, 'Open In Preview');
|
|
137
130
|
CodeExecutionTests_1.lastApplicationUrl = await this.previewWidget.getUrl();
|
|
138
131
|
});
|
|
@@ -141,7 +134,6 @@ let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
|
|
|
141
134
|
test(`Run command '${taskName}' expecting notification with unexposed port`, async () => {
|
|
142
135
|
await this.runTaskUsingQuickOpenContainer(taskName);
|
|
143
136
|
await this.ide.waitNotificationAndConfirm(notificationText, timeout);
|
|
144
|
-
this.workspaceHandlingTests.setWindowHandle(await this.browserTabsUtil.getCurrentWindowHandle());
|
|
145
137
|
await this.ide.waitNotificationAndOpenLink(portOpenText, timeout);
|
|
146
138
|
CodeExecutionTests_1.lastApplicationUrl = await this.previewWidget.getUrl();
|
|
147
139
|
});
|
|
@@ -216,8 +208,6 @@ CodeExecutionTests = CodeExecutionTests_1 = __decorate([
|
|
|
216
208
|
__param(5, inversify_1.inject(inversify_types_1.CLASSES.PreviewWidget)),
|
|
217
209
|
__param(6, inversify_1.inject(inversify_types_1.CLASSES.RightToolBar)),
|
|
218
210
|
__param(7, inversify_1.inject(inversify_types_1.CLASSES.QuickOpenContainer)),
|
|
219
|
-
__param(8, inversify_1.inject(inversify_types_1.CLASSES.BrowserTabsUtil)),
|
|
220
|
-
__param(9, inversify_1.inject(inversify_types_1.CLASSES.WorkspaceHandlingTests)),
|
|
221
211
|
__metadata("design:paramtypes", [Terminal_1.Terminal,
|
|
222
212
|
TopMenu_1.TopMenu,
|
|
223
213
|
Ide_1.Ide,
|
|
@@ -225,9 +215,7 @@ CodeExecutionTests = CodeExecutionTests_1 = __decorate([
|
|
|
225
215
|
DriverHelper_1.DriverHelper,
|
|
226
216
|
PreviewWidget_1.PreviewWidget,
|
|
227
217
|
RightToolBar_1.RightToolBar,
|
|
228
|
-
QuickOpenContainer_1.QuickOpenContainer
|
|
229
|
-
BrowserTabsUtil_1.BrowserTabsUtil,
|
|
230
|
-
WorkspaceHandlingTests_1.WorkspaceHandlingTests])
|
|
218
|
+
QuickOpenContainer_1.QuickOpenContainer])
|
|
231
219
|
], CodeExecutionTests);
|
|
232
220
|
exports.CodeExecutionTests = CodeExecutionTests;
|
|
233
221
|
//# sourceMappingURL=CodeExecutionTests.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodeExecutionTests.js","sourceRoot":"","sources":["../../testsLibrary/CodeExecutionTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,kDAA0B;AAC1B,wDAA6C;AAC7C,yCAA+C;AAC/C,2DAAoD;AACpD,gDAA6C;AAC7C,0DAAuD;AACvD,wDAAqD;AACrD,kEAA+D;AAC/D,wDAAqD;AACrD,oEAAiE;AACjE,kEAA+D;AAC/D,4CAAyC;AACzC,8EAA2E;
|
|
1
|
+
{"version":3,"file":"CodeExecutionTests.js","sourceRoot":"","sources":["../../testsLibrary/CodeExecutionTests.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,90 +30,38 @@ const Dashboard_1 = require("../pageobjects/dashboard/Dashboard");
|
|
|
30
30
|
const CreateWorkspace_1 = require("../pageobjects/dashboard/CreateWorkspace");
|
|
31
31
|
const Workspaces_1 = require("../pageobjects/dashboard/Workspaces");
|
|
32
32
|
const BrowserTabsUtil_1 = require("../utils/BrowserTabsUtil");
|
|
33
|
-
const
|
|
34
|
-
const TimeoutConstants_1 = require("../TimeoutConstants");
|
|
35
|
-
const DriverHelper_1 = require("../utils/DriverHelper");
|
|
36
|
-
const Ide_1 = require("../pageobjects/ide/Ide");
|
|
37
|
-
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
33
|
+
const __1 = require("..");
|
|
38
34
|
let WorkspaceHandlingTests = WorkspaceHandlingTests_1 = class WorkspaceHandlingTests {
|
|
39
|
-
constructor(dashboard, createWorkspace, workspaces,
|
|
35
|
+
constructor(dashboard, createWorkspace, workspaces, browserTabsUtil) {
|
|
40
36
|
this.dashboard = dashboard;
|
|
41
37
|
this.createWorkspace = createWorkspace;
|
|
42
38
|
this.workspaces = workspaces;
|
|
43
|
-
this.driverHelper = driverHelper;
|
|
44
39
|
this.browserTabsUtil = browserTabsUtil;
|
|
45
|
-
this.ide = ide;
|
|
46
40
|
}
|
|
47
41
|
static getWorkspaceName() {
|
|
48
42
|
return WorkspaceHandlingTests_1.workspaceName;
|
|
49
43
|
}
|
|
50
|
-
static setWorkspaceName(workspaceName) {
|
|
51
|
-
WorkspaceHandlingTests_1.workspaceName = workspaceName;
|
|
52
|
-
}
|
|
53
|
-
setWindowHandle(guid) {
|
|
54
|
-
WorkspaceHandlingTests_1.parentGUID = guid;
|
|
55
|
-
}
|
|
56
|
-
getWindowHandle() {
|
|
57
|
-
return WorkspaceHandlingTests_1.parentGUID;
|
|
58
|
-
}
|
|
59
44
|
createAndOpenWorkspace(stack) {
|
|
60
|
-
test(`
|
|
45
|
+
test(`Open 'New Workspace' page`, async () => {
|
|
61
46
|
await this.dashboard.waitPage();
|
|
62
47
|
await this.dashboard.clickCreateWorkspaceButton();
|
|
63
48
|
await this.createWorkspace.waitPage();
|
|
64
|
-
|
|
49
|
+
const parentGUID = await this.browserTabsUtil.getCurrentWindowHandle();
|
|
65
50
|
await this.createWorkspace.clickOnSample(stack);
|
|
66
|
-
await this.browserTabsUtil.
|
|
51
|
+
await this.browserTabsUtil.switchToWindow(parentGUID);
|
|
52
|
+
WorkspaceHandlingTests_1.workspaceName = await this.dashboard.getRecentWorkspaceName(10000);
|
|
53
|
+
__1.Logger.debug(`Workspace Name is: ${WorkspaceHandlingTests_1.workspaceName}`);
|
|
54
|
+
await this.browserTabsUtil.waitAndSwitchToAnotherWindow(parentGUID, 10000);
|
|
67
55
|
});
|
|
68
56
|
}
|
|
69
57
|
openExistingWorkspace(workspaceName) {
|
|
70
|
-
test('
|
|
58
|
+
test('Start workspace', async () => {
|
|
71
59
|
await this.dashboard.waitPage();
|
|
72
60
|
await this.dashboard.clickWorkspacesButton();
|
|
73
61
|
await this.workspaces.waitPage();
|
|
74
62
|
await this.workspaces.clickOpenButton(workspaceName);
|
|
75
63
|
});
|
|
76
64
|
}
|
|
77
|
-
obtainWorkspaceNameFromStartingPage() {
|
|
78
|
-
test('Obtain workspace name from workspace loader page', async () => {
|
|
79
|
-
try {
|
|
80
|
-
await this.driverHelper.waitVisibility(WorkspaceHandlingTests_1.START_WORKSPACE_PAGE_NAME_LOCATOR, TimeoutConstants_1.TimeoutConstants.TS_WAIT_LOADER_PRESENCE_TIMEOUT);
|
|
81
|
-
// it takes a while to update the element with the workspace name
|
|
82
|
-
await this.driverHelper.wait(10000);
|
|
83
|
-
let startingWorkspaceLineContent = await this.driverHelper.getDriver().findElement(WorkspaceHandlingTests_1.START_WORKSPACE_PAGE_NAME_LOCATOR).getAttribute('innerHTML');
|
|
84
|
-
// cutting away leading text
|
|
85
|
-
WorkspaceHandlingTests_1.workspaceName = startingWorkspaceLineContent.substring('Starting workspace '.length).trim();
|
|
86
|
-
Logger_1.Logger.info(`Obtained workspace name from workspace loader page: ${WorkspaceHandlingTests_1.workspaceName}`);
|
|
87
|
-
}
|
|
88
|
-
catch (err) {
|
|
89
|
-
Logger_1.Logger.error(`Failed to obtain workspace name from workspace loader page: ${err}`);
|
|
90
|
-
throw err;
|
|
91
|
-
}
|
|
92
|
-
});
|
|
93
|
-
}
|
|
94
|
-
switchBackToFirstOpenIdeTabFromLeftToRight() {
|
|
95
|
-
test('WorkspaceHandlingTests.switchBackToIdeTab', async () => {
|
|
96
|
-
let tabs = await this.driverHelper.getDriver().getAllWindowHandles();
|
|
97
|
-
Logger_1.Logger.trace(`WorkspaceHandlingTests.switchBackToIdeTab Found ${tabs.length} window handles, iterating...`);
|
|
98
|
-
for (let i = 0; i < tabs.length; i++) {
|
|
99
|
-
await this.browserTabsUtil.switchToWindow(tabs[i]);
|
|
100
|
-
try {
|
|
101
|
-
await this.ide.waitIde(TimeoutConstants_1.TimeoutConstants.TS_IDE_LOAD_TIMEOUT);
|
|
102
|
-
Logger_1.Logger.info(`WorkspaceHandlingTests.switchBackToIdeTab located and switched to IDE tab`);
|
|
103
|
-
return;
|
|
104
|
-
}
|
|
105
|
-
catch (err) {
|
|
106
|
-
if (err instanceof selenium_webdriver_1.error.TimeoutError) {
|
|
107
|
-
Logger_1.Logger.warn(`WorkspaceHandlingTests.switchBackToIdeTab Locator timed out, trying with another window handle.`);
|
|
108
|
-
continue;
|
|
109
|
-
}
|
|
110
|
-
Logger_1.Logger.error(`WorkspaceHandlingTests.switchBackToIdeTab Received unexpected exception while trying to locate IDE tab:${err}`);
|
|
111
|
-
throw err;
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
Logger_1.Logger.error(`WorkspaceHandlingTests.switchBackToIdeTab Failed to locate IDE tab, out of window handles.`);
|
|
115
|
-
});
|
|
116
|
-
}
|
|
117
65
|
async stopWorkspace(workspaceName) {
|
|
118
66
|
await this.dashboard.openDashboard();
|
|
119
67
|
await this.dashboard.stopWorkspaceByUI(workspaceName);
|
|
@@ -127,22 +75,17 @@ let WorkspaceHandlingTests = WorkspaceHandlingTests_1 = class WorkspaceHandlingT
|
|
|
127
75
|
await this.dashboard.stopAndRemoveWorkspaceByUI(workspaceName);
|
|
128
76
|
}
|
|
129
77
|
};
|
|
130
|
-
WorkspaceHandlingTests.START_WORKSPACE_PAGE_NAME_LOCATOR = selenium_webdriver_1.By.xpath(`//div[@class="ui-container"]/div[@class="pf-c-page"]//div[@class="pf-c-content"]/h1`);
|
|
131
78
|
WorkspaceHandlingTests.workspaceName = 'undefined';
|
|
132
79
|
WorkspaceHandlingTests = WorkspaceHandlingTests_1 = __decorate([
|
|
133
80
|
inversify_1.injectable(),
|
|
134
81
|
__param(0, inversify_1.inject(inversify_types_1.CLASSES.Dashboard)),
|
|
135
82
|
__param(1, inversify_1.inject(inversify_types_1.CLASSES.CreateWorkspace)),
|
|
136
83
|
__param(2, inversify_1.inject(inversify_types_1.CLASSES.Workspaces)),
|
|
137
|
-
__param(3, inversify_1.inject(inversify_types_1.CLASSES.
|
|
138
|
-
__param(4, inversify_1.inject(inversify_types_1.CLASSES.BrowserTabsUtil)),
|
|
139
|
-
__param(5, inversify_1.inject(inversify_types_1.CLASSES.Ide)),
|
|
84
|
+
__param(3, inversify_1.inject(inversify_types_1.CLASSES.BrowserTabsUtil)),
|
|
140
85
|
__metadata("design:paramtypes", [Dashboard_1.Dashboard,
|
|
141
86
|
CreateWorkspace_1.CreateWorkspace,
|
|
142
87
|
Workspaces_1.Workspaces,
|
|
143
|
-
|
|
144
|
-
BrowserTabsUtil_1.BrowserTabsUtil,
|
|
145
|
-
Ide_1.Ide])
|
|
88
|
+
BrowserTabsUtil_1.BrowserTabsUtil])
|
|
146
89
|
], WorkspaceHandlingTests);
|
|
147
90
|
exports.WorkspaceHandlingTests = WorkspaceHandlingTests;
|
|
148
91
|
//# sourceMappingURL=WorkspaceHandlingTests.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkspaceHandlingTests.js","sourceRoot":"","sources":["../../testsLibrary/WorkspaceHandlingTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,yCAA+C;AAC/C,wDAA6C;AAC7C,kEAA+D;AAC/D,8EAA2E;AAC3E,oEAAiE;AACjE,8DAA2D;AAC3D,
|
|
1
|
+
{"version":3,"file":"WorkspaceHandlingTests.js","sourceRoot":"","sources":["../../testsLibrary/WorkspaceHandlingTests.ts"],"names":[],"mappings":"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"}
|
package/driver/CheReporter.ts
CHANGED
|
@@ -23,7 +23,6 @@ import { CheApiRequestHandler } from '../utils/requestHandlers/CheApiRequestHand
|
|
|
23
23
|
import { TimeoutConstants } from '../TimeoutConstants';
|
|
24
24
|
import { Logger } from '../utils/Logger';
|
|
25
25
|
import { Sanitizer } from '../utils/Sanitizer';
|
|
26
|
-
import { WorkspaceHandlingTests } from '../testsLibrary/WorkspaceHandlingTests';
|
|
27
26
|
|
|
28
27
|
const e2eContainer = inversifyConfig.e2eContainer;
|
|
29
28
|
const driver: IDriver = e2eContainer.get(TYPES.Driver);
|
|
@@ -37,6 +36,13 @@ let testWorkspaceUtil: ITestWorkspaceUtil = e2eContainer.get(TYPES.WorkspaceUtil
|
|
|
37
36
|
|
|
38
37
|
class CheReporter extends mocha.reporters.Spec {
|
|
39
38
|
|
|
39
|
+
private static latestWorkspace: string;
|
|
40
|
+
|
|
41
|
+
public static registerRunningWorkspace(workspaceName: string) {
|
|
42
|
+
Logger.debug(`CheReporter.registerRunningWorkspace {${workspaceName}}`);
|
|
43
|
+
CheReporter.latestWorkspace = workspaceName;
|
|
44
|
+
}
|
|
45
|
+
|
|
40
46
|
constructor(runner: mocha.Runner, options: mocha.MochaOptions) {
|
|
41
47
|
super(runner, options);
|
|
42
48
|
|
|
@@ -186,7 +192,7 @@ class CheReporter extends mocha.reporters.Spec {
|
|
|
186
192
|
// stop and remove running workspace
|
|
187
193
|
if (TestConstants.DELETE_WORKSPACE_ON_FAILED_TEST) {
|
|
188
194
|
Logger.warn('Property DELETE_WORKSPACE_ON_FAILED_TEST se to true - trying to stop and delete running workspace.');
|
|
189
|
-
await testWorkspaceUtil.cleanUpRunningWorkspace(
|
|
195
|
+
await testWorkspaceUtil.cleanUpRunningWorkspace(CheReporter.latestWorkspace);
|
|
190
196
|
}
|
|
191
197
|
|
|
192
198
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-che/che-e2e",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.48.0-dev-29d4f0d",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"typescript": "3.9.9"
|
|
50
50
|
},
|
|
51
51
|
"dependencies": {
|
|
52
|
-
"@eclipse-che/api": "
|
|
52
|
+
"@eclipse-che/api": "latest",
|
|
53
53
|
"inversify": "5.0.1",
|
|
54
54
|
"reflect-metadata": "0.1.13"
|
|
55
55
|
},
|
|
@@ -235,16 +235,13 @@ export class ProjectTree {
|
|
|
235
235
|
|
|
236
236
|
for (let i = 0; i < attempts; i++) {
|
|
237
237
|
// do five checks of the item in one fifth of the time given for root folder item (was causing frequent reloads of the workspace)
|
|
238
|
-
const
|
|
238
|
+
const isProjectFolderVisible = await this.driverHelper.waitVisibilityBoolean(rootItemLocator, 5, visibilityItemPolling / 5);
|
|
239
239
|
|
|
240
|
-
if (!
|
|
240
|
+
if (!isProjectFolderVisible) {
|
|
241
241
|
Logger.trace(`ProjectTree.waitProjectImported project not located, reloading page.`);
|
|
242
242
|
await this.browserTabsUtil.refreshPage();
|
|
243
243
|
await this.ide.waitWorkspaceAndIde();
|
|
244
244
|
await this.openProjectTreeContainer();
|
|
245
|
-
if (i === attempts - 1) {
|
|
246
|
-
throw new error.TimeoutError('Exceeded the maximum number of checking attempts, project has not been imported [unable to locate project root folder]');
|
|
247
|
-
}
|
|
248
245
|
continue;
|
|
249
246
|
}
|
|
250
247
|
|
|
@@ -253,22 +250,20 @@ export class ProjectTree {
|
|
|
253
250
|
await this.waitItemExpanded(rootItem);
|
|
254
251
|
|
|
255
252
|
// do five checks of the item in one fifth of the time given for root folder item (was causing frequent reloads of the workspace)
|
|
256
|
-
const
|
|
253
|
+
const isRootSubItemVisible = await this.driverHelper.waitVisibilityBoolean(rootSubitemLocator, 5, visibilityItemPolling / 5);
|
|
257
254
|
|
|
258
|
-
if (!
|
|
255
|
+
if (!isRootSubItemVisible) {
|
|
259
256
|
Logger.trace(`ProjectTree.waitProjectImported sub-items not found, reloading page.`);
|
|
260
257
|
await this.browserTabsUtil.refreshPage();
|
|
261
258
|
await this.ide.waitWorkspaceAndIde();
|
|
262
259
|
await this.openProjectTreeContainer();
|
|
263
|
-
if (i === attempts - 1) {
|
|
264
|
-
throw new error.TimeoutError('Exceeded the maximum number of checking attempts, project has not been imported [unable to locate project subfolder]');
|
|
265
|
-
}
|
|
266
260
|
continue;
|
|
267
261
|
}
|
|
268
|
-
|
|
269
|
-
Logger.trace(`ProjectTree.waitProjectImported project successfully imported`);
|
|
270
|
-
break;
|
|
262
|
+
return;
|
|
271
263
|
}
|
|
264
|
+
|
|
265
|
+
throw new error.TimeoutError('Exceeded the maximum number of checking attempts, project has not been imported');
|
|
266
|
+
|
|
272
267
|
}
|
|
273
268
|
|
|
274
269
|
async waitProjectImportedNoSubfolder(projectName: string,
|
|
@@ -15,6 +15,7 @@ import { LanguageServerTests } from '../../testsLibrary/LanguageServerTests';
|
|
|
15
15
|
import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
|
|
16
16
|
import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
|
|
17
17
|
import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
|
|
18
|
+
import CheReporter from '../../driver/CheReporter';
|
|
18
19
|
|
|
19
20
|
const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
|
|
20
21
|
const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
|
|
@@ -28,11 +29,17 @@ const tabTitle: string = 'hello.cpp';
|
|
|
28
29
|
const buildTaskName: string = 'build';
|
|
29
30
|
const runTaskName: string = 'run';
|
|
30
31
|
const stack: string = 'C/C++';
|
|
32
|
+
let workspaceName: string;
|
|
31
33
|
|
|
32
34
|
suite(`${stack} test`, async () => {
|
|
33
35
|
suite(`Create ${stack} workspace`, async () => {
|
|
34
36
|
workspaceHandlingTests.createAndOpenWorkspace(stack);
|
|
35
|
-
|
|
37
|
+
|
|
38
|
+
test('Register running workspace', async () => {
|
|
39
|
+
workspaceName = WorkspaceHandlingTests.getWorkspaceName();
|
|
40
|
+
CheReporter.registerRunningWorkspace(workspaceName);
|
|
41
|
+
});
|
|
42
|
+
|
|
36
43
|
projectAndFileTests.waitWorkspaceReadinessNoSubfolder(workspaceSampleName, false);
|
|
37
44
|
});
|
|
38
45
|
|
|
@@ -56,7 +63,7 @@ suite(`${stack} test`, async () => {
|
|
|
56
63
|
|
|
57
64
|
suite('Stopping and deleting the workspace', async () => {
|
|
58
65
|
test(`Stop and remowe workspace`, async () => {
|
|
59
|
-
await workspaceHandlingTests.stopAndRemoveWorkspace(
|
|
66
|
+
await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
|
|
60
67
|
});
|
|
61
68
|
});
|
|
62
69
|
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
**********************************************************************/
|
|
10
10
|
import 'reflect-metadata';
|
|
11
11
|
import { CLASSES } from '../../inversify.types';
|
|
12
|
+
import CheReporter from '../../driver/CheReporter';
|
|
12
13
|
import { e2eContainer } from '../../inversify.config';
|
|
13
14
|
import { PreferencesHandler } from '../../utils/PreferencesHandler';
|
|
14
15
|
import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
|
|
@@ -25,11 +26,17 @@ const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
|
|
|
25
26
|
const workspaceSampleName: string = 'console-java-simple';
|
|
26
27
|
const workspaceRootFolderName: string = 'src';
|
|
27
28
|
const stack: string = 'Java Maven';
|
|
29
|
+
let workspaceName: string;
|
|
28
30
|
|
|
29
31
|
suite(`${stack} test`, async () => {
|
|
30
32
|
suite (`Create ${stack} workspace`, async () => {
|
|
31
33
|
workspaceHandlingTests.createAndOpenWorkspace(stack);
|
|
32
|
-
|
|
34
|
+
|
|
35
|
+
test('Register running workspace', async () => {
|
|
36
|
+
workspaceName = WorkspaceHandlingTests.getWorkspaceName();
|
|
37
|
+
CheReporter.registerRunningWorkspace(workspaceName);
|
|
38
|
+
});
|
|
39
|
+
|
|
33
40
|
projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName, false);
|
|
34
41
|
|
|
35
42
|
test('Set application.confirmExit user preferences to "never"', async () => {
|
|
@@ -40,7 +47,7 @@ suite(`${stack} test`, async () => {
|
|
|
40
47
|
suite ('Stopping and deleting the workspace', async () => {
|
|
41
48
|
test(`Stop and remowe workspace`, async () => {
|
|
42
49
|
await navigationBar.openNavigationBar();
|
|
43
|
-
await dashboard.stopAndRemoveWorkspaceByUI(
|
|
50
|
+
await dashboard.stopAndRemoveWorkspaceByUI(workspaceName);
|
|
44
51
|
});
|
|
45
52
|
});
|
|
46
53
|
});
|
|
@@ -15,6 +15,7 @@ import { LanguageServerTests } from '../../testsLibrary/LanguageServerTests';
|
|
|
15
15
|
import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
|
|
16
16
|
import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
|
|
17
17
|
import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
|
|
18
|
+
import CheReporter from '../../driver/CheReporter';
|
|
18
19
|
|
|
19
20
|
const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
|
|
20
21
|
const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
|
|
@@ -31,11 +32,17 @@ const updateDependenciesTaskName: string = 'update dependencies';
|
|
|
31
32
|
const buildTaskName: string = 'build';
|
|
32
33
|
const runTaskName: string = 'run';
|
|
33
34
|
const runTaskNameExpectedString: string = 'Process 5000-tcp is now listening on port 5000. Open it ?';
|
|
35
|
+
let workspaceName: string;
|
|
34
36
|
|
|
35
37
|
suite(`Test ${stack}`, async () => {
|
|
36
38
|
suite (`Create ${stack} workspace`, async () => {
|
|
37
39
|
workspaceHandlingTests.createAndOpenWorkspace(stack);
|
|
38
|
-
|
|
40
|
+
|
|
41
|
+
test('Register running workspace', async () => {
|
|
42
|
+
workspaceName = WorkspaceHandlingTests.getWorkspaceName();
|
|
43
|
+
CheReporter.registerRunningWorkspace(workspaceName);
|
|
44
|
+
});
|
|
45
|
+
|
|
39
46
|
projectAndFileTests.waitWorkspaceReadinessNoSubfolder(workspaceSampleName, false);
|
|
40
47
|
});
|
|
41
48
|
|
|
@@ -68,7 +75,7 @@ suite(`Test ${stack}`, async () => {
|
|
|
68
75
|
|
|
69
76
|
suite ('Stopping and deleting the workspace', async () => {
|
|
70
77
|
test(`Stop and remowe workspace`, async () => {
|
|
71
|
-
await workspaceHandlingTests.stopAndRemoveWorkspace(
|
|
78
|
+
await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
|
|
72
79
|
});
|
|
73
80
|
});
|
|
74
81
|
});
|
|
@@ -16,6 +16,7 @@ import { LanguageServerTests } from '../../testsLibrary/LanguageServerTests';
|
|
|
16
16
|
import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
|
|
17
17
|
import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
|
|
18
18
|
import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
|
|
19
|
+
import CheReporter from '../../driver/CheReporter';
|
|
19
20
|
|
|
20
21
|
const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
|
|
21
22
|
const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
|
|
@@ -33,12 +34,16 @@ const taskRunServer: string = 'run-outyet';
|
|
|
33
34
|
const taskStopServer: string = 'stop-outyet';
|
|
34
35
|
const taskTestOutyet: string = 'test-outyet';
|
|
35
36
|
const notificationText: string = 'Process 8080-tcp is now listening on port 8080. Open it ?';
|
|
37
|
+
let workspaceName: string;
|
|
36
38
|
|
|
37
39
|
suite(`${workspaceStack} test`, async () => {
|
|
38
40
|
|
|
39
41
|
suite(`Create ${workspaceStack} workspace`, async () => {
|
|
40
42
|
workspaceHandlingTests.createAndOpenWorkspace(workspaceStack);
|
|
41
|
-
|
|
43
|
+
test('Register running workspace', async () => {
|
|
44
|
+
workspaceName = WorkspaceHandlingTests.getWorkspaceName();
|
|
45
|
+
CheReporter.registerRunningWorkspace(workspaceName);
|
|
46
|
+
});
|
|
42
47
|
projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceSubfolderName, false);
|
|
43
48
|
test('Workaround for issue #16113', async () => {
|
|
44
49
|
Logger.warn(`Manually setting a preference for golang devFile LS based on issue: https://github.com/eclipse/che/issues/16113`);
|
|
@@ -70,7 +75,7 @@ suite(`${workspaceStack} test`, async () => {
|
|
|
70
75
|
|
|
71
76
|
suite('Stop and remove workspace', async() => {
|
|
72
77
|
test(`Stop and remove workspace`, async () => {
|
|
73
|
-
await workspaceHandlingTests.stopAndRemoveWorkspace(
|
|
78
|
+
await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
|
|
74
79
|
});
|
|
75
80
|
});
|
|
76
81
|
|
|
@@ -14,6 +14,7 @@ import { e2eContainer } from '../../inversify.config';
|
|
|
14
14
|
import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
|
|
15
15
|
import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
|
|
16
16
|
import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
|
|
17
|
+
import CheReporter from '../../driver/CheReporter';
|
|
17
18
|
|
|
18
19
|
const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
|
|
19
20
|
const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
|
|
@@ -27,11 +28,17 @@ const tabTitle: string = 'HelloWorld.java';
|
|
|
27
28
|
const codeNavigationClassName: string = 'String.class';
|
|
28
29
|
const stack : string = 'Java Maven';
|
|
29
30
|
const taskName: string = 'maven build';
|
|
31
|
+
let workspaceName: string;
|
|
30
32
|
|
|
31
33
|
suite(`${stack} test`, async () => {
|
|
32
34
|
suite (`Create ${stack} workspace`, async () => {
|
|
33
35
|
workspaceHandlingTests.createAndOpenWorkspace(stack);
|
|
34
|
-
|
|
36
|
+
|
|
37
|
+
test('Register running workspace', async () => {
|
|
38
|
+
workspaceName = WorkspaceHandlingTests.getWorkspaceName();
|
|
39
|
+
CheReporter.registerRunningWorkspace(workspaceName);
|
|
40
|
+
});
|
|
41
|
+
|
|
35
42
|
projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName, false);
|
|
36
43
|
});
|
|
37
44
|
|
|
@@ -54,7 +61,7 @@ suite(`${stack} test`, async () => {
|
|
|
54
61
|
|
|
55
62
|
suite('Stopping and deleting the workspace', async () => {
|
|
56
63
|
test(`Stop and remowe workspace`, async () => {
|
|
57
|
-
await workspaceHandlingTests.stopAndRemoveWorkspace(
|
|
64
|
+
await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
|
|
58
65
|
});
|
|
59
66
|
});
|
|
60
67
|
});
|
|
@@ -14,6 +14,7 @@ import { e2eContainer } from '../../inversify.config';
|
|
|
14
14
|
import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
|
|
15
15
|
import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
|
|
16
16
|
import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
|
|
17
|
+
import CheReporter from '../../driver/CheReporter';
|
|
17
18
|
|
|
18
19
|
const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
|
|
19
20
|
const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
|
|
@@ -29,11 +30,17 @@ const codeNavigationClassName: string = 'SpringApplication.class';
|
|
|
29
30
|
const buildTaskName: string = 'maven build';
|
|
30
31
|
const runTaskName: string = 'run webapp';
|
|
31
32
|
const runTaskExpectedDialogue: string = 'Process 8080-tcp is now listening on port 8080. Open it ?';
|
|
33
|
+
let workspaceName: string;
|
|
32
34
|
|
|
33
35
|
suite(`${stack} test`, async () => {
|
|
34
36
|
suite(`Create ${stack} workspace`, async () => {
|
|
35
37
|
workspaceHandlingTests.createAndOpenWorkspace(stack);
|
|
36
|
-
|
|
38
|
+
|
|
39
|
+
test('Register running workspace', async () => {
|
|
40
|
+
workspaceName = WorkspaceHandlingTests.getWorkspaceName();
|
|
41
|
+
CheReporter.registerRunningWorkspace(workspaceName);
|
|
42
|
+
});
|
|
43
|
+
|
|
37
44
|
projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName, false);
|
|
38
45
|
});
|
|
39
46
|
|
|
@@ -61,7 +68,7 @@ suite(`${stack} test`, async () => {
|
|
|
61
68
|
|
|
62
69
|
suite('Stopping and deleting the workspace', async () => {
|
|
63
70
|
test(`Stop and remowe workspace`, async () => {
|
|
64
|
-
await workspaceHandlingTests.stopAndRemoveWorkspace(
|
|
71
|
+
await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
|
|
65
72
|
});
|
|
66
73
|
});
|
|
67
74
|
});
|