@eclipse-che/che-e2e 7.44.0 → 7.44.1-dev-bc873f3
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/README.md +16 -1
- package/dist/driver/CheReporter.js +4 -4
- package/dist/driver/CheReporter.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/pageobjects/dashboard/Dashboard.js +4 -0
- package/dist/pageobjects/dashboard/Dashboard.js.map +1 -1
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js +1 -1
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js.map +1 -1
- package/dist/pageobjects/ide/Ide.js +31 -7
- package/dist/pageobjects/ide/Ide.js.map +1 -1
- package/dist/pageobjects/ide/PreviewWidget.js +6 -2
- package/dist/pageobjects/ide/PreviewWidget.js.map +1 -1
- package/dist/pageobjects/ide/ProjectTree.js +12 -11
- package/dist/pageobjects/ide/ProjectTree.js.map +1 -1
- package/dist/tests/devfiles/DotNetCore.spec.js +1 -1
- package/dist/tests/devfiles/DotNetCore.spec.js.map +1 -1
- package/dist/tests/devfiles/Go.spec.js +15 -15
- package/dist/tests/devfiles/Go.spec.js.map +1 -1
- package/dist/tests/e2e/OpenshiftConnector.spec.js +2 -2
- package/dist/tests/e2e/factories/DirectUrlFactoryWithKeepDirectoryTest.spec.js +10 -9
- package/dist/tests/e2e/factories/DirectUrlFactoryWithKeepDirectoryTest.spec.js.map +1 -1
- package/dist/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.js +10 -9
- package/dist/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.js.map +1 -1
- package/dist/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.js +15 -14
- package/dist/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.js.map +1 -1
- package/dist/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.js +9 -8
- package/dist/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.js.map +1 -1
- package/dist/tests/plugins/GitHubPullRequestPlugin.spec.js +3 -2
- package/dist/tests/plugins/GitHubPullRequestPlugin.spec.js.map +1 -1
- package/dist/tests/plugins/JavaPlugin.spec.js +27 -23
- package/dist/tests/plugins/JavaPlugin.spec.js.map +1 -1
- package/dist/tests/plugins/PythonPlugin.spec.js +10 -14
- package/dist/tests/plugins/PythonPlugin.spec.js.map +1 -1
- package/dist/testsLibrary/CodeExecutionTests.js +1 -2
- package/dist/testsLibrary/CodeExecutionTests.js.map +1 -1
- package/dist/testsLibrary/LanguageServerTests.js +5 -12
- package/dist/testsLibrary/LanguageServerTests.js.map +1 -1
- package/dist/testsLibrary/ProjectAndFileTests.js +0 -1
- package/dist/testsLibrary/ProjectAndFileTests.js.map +1 -1
- package/dist/testsLibrary/WorkspaceHandlingTests.js +11 -7
- package/dist/testsLibrary/WorkspaceHandlingTests.js.map +1 -1
- package/dist/utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.js +3 -15
- package/dist/utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.js.map +1 -1
- package/dist/utils/requestHandlers/tokens/CheMultiuserTokenHandler.js +3 -3
- package/dist/utils/requestHandlers/tokens/CheMultiuserTokenHandler.js.map +1 -1
- package/driver/CheReporter.ts +4 -4
- package/index.ts +1 -1
- package/mocha-all-factories.json +2 -1
- package/package.json +2 -2
- package/pageobjects/dashboard/Dashboard.ts +6 -1
- package/pageobjects/dashboard/workspace-details/WorkspaceDetails.ts +1 -1
- package/pageobjects/ide/Ide.ts +30 -7
- package/pageobjects/ide/PreviewWidget.ts +6 -2
- package/pageobjects/ide/ProjectTree.ts +9 -11
- package/tests/devfiles/DotNetCore.spec.ts +1 -1
- package/tests/devfiles/Go.spec.ts +15 -17
- package/tests/e2e/OpenshiftConnector.spec.ts +2 -2
- package/tests/e2e/factories/DirectUrlFactoryWithKeepDirectoryTest.spec.ts +15 -13
- package/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.ts +15 -14
- package/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.ts +19 -20
- package/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts +123 -122
- package/tests/plugins/GitHubPullRequestPlugin.spec.ts +3 -2
- package/tests/plugins/JavaPlugin.spec.ts +20 -26
- package/tests/plugins/PythonPlugin.spec.ts +13 -17
- package/testsLibrary/CodeExecutionTests.ts +1 -2
- package/testsLibrary/LanguageServerTests.ts +4 -9
- package/testsLibrary/ProjectAndFileTests.ts +0 -1
- package/testsLibrary/WorkspaceHandlingTests.ts +8 -4
- package/tsconfig.json +1 -0
- package/tslint.json +119 -115
- package/utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.ts +3 -9
- package/utils/requestHandlers/tokens/CheMultiuserTokenHandler.ts +20 -18
- package/dist/utils/KeycloackUrlHandler.js +0 -30
- package/dist/utils/KeycloackUrlHandler.js.map +0 -1
- package/utils/KeycloackUrlHandler.ts +0 -32
|
@@ -33,15 +33,13 @@ const DebugView_1 = require("../pageobjects/ide/DebugView");
|
|
|
33
33
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
34
34
|
const Logger_1 = require("../utils/Logger");
|
|
35
35
|
const BrowserTabsUtil_1 = require("../utils/BrowserTabsUtil");
|
|
36
|
-
const DriverHelper_1 = require("../utils/DriverHelper");
|
|
37
36
|
let LanguageServerTests = class LanguageServerTests {
|
|
38
|
-
constructor(editor, ide, topMenu, debugView, browserTabsUtil
|
|
37
|
+
constructor(editor, ide, topMenu, debugView, browserTabsUtil) {
|
|
39
38
|
this.editor = editor;
|
|
40
39
|
this.ide = ide;
|
|
41
40
|
this.topMenu = topMenu;
|
|
42
41
|
this.debugView = debugView;
|
|
43
42
|
this.browserTabsUtil = browserTabsUtil;
|
|
44
|
-
this.driverHelper = driverHelper;
|
|
45
43
|
}
|
|
46
44
|
errorHighlighting(openedTab, textToWrite, line) {
|
|
47
45
|
test('Error highlighting', async () => {
|
|
@@ -78,6 +76,7 @@ let LanguageServerTests = class LanguageServerTests {
|
|
|
78
76
|
await this.editor.pressControlSpaceCombination(openedTab);
|
|
79
77
|
await this.editor.waitSuggestionContainer();
|
|
80
78
|
await this.editor.waitSuggestionWithScrolling(openedTab, expectedText);
|
|
79
|
+
await this.editor.waitTabWithSavedStatus(openedTab);
|
|
81
80
|
});
|
|
82
81
|
}
|
|
83
82
|
waitLSInitialization(startingNote, alternateNote = '', startTimeout = TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_LANGUAGE_SERVER_START_TIMEOUT) {
|
|
@@ -176,9 +175,7 @@ let LanguageServerTests = class LanguageServerTests {
|
|
|
176
175
|
catch (err) {
|
|
177
176
|
// debug config is probably missing, refresh IDE and try again https://github.com/eclipse/che/issues/19887
|
|
178
177
|
await this.browserTabsUtil.refreshPage();
|
|
179
|
-
await this.
|
|
180
|
-
await this.ide.waitAndSwitchToIdeFrame();
|
|
181
|
-
await this.driverHelper.wait(TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM);
|
|
178
|
+
await this.ide.waitIde();
|
|
182
179
|
await this.debugView.clickOnRunDebugButton();
|
|
183
180
|
}
|
|
184
181
|
});
|
|
@@ -198,9 +195,7 @@ let LanguageServerTests = class LanguageServerTests {
|
|
|
198
195
|
catch (err) {
|
|
199
196
|
// debug config is probably missing, refresh IDE and try again https://github.com/eclipse/che/issues/19887
|
|
200
197
|
await this.browserTabsUtil.refreshPage();
|
|
201
|
-
await this.
|
|
202
|
-
await this.ide.waitAndSwitchToIdeFrame();
|
|
203
|
-
await this.driverHelper.wait(TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM);
|
|
198
|
+
await this.ide.waitIde();
|
|
204
199
|
await this.debugView.clickOnDebugConfigurationDropDown();
|
|
205
200
|
await this.debugView.clickOnDebugConfigurationItem(configurationName);
|
|
206
201
|
await this.debugView.clickOnRunDebugButton();
|
|
@@ -225,13 +220,11 @@ LanguageServerTests = __decorate([
|
|
|
225
220
|
__param(2, inversify_1.inject(inversify_types_1.CLASSES.TopMenu)),
|
|
226
221
|
__param(3, inversify_1.inject(inversify_types_1.CLASSES.DebugView)),
|
|
227
222
|
__param(4, inversify_1.inject(inversify_types_1.CLASSES.BrowserTabsUtil)),
|
|
228
|
-
__param(5, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
229
223
|
__metadata("design:paramtypes", [Editor_1.Editor,
|
|
230
224
|
Ide_1.Ide,
|
|
231
225
|
TopMenu_1.TopMenu,
|
|
232
226
|
DebugView_1.DebugView,
|
|
233
|
-
BrowserTabsUtil_1.BrowserTabsUtil
|
|
234
|
-
DriverHelper_1.DriverHelper])
|
|
227
|
+
BrowserTabsUtil_1.BrowserTabsUtil])
|
|
235
228
|
], LanguageServerTests);
|
|
236
229
|
exports.LanguageServerTests = LanguageServerTests;
|
|
237
230
|
//# sourceMappingURL=LanguageServerTests.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LanguageServerTests.js","sourceRoot":"","sources":["../../testsLibrary/LanguageServerTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,yCAA+C;AAC/C,wDAA6C;AAC7C,0DAAuD;AACvD,sDAAmD;AACnD,gDAAgE;AAChE,wDAAqD;AACrD,4DAAyD;AACzD,2DAAgD;AAChD,4CAAyC;AACzC,8DAA2D;
|
|
1
|
+
{"version":3,"file":"LanguageServerTests.js","sourceRoot":"","sources":["../../testsLibrary/LanguageServerTests.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,7 +55,6 @@ let ProjectAndFileTests = class ProjectAndFileTests {
|
|
|
55
55
|
}
|
|
56
56
|
waitWorkspaceReadinessNoSubfolder(sampleName, checkNotification = true) {
|
|
57
57
|
test('Wait for workspace readiness', async () => {
|
|
58
|
-
await this.ide.waitAndSwitchToIdeFrame();
|
|
59
58
|
await this.ide.waitIde(TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
|
|
60
59
|
if (checkNotification) {
|
|
61
60
|
await this.ide.waitNotificationAndClickOnButton('Do you trust the authors of', 'Yes, I trust', 60000);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectAndFileTests.js","sourceRoot":"","sources":["../../testsLibrary/ProjectAndFileTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,yCAA+C;AAC/C,2DAAwC;AACxC,gDAA6C;AAC7C,gEAA6D;AAC7D,gEAA6D;AAC7D,sDAAmD;AACnD,0DAAuD;AACvD,wDAAqD;AACrD,wDAA6C;AAG7C,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;IAE5B,YAC0C,GAAQ,EACC,YAA0B,EAC3B,WAAwB,EACxB,WAAwB,EAC7B,MAAc;QAJjB,QAAG,GAAH,GAAG,CAAK;QACC,iBAAY,GAAZ,YAAY,CAAc;QAC3B,gBAAW,GAAX,WAAW,CAAa;QACxB,gBAAW,GAAX,WAAW,CAAa;QAC7B,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAExD,sBAAsB,CAAC,UAAmB,EAAE,MAAc,EAAE,oBAA6B,IAAI,EAAE,mCAA4C,KAAK;QACnJ,IAAI,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;YAC5C,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,mCAAgB,CAAC,mCAAmC,CAAC,CAAC;YAE7E,IAAI,gCAAgC,EAAE;gBAClC,MAAM,IAAI,CAAC,GAAG,CAAC,yBAAyB,EAAE,CAAC;aAC9C;YAED,MAAM,IAAI,CAAC,WAAW,CAAC,wBAAwB,EAAE,CAAC;YAClD,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,0BAA0B,EAAE,EAAE;gBACtD,MAAM,IAAI,CAAC,WAAW,CAAC,2BAA2B,EAAE,CAAC;aACxD;YAED,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,iCAAiC,CAAC,UAAmB,EAAE,oBAA6B,IAAI;QAC3F,IAAI,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;YAC5C,MAAM,IAAI,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"ProjectAndFileTests.js","sourceRoot":"","sources":["../../testsLibrary/ProjectAndFileTests.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,13 +29,14 @@ const inversify_types_1 = require("../inversify.types");
|
|
|
29
29
|
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
|
-
const
|
|
32
|
+
const BrowserTabsUtil_1 = require("../utils/BrowserTabsUtil");
|
|
33
|
+
const __1 = require("..");
|
|
33
34
|
let WorkspaceHandlingTests = WorkspaceHandlingTests_1 = class WorkspaceHandlingTests {
|
|
34
|
-
constructor(dashboard, createWorkspace, workspaces,
|
|
35
|
+
constructor(dashboard, createWorkspace, workspaces, browserTabsUtil) {
|
|
35
36
|
this.dashboard = dashboard;
|
|
36
37
|
this.createWorkspace = createWorkspace;
|
|
37
38
|
this.workspaces = workspaces;
|
|
38
|
-
this.
|
|
39
|
+
this.browserTabsUtil = browserTabsUtil;
|
|
39
40
|
}
|
|
40
41
|
static getWorkspaceName() {
|
|
41
42
|
return WorkspaceHandlingTests_1.workspaceName;
|
|
@@ -45,9 +46,12 @@ let WorkspaceHandlingTests = WorkspaceHandlingTests_1 = class WorkspaceHandlingT
|
|
|
45
46
|
await this.dashboard.waitPage();
|
|
46
47
|
await this.dashboard.clickCreateWorkspaceButton();
|
|
47
48
|
await this.createWorkspace.waitPage();
|
|
49
|
+
const parentGUID = await this.browserTabsUtil.getCurrentWindowHandle();
|
|
48
50
|
await this.createWorkspace.clickOnSample(stack);
|
|
49
|
-
await this.
|
|
50
|
-
WorkspaceHandlingTests_1.workspaceName = await this.
|
|
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);
|
|
51
55
|
});
|
|
52
56
|
}
|
|
53
57
|
openExistingWorkspace(workspaceName) {
|
|
@@ -77,11 +81,11 @@ WorkspaceHandlingTests = WorkspaceHandlingTests_1 = __decorate([
|
|
|
77
81
|
__param(0, inversify_1.inject(inversify_types_1.CLASSES.Dashboard)),
|
|
78
82
|
__param(1, inversify_1.inject(inversify_types_1.CLASSES.CreateWorkspace)),
|
|
79
83
|
__param(2, inversify_1.inject(inversify_types_1.CLASSES.Workspaces)),
|
|
80
|
-
__param(3, inversify_1.inject(inversify_types_1.CLASSES.
|
|
84
|
+
__param(3, inversify_1.inject(inversify_types_1.CLASSES.BrowserTabsUtil)),
|
|
81
85
|
__metadata("design:paramtypes", [Dashboard_1.Dashboard,
|
|
82
86
|
CreateWorkspace_1.CreateWorkspace,
|
|
83
87
|
Workspaces_1.Workspaces,
|
|
84
|
-
|
|
88
|
+
BrowserTabsUtil_1.BrowserTabsUtil])
|
|
85
89
|
], WorkspaceHandlingTests);
|
|
86
90
|
exports.WorkspaceHandlingTests = WorkspaceHandlingTests;
|
|
87
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,
|
|
1
|
+
{"version":3,"file":"WorkspaceHandlingTests.js","sourceRoot":"","sources":["../../testsLibrary/WorkspaceHandlingTests.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,29 +5,17 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
5
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
-
};
|
|
11
|
-
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
-
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
-
};
|
|
14
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
9
|
exports.CheMultiuserAuthorizationHeaderHandler = void 0;
|
|
16
|
-
const inversify_types_1 = require("../../../inversify.types");
|
|
17
10
|
const inversify_1 = require("inversify");
|
|
18
11
|
let CheMultiuserAuthorizationHeaderHandler = class CheMultiuserAuthorizationHeaderHandler {
|
|
19
|
-
constructor(tokenHandler) {
|
|
20
|
-
this.tokenHandler = tokenHandler;
|
|
21
|
-
}
|
|
22
12
|
async get() {
|
|
23
|
-
|
|
24
|
-
return { headers: { '
|
|
13
|
+
// to-do : Fetch the cookies from user api and pass it here
|
|
14
|
+
return { headers: { 'cookie': `` } };
|
|
25
15
|
}
|
|
26
16
|
};
|
|
27
17
|
CheMultiuserAuthorizationHeaderHandler = __decorate([
|
|
28
|
-
inversify_1.injectable()
|
|
29
|
-
__param(0, inversify_1.inject(inversify_types_1.TYPES.ITokenHandler)),
|
|
30
|
-
__metadata("design:paramtypes", [Object])
|
|
18
|
+
inversify_1.injectable()
|
|
31
19
|
], CheMultiuserAuthorizationHeaderHandler);
|
|
32
20
|
exports.CheMultiuserAuthorizationHeaderHandler = CheMultiuserAuthorizationHeaderHandler;
|
|
33
21
|
//# sourceMappingURL=CheMultiuserAuthorizationHeaderHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheMultiuserAuthorizationHeaderHandler.js","sourceRoot":"","sources":["../../../../utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CheMultiuserAuthorizationHeaderHandler.js","sourceRoot":"","sources":["../../../../utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.ts"],"names":[],"mappings":";;;;;;;;;AAWA,yCAAuC;AAGvC,IAAa,sCAAsC,GAAnD,MAAa,sCAAsC;IAE/C,KAAK,CAAC,GAAG;QACL,4DAA4D;QAC5D,OAAO,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC;IACzC,CAAC;CACJ,CAAA;AANY,sCAAsC;IADlD,sBAAU,EAAE;GACA,sCAAsC,CAMlD;AANY,wFAAsC"}
|
|
@@ -23,15 +23,15 @@ const axios_1 = __importDefault(require("axios"));
|
|
|
23
23
|
const querystring_1 = __importDefault(require("querystring"));
|
|
24
24
|
const inversify_1 = require("inversify");
|
|
25
25
|
const TestConstants_1 = require("../../../TestConstants");
|
|
26
|
-
const KeycloackUrlHandler_1 = require("../../KeycloackUrlHandler");
|
|
27
26
|
let CheMultiuserTokenHandler = class CheMultiuserTokenHandler {
|
|
28
27
|
async get() {
|
|
29
|
-
|
|
28
|
+
// to-do: Login to the che-dashboard and fetch the authorization related info
|
|
29
|
+
const keycloakUrl = '';
|
|
30
30
|
const params = {
|
|
31
31
|
client_id: 'che-public',
|
|
32
32
|
username: TestConstants_1.TestConstants.TS_SELENIUM_USERNAME,
|
|
33
33
|
password: TestConstants_1.TestConstants.TS_SELENIUM_PASSWORD,
|
|
34
|
-
grant_type: 'password'
|
|
34
|
+
grant_type: 'password',
|
|
35
35
|
};
|
|
36
36
|
try {
|
|
37
37
|
const responseToObtainBearerToken = await axios_1.default.post(keycloakUrl, querystring_1.default.stringify(params));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheMultiuserTokenHandler.js","sourceRoot":"","sources":["../../../../utils/requestHandlers/tokens/CheMultiuserTokenHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,kDAA0B;AAC1B,8DAAsC;AACtC,yCAAuC;AACvC,0DAAuD;
|
|
1
|
+
{"version":3,"file":"CheMultiuserTokenHandler.js","sourceRoot":"","sources":["../../../../utils/requestHandlers/tokens/CheMultiuserTokenHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,kDAA0B;AAC1B,8DAAsC;AACtC,yCAAuC;AACvC,0DAAuD;AAKvD,IAAa,wBAAwB,GAArC,MAAa,wBAAwB;IACnC,KAAK,CAAC,GAAG;QACP,+EAA+E;QAC/E,MAAM,WAAW,GAAG,EAAE,CAAC;QAEvB,MAAM,MAAM,GAAG;YACb,SAAS,EAAE,YAAY;YACvB,QAAQ,EAAE,6BAAa,CAAC,oBAAoB;YAC5C,QAAQ,EAAE,6BAAa,CAAC,oBAAoB;YAC5C,UAAU,EAAE,UAAU;SACvB,CAAC;QAEF,IAAI;YACF,MAAM,2BAA2B,GAAG,MAAM,eAAK,CAAC,IAAI,CAClD,WAAW,EACX,qBAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAC9B,CAAC;YACF,OAAO,2BAA2B,CAAC,IAAI,CAAC,YAAY,CAAC;SACtD;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,GAAG,CAAC,uCAAuC,WAAW,EAAE,CAAC,CAAC;YAClE,MAAM,GAAG,CAAC;SACX;IACH,CAAC;CACF,CAAA;AAvBY,wBAAwB;IADpC,sBAAU,EAAE;GACA,wBAAwB,CAuBpC;AAvBY,4DAAwB"}
|
package/driver/CheReporter.ts
CHANGED
|
@@ -18,7 +18,7 @@ import { logging } from 'selenium-webdriver';
|
|
|
18
18
|
import { DriverHelper } from '../utils/DriverHelper';
|
|
19
19
|
import { ScreenCatcher } from '../utils/ScreenCatcher';
|
|
20
20
|
import { ITestWorkspaceUtil } from '../utils/workspace/ITestWorkspaceUtil';
|
|
21
|
-
import { PreferencesHandler
|
|
21
|
+
// import { PreferencesHandler } from '../utils/PreferencesHandler';
|
|
22
22
|
import { CheApiRequestHandler } from '../utils/requestHandlers/CheApiRequestHandler';
|
|
23
23
|
import { TimeoutConstants } from '../TimeoutConstants';
|
|
24
24
|
import { Logger } from '../utils/Logger';
|
|
@@ -32,7 +32,7 @@ const sanitizer: Sanitizer = e2eContainer.get(CLASSES.Sanitizer);
|
|
|
32
32
|
let methodIndex: number = 0;
|
|
33
33
|
let deleteScreencast: boolean = true;
|
|
34
34
|
let testWorkspaceUtil: ITestWorkspaceUtil = e2eContainer.get(TYPES.WorkspaceUtil);
|
|
35
|
-
let preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
|
|
35
|
+
// let preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
|
|
36
36
|
|
|
37
37
|
class CheReporter extends mocha.reporters.Spec {
|
|
38
38
|
|
|
@@ -86,8 +86,8 @@ class CheReporter extends mocha.reporters.Spec {
|
|
|
86
86
|
if (TestConstants.TS_SELENIUM_RESPONSE_INTERCEPTOR) {
|
|
87
87
|
CheApiRequestHandler.enableResponseInterceptor();
|
|
88
88
|
}
|
|
89
|
-
await preferencesHandler.setConfirmExit(AskForConfirmationType.never);
|
|
90
|
-
await preferencesHandler.setTerminalType(TerminalRendererType.dom);
|
|
89
|
+
// await preferencesHandler.setConfirmExit(AskForConfirmationType.never);
|
|
90
|
+
// await preferencesHandler.setTerminalType(TerminalRendererType.dom);
|
|
91
91
|
});
|
|
92
92
|
|
|
93
93
|
runner.on('test', async function (test: mocha.Test) {
|
package/index.ts
CHANGED
|
@@ -9,7 +9,6 @@ export * from './driver/IDriver';
|
|
|
9
9
|
export * from './utils/AnimationChecker';
|
|
10
10
|
export * from './utils/BrowserTabsUtil';
|
|
11
11
|
export * from './utils/DriverHelper';
|
|
12
|
-
export * from './utils/KeycloackUrlHandler';
|
|
13
12
|
export * from './utils/Logger';
|
|
14
13
|
export * from './utils/PreferencesHandler';
|
|
15
14
|
export * from './utils/requestHandlers/CheApiRequestHandler';
|
|
@@ -39,6 +38,7 @@ export * from './pageobjects/ide/LeftToolBar';
|
|
|
39
38
|
export * from './pageobjects/ide/NavigationBar';
|
|
40
39
|
export * from './pageobjects/ide/NotificationCenter';
|
|
41
40
|
export * from './pageobjects/ide/OpenDialogWidget';
|
|
41
|
+
export * from './pageobjects/ide/OpenEditors';
|
|
42
42
|
export * from './pageobjects/ide/OpenWorkspaceWidget';
|
|
43
43
|
export * from './pageobjects/ide/plugins/GitHubPullRequestPlugin';
|
|
44
44
|
export * from './pageobjects/ide/plugins/GitPlugin';
|
package/mocha-all-factories.json
CHANGED
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
"require": "source-map-support/register",
|
|
8
8
|
"spec": [
|
|
9
9
|
"dist/tests/login/Login.spec.js",
|
|
10
|
-
"dist/tests/e2e/factories
|
|
10
|
+
"dist/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.js",
|
|
11
|
+
"dist/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.js"
|
|
11
12
|
]
|
|
12
13
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-che/che-e2e",
|
|
3
|
-
"version": "7.44.
|
|
3
|
+
"version": "7.44.1-dev-bc873f3",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"@types/selenium-webdriver": "3.0.16",
|
|
40
40
|
"axios": "^0.25.0",
|
|
41
41
|
"chai": "4.2.0",
|
|
42
|
-
"chromedriver": "
|
|
42
|
+
"chromedriver": "^99.0.0",
|
|
43
43
|
"mocha": "^9.1.3",
|
|
44
44
|
"rimraf": "2.6.2",
|
|
45
45
|
"selenium-webdriver": "3.6.0",
|
|
@@ -60,7 +60,6 @@ export class Dashboard {
|
|
|
60
60
|
|
|
61
61
|
async openDashboard() {
|
|
62
62
|
Logger.debug('Dashboard.openDashboard');
|
|
63
|
-
|
|
64
63
|
await this.driverHelper.getDriver().navigate().to(TestConstants.TS_SELENIUM_BASE_URL);
|
|
65
64
|
await this.waitPage();
|
|
66
65
|
|
|
@@ -109,4 +108,10 @@ export class Dashboard {
|
|
|
109
108
|
await this.driverHelper.waitPresence(By.css(Dashboard.WORKSPACE_STARTING_PAGE_CSS), timeout);
|
|
110
109
|
}
|
|
111
110
|
|
|
111
|
+
async getRecentWorkspaceName(timeout: number = TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
112
|
+
Logger.debug(`Dashboard.recentWorkspaceName`);
|
|
113
|
+
|
|
114
|
+
return await this.driverHelper.waitAndGetText(By.css('[data-testid="recent-workspace-item"]'), timeout);
|
|
115
|
+
}
|
|
116
|
+
|
|
112
117
|
}
|
|
@@ -85,7 +85,7 @@ export class WorkspaceDetails {
|
|
|
85
85
|
Logger.debug(`WorkspaceDetails.openWorkspace "${namespace}/${workspaceName}"`);
|
|
86
86
|
|
|
87
87
|
await this.clickOnOpenButton(timeout);
|
|
88
|
-
await this.driverHelper.waitVisibility(By.css(Ide.
|
|
88
|
+
await this.driverHelper.waitVisibility(By.css(Ide.THEIA_EDITOR_CSS), TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT);
|
|
89
89
|
await this.testWorkspaceUtil.waitWorkspaceStatus(namespace, workspaceName, WorkspaceStatus.STARTING);
|
|
90
90
|
}
|
|
91
91
|
|
package/pageobjects/ide/Ide.ts
CHANGED
|
@@ -29,7 +29,7 @@ export enum LeftToolbarButton {
|
|
|
29
29
|
export class Ide {
|
|
30
30
|
public static readonly EXPLORER_BUTTON_ID: string = 'shell-tab-explorer-view-container';
|
|
31
31
|
public static readonly SELECTED_EXPLORER_BUTTON_CSS: string = 'li#shell-tab-explorer-view-container.theia-mod-active';
|
|
32
|
-
public static readonly
|
|
32
|
+
public static readonly THEIA_EDITOR_CSS: string = '#theia-main-content-panel';
|
|
33
33
|
public static readonly SELECTED_GIT_BUTTON_XPATH: string = '(//ul[@class=\'p-TabBar-content\']//li[@title=\'Git\' and contains(@class, \'p-mod-current\')])[1]';
|
|
34
34
|
private static readonly TOP_MENU_PANEL_CSS: string = '#theia-app-shell #theia-top-panel .p-MenuBar-content';
|
|
35
35
|
private static readonly LEFT_CONTENT_PANEL_CSS: string = '#theia-left-content-panel';
|
|
@@ -41,21 +41,34 @@ export class Ide {
|
|
|
41
41
|
@inject(CLASSES.NotificationCenter) private readonly notificationCenter: NotificationCenter
|
|
42
42
|
) { }
|
|
43
43
|
|
|
44
|
+
/**
|
|
45
|
+
* @deprecated Method deprecated. Iframe is not available, Replace it with waitForEditor() or waitIde() method incase for conditional wait
|
|
46
|
+
* @see Ide.waitForEditor()
|
|
47
|
+
*/
|
|
44
48
|
async waitAndSwitchToIdeFrame(timeout: number = TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT) {
|
|
45
49
|
Logger.debug('Ide.waitAndSwitchToIdeFrame');
|
|
46
50
|
try {
|
|
47
51
|
await this.driverHelper.waitAndSwitchToFrame(By.css(Ide.IDE_IFRAME_CSS), timeout);
|
|
48
52
|
} catch (err) {
|
|
49
53
|
if (err instanceof error.StaleElementReferenceError) {
|
|
50
|
-
Logger.warn('StaleElementException
|
|
54
|
+
Logger.warn('StaleElementException occurred during waiting for IDE. Sleeping for 2 secs and retrying.');
|
|
51
55
|
this.driverHelper.wait(2000);
|
|
52
|
-
|
|
56
|
+
try {
|
|
57
|
+
await this.driverHelper.waitAndSwitchToFrame(By.css(Ide.IDE_IFRAME_CSS), timeout);
|
|
58
|
+
} catch (err) {
|
|
59
|
+
if (err instanceof error.TimeoutError) {
|
|
60
|
+
Logger.warn(`Iframe is not available even after ${timeout} milliseconds, checking for visibility of #theia-main-content-panel.`);
|
|
61
|
+
await this.driverHelper.isVisible(By.css('#theia-main-content-panel'));
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
throw err;
|
|
65
|
+
}
|
|
53
66
|
return;
|
|
54
67
|
}
|
|
55
68
|
|
|
56
69
|
if (err instanceof error.TimeoutError) {
|
|
57
|
-
Logger.
|
|
58
|
-
|
|
70
|
+
Logger.warn(`Iframe is not available even after ${timeout} milliseconds, checking for visibility of #theia-main-content-panel.`);
|
|
71
|
+
await this.driverHelper.isVisible(By.css('#theia-main-content-panel'));
|
|
59
72
|
}
|
|
60
73
|
|
|
61
74
|
Logger.error(`Switching to IDE frame failed.`);
|
|
@@ -63,6 +76,16 @@ export class Ide {
|
|
|
63
76
|
}
|
|
64
77
|
}
|
|
65
78
|
|
|
79
|
+
async waitForEditor(timeout: number = TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT) {
|
|
80
|
+
Logger.debug('Ide.waitForEditor');
|
|
81
|
+
try {
|
|
82
|
+
await this.driverHelper.waitVisibility(By.css(Ide.THEIA_EDITOR_CSS), timeout);
|
|
83
|
+
} catch (err) {
|
|
84
|
+
Logger.warn(`Editor is not displayed even after ${timeout} milliseconds.`);
|
|
85
|
+
throw err;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
|
|
66
89
|
async waitNotification(notificationText: string, timeout: number = TimeoutConstants.TS_NOTIFICATION_CENTER_TIMEOUT) {
|
|
67
90
|
Logger.debug(`Ide.waitNotification "${notificationText}"`);
|
|
68
91
|
|
|
@@ -157,11 +180,11 @@ export class Ide {
|
|
|
157
180
|
|
|
158
181
|
Logger.debug('Ide.waitWorkspaceAndIde');
|
|
159
182
|
|
|
160
|
-
await this.
|
|
183
|
+
await this.waitForEditor(timeout);
|
|
161
184
|
await this.waitIde(timeout);
|
|
162
185
|
}
|
|
163
186
|
|
|
164
|
-
async waitIde(timeout: number = TimeoutConstants.
|
|
187
|
+
async waitIde(timeout: number = TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT) {
|
|
165
188
|
Logger.debug('Ide.waitIde');
|
|
166
189
|
|
|
167
190
|
const mainIdeParts: Array<By> = [By.css(Ide.TOP_MENU_PANEL_CSS), By.css(Ide.LEFT_CONTENT_PANEL_CSS), By.id(Ide.EXPLORER_BUTTON_ID)];
|
|
@@ -76,6 +76,9 @@ export class PreviewWidget {
|
|
|
76
76
|
}, timeout);
|
|
77
77
|
}
|
|
78
78
|
|
|
79
|
+
/**
|
|
80
|
+
* @deprecated Method deprecated. Iframe is not available anymore
|
|
81
|
+
*/
|
|
79
82
|
async waitAndSwitchToWidgetFrame() {
|
|
80
83
|
Logger.debug('PreviewWidget.waitAndSwitchToWidgetFrame');
|
|
81
84
|
|
|
@@ -98,8 +101,6 @@ export class PreviewWidget {
|
|
|
98
101
|
await this.driverHelper.getDriver().wait(async () => {
|
|
99
102
|
const isApplicationTitleVisible: boolean = await this.driverHelper.isVisible(contentLocator);
|
|
100
103
|
if (isApplicationTitleVisible) {
|
|
101
|
-
await this.driverHelper.getDriver().switchTo().defaultContent();
|
|
102
|
-
await this.ide.waitAndSwitchToIdeFrame();
|
|
103
104
|
return true;
|
|
104
105
|
}
|
|
105
106
|
|
|
@@ -125,6 +126,9 @@ export class PreviewWidget {
|
|
|
125
126
|
await this.driverHelper.waitAndClick(PreviewWidget.WIDGET_REFRESH_BUTTON_LOCATOR);
|
|
126
127
|
}
|
|
127
128
|
|
|
129
|
+
/**
|
|
130
|
+
* @deprecated Method deprecated. Iframe is not available.
|
|
131
|
+
*/
|
|
128
132
|
async switchBackToIdeFrame() {
|
|
129
133
|
Logger.debug('PreviewWidget.switchBackToIdeFrame');
|
|
130
134
|
|
|
@@ -18,6 +18,7 @@ import { By, error } from 'selenium-webdriver';
|
|
|
18
18
|
import { Editor } from './Editor';
|
|
19
19
|
import { Logger } from '../../utils/Logger';
|
|
20
20
|
import { TimeoutConstants } from '../../TimeoutConstants';
|
|
21
|
+
import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
|
|
21
22
|
|
|
22
23
|
@injectable()
|
|
23
24
|
export class ProjectTree {
|
|
@@ -26,7 +27,8 @@ export class ProjectTree {
|
|
|
26
27
|
constructor(
|
|
27
28
|
@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper,
|
|
28
29
|
@inject(CLASSES.Ide) private readonly ide: Ide,
|
|
29
|
-
@inject(CLASSES.Editor) private readonly editor: Editor
|
|
30
|
+
@inject(CLASSES.Editor) private readonly editor: Editor,
|
|
31
|
+
@inject(CLASSES.BrowserTabsUtil) private readonly browserTabsUtil: BrowserTabsUtil) { }
|
|
30
32
|
|
|
31
33
|
async clickCollapseAllButton() {
|
|
32
34
|
Logger.debug('ProjectTree.clickCollapseAllButton');
|
|
@@ -237,9 +239,8 @@ export class ProjectTree {
|
|
|
237
239
|
|
|
238
240
|
if (!isProjectFolderVisible) {
|
|
239
241
|
Logger.trace(`ProjectTree.waitProjectImported project not located, reloading page.`);
|
|
240
|
-
await this.
|
|
241
|
-
await this.ide.
|
|
242
|
-
await this.ide.waitIde();
|
|
242
|
+
await this.browserTabsUtil.refreshPage();
|
|
243
|
+
await this.ide.waitWorkspaceAndIde();
|
|
243
244
|
await this.openProjectTreeContainer();
|
|
244
245
|
continue;
|
|
245
246
|
}
|
|
@@ -253,13 +254,11 @@ export class ProjectTree {
|
|
|
253
254
|
|
|
254
255
|
if (!isRootSubItemVisible) {
|
|
255
256
|
Logger.trace(`ProjectTree.waitProjectImported sub-items not found, reloading page.`);
|
|
256
|
-
await this.
|
|
257
|
-
await this.ide.
|
|
258
|
-
await this.ide.waitIde();
|
|
257
|
+
await this.browserTabsUtil.refreshPage();
|
|
258
|
+
await this.ide.waitWorkspaceAndIde();
|
|
259
259
|
await this.openProjectTreeContainer();
|
|
260
260
|
continue;
|
|
261
261
|
}
|
|
262
|
-
|
|
263
262
|
return;
|
|
264
263
|
}
|
|
265
264
|
|
|
@@ -281,10 +280,9 @@ export class ProjectTree {
|
|
|
281
280
|
|
|
282
281
|
if (!isProjectFolderVisible) {
|
|
283
282
|
Logger.trace(`ProjectTree.waitProjectImportedNoSubfolder project not located, reloading page.`);
|
|
284
|
-
await this.
|
|
283
|
+
await this.browserTabsUtil.refreshPage();
|
|
285
284
|
await this.driverHelper.wait(triesPolling);
|
|
286
|
-
await this.ide.
|
|
287
|
-
await this.ide.waitIde();
|
|
285
|
+
await this.ide.waitWorkspaceAndIde();
|
|
288
286
|
await this.openProjectTreeContainer();
|
|
289
287
|
continue;
|
|
290
288
|
}
|
|
@@ -27,7 +27,7 @@ const workspaceSampleName: string = 'dotnet-web-simple';
|
|
|
27
27
|
const fileFolderPath: string = `${workspaceSampleName}`;
|
|
28
28
|
const tabTitle: string = 'Program.cs';
|
|
29
29
|
// const codeNavigationClassName: string = '[metadata] Console.cs';
|
|
30
|
-
const stack : string = '.NET Core';
|
|
30
|
+
const stack : string = 'ASP.NET Core Web Application';
|
|
31
31
|
const updateDependenciesTaskName: string = 'update dependencies';
|
|
32
32
|
const buildTaskName: string = 'build';
|
|
33
33
|
const runTaskName: string = 'run';
|
|
@@ -25,32 +25,30 @@ const codeExecutionTests: CodeExecutionTests = e2eContainer.get(CLASSES.CodeExec
|
|
|
25
25
|
const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
|
|
26
26
|
|
|
27
27
|
const workspaceStack: string = 'Go';
|
|
28
|
-
const workspaceSampleName: string = 'example';
|
|
29
|
-
const workspaceSubfolderName: string = '
|
|
28
|
+
const workspaceSampleName: string = 'golang-example';
|
|
29
|
+
const workspaceSubfolderName: string = 'template';
|
|
30
30
|
const fileFolderPath: string = `${workspaceSampleName}/${workspaceSubfolderName}`;
|
|
31
31
|
const fileName: string = `main.go`;
|
|
32
32
|
|
|
33
|
-
const taskRunServer: string = '
|
|
34
|
-
const taskStopServer: string = '
|
|
35
|
-
const taskTestOutyet: string = '
|
|
33
|
+
const taskRunServer: string = 'run-outyet';
|
|
34
|
+
const taskStopServer: string = 'stop-outyet';
|
|
35
|
+
const taskTestOutyet: string = 'test-outyet';
|
|
36
36
|
const notificationText: string = 'Process 8080-tcp is now listening on port 8080. Open it ?';
|
|
37
37
|
let workspaceName: string;
|
|
38
38
|
|
|
39
39
|
suite(`${workspaceStack} test`, async () => {
|
|
40
40
|
|
|
41
41
|
suite(`Create ${workspaceStack} workspace`, async () => {
|
|
42
|
-
test('Workaround for issue #16113', async () => {
|
|
43
|
-
Logger.warn(`Manually setting a preference for golang devfile LS based on issue: https://github.com/eclipse/che/issues/16113`);
|
|
44
|
-
await preferencesHandler.setUseGoLanaguageServer();
|
|
45
|
-
});
|
|
46
42
|
workspaceHandlingTests.createAndOpenWorkspace(workspaceStack);
|
|
47
|
-
|
|
48
43
|
test('Register running workspace', async () => {
|
|
49
44
|
workspaceName = WorkspaceHandlingTests.getWorkspaceName();
|
|
50
45
|
CheReporter.registerRunningWorkspace(workspaceName);
|
|
51
46
|
});
|
|
52
|
-
|
|
53
47
|
projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceSubfolderName, false);
|
|
48
|
+
test('Workaround for issue #16113', async () => {
|
|
49
|
+
Logger.warn(`Manually setting a preference for golang devFile LS based on issue: https://github.com/eclipse/che/issues/16113`);
|
|
50
|
+
await preferencesHandler.setPreferenceUsingUI('go.useLanguageServer', true);
|
|
51
|
+
});
|
|
54
52
|
});
|
|
55
53
|
|
|
56
54
|
suite('Test opening file', async () => {
|
|
@@ -59,24 +57,24 @@ suite(`${workspaceStack} test`, async () => {
|
|
|
59
57
|
});
|
|
60
58
|
|
|
61
59
|
suite('Test golang example', async () => {
|
|
62
|
-
codeExecutionTests.runTask(taskTestOutyet,
|
|
60
|
+
codeExecutionTests.runTask(taskTestOutyet, 80_000);
|
|
63
61
|
codeExecutionTests.closeTerminal(taskTestOutyet);
|
|
64
62
|
});
|
|
65
63
|
|
|
66
64
|
suite('Run golang example server', async () => {
|
|
67
65
|
codeExecutionTests.runTaskWithNotification(taskRunServer, notificationText, 40_000);
|
|
68
|
-
codeExecutionTests.runTask(taskStopServer,
|
|
66
|
+
codeExecutionTests.runTask(taskStopServer, 8_000);
|
|
69
67
|
});
|
|
70
68
|
|
|
71
69
|
suite(`'Language server validation'`, async () => {
|
|
72
|
-
commonLanguageServerTests.suggestionInvoking(fileName,
|
|
73
|
-
commonLanguageServerTests.autocomplete(fileName,
|
|
74
|
-
commonLanguageServerTests.errorHighlighting(fileName, 'error;\n',
|
|
70
|
+
commonLanguageServerTests.suggestionInvoking(fileName, 41, 49, 'Parse');
|
|
71
|
+
commonLanguageServerTests.autocomplete(fileName, 41, 49, 'Parse');
|
|
72
|
+
commonLanguageServerTests.errorHighlighting(fileName, 'error;\n', 41);
|
|
75
73
|
// commonLanguageServerTests.goToImplementations(fileName, 42, 10, 'flag.go'); // codenavigation is inconsistent https://github.com/eclipse/che/issues/16929
|
|
76
74
|
});
|
|
77
75
|
|
|
78
76
|
suite('Stop and remove workspace', async() => {
|
|
79
|
-
test(`Stop and
|
|
77
|
+
test(`Stop and remove workspace`, async () => {
|
|
80
78
|
await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
|
|
81
79
|
});
|
|
82
80
|
});
|
|
@@ -59,14 +59,14 @@ suite('Openshift connector user story', async () => {
|
|
|
59
59
|
'location': 'https://github.com/maxura/nodejs-hello-world.git',
|
|
60
60
|
'type': 'git'
|
|
61
61
|
}
|
|
62
|
-
}
|
|
62
|
+
},
|
|
63
63
|
],
|
|
64
64
|
|
|
65
65
|
wsConfig.components = [
|
|
66
66
|
{
|
|
67
67
|
'id': 'redhat/vscode-openshift-connector/latest',
|
|
68
68
|
'type': 'chePlugin'
|
|
69
|
-
}
|
|
69
|
+
},
|
|
70
70
|
];
|
|
71
71
|
|
|
72
72
|
await browserTabsUtil.navigateTo(TestConstants.TS_SELENIUM_BASE_URL);
|