@eclipse-che/che-e2e 7.45.0-dev-0129fe6 → 7.45.0-dev-60c4bc4
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 +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 +15 -2
- package/dist/pageobjects/dashboard/Dashboard.js.map +1 -1
- package/dist/pageobjects/ide/Ide.js +14 -4
- package/dist/pageobjects/ide/Ide.js.map +1 -1
- package/dist/pageobjects/ide/ProjectTree.js +9 -5
- 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 +10 -7
- 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/testsLibrary/LanguageServerTests.js +1 -0
- package/dist/testsLibrary/LanguageServerTests.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 +14 -2
- package/pageobjects/ide/Ide.ts +13 -4
- package/pageobjects/ide/ProjectTree.ts +6 -5
- 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 +126 -123
- package/tests/plugins/GitHubPullRequestPlugin.spec.ts +3 -2
- package/testsLibrary/LanguageServerTests.ts +1 -0
- 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
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// /*********************************************************************
|
|
3
|
-
// * Copyright (c)
|
|
3
|
+
// * Copyright (c) 2022 Red Hat, Inc.
|
|
4
4
|
// *
|
|
5
5
|
// * This program and the accompanying materials are made
|
|
6
6
|
// * available under the terms of the Eclipse Public License 2.0
|
|
@@ -16,25 +16,28 @@ const inversify_config_1 = require("../../../inversify.config");
|
|
|
16
16
|
const inversify_types_1 = require("../../../inversify.types");
|
|
17
17
|
const TestConstants_1 = require("../../../TestConstants");
|
|
18
18
|
const CheReporter_1 = __importDefault(require("../../../driver/CheReporter"));
|
|
19
|
+
const preferencesHandler = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.PreferencesHandler);
|
|
20
|
+
const workspaceHandlingTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.WorkspaceHandlingTests);
|
|
19
21
|
const projectAndFileTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectAndFileTests);
|
|
20
22
|
const browserTabsUtil = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.BrowserTabsUtil);
|
|
21
|
-
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
|
|
23
|
+
let factoryUrl = `${TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL}/f?url=https://github.com/che-samples/console-java-simple/tree/java1.11`;
|
|
24
|
+
const workspaceSampleName = 'console-java-simple';
|
|
25
|
+
const workspaceRootFolderName = 'src';
|
|
26
|
+
const fileFolderPath = `${workspaceSampleName}/${workspaceRootFolderName}/main/java/org/eclipse/che/examples`;
|
|
27
|
+
const tabTitle = 'HelloWorld.java';
|
|
28
|
+
let workspaceName = 'console-java-simple';
|
|
25
29
|
suite('Workspace creation via factory url', async () => {
|
|
26
|
-
let factoryUrl = `${TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL}/f?url=https://github.com/che-samples/console-java-simple/tree/java1.11`;
|
|
27
|
-
const workspaceSampleName = 'console-java-simple';
|
|
28
|
-
const workspaceRootFolderName = 'src';
|
|
29
|
-
const fileFolderPath = `${workspaceSampleName}/${workspaceRootFolderName}/main/java/org/eclipse/che/examples`;
|
|
30
|
-
const tabTitle = 'HelloWorld.java';
|
|
31
30
|
suite('Open factory URL', async () => {
|
|
32
31
|
test(`Navigating to factory URL`, async () => {
|
|
33
32
|
await browserTabsUtil.navigateTo(factoryUrl);
|
|
34
33
|
});
|
|
35
34
|
});
|
|
36
35
|
suite('Wait workspace readyness', async () => {
|
|
37
|
-
projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName
|
|
36
|
+
projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName);
|
|
37
|
+
test('Set confirmExit preference to never', async () => {
|
|
38
|
+
CheReporter_1.default.registerRunningWorkspace(workspaceName);
|
|
39
|
+
await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
|
|
40
|
+
});
|
|
38
41
|
});
|
|
39
42
|
suite('Check imported project', async () => {
|
|
40
43
|
projectAndFileTests.openFile(fileFolderPath, tabTitle);
|
|
@@ -42,9 +45,7 @@ suite('Workspace creation via factory url', async () => {
|
|
|
42
45
|
});
|
|
43
46
|
suite('Stopping and deleting the workspace', async () => {
|
|
44
47
|
test('Stop and remove workspace', async () => {
|
|
45
|
-
|
|
46
|
-
CheReporter_1.default.registerRunningWorkspace(workspaceName);
|
|
47
|
-
await testWorkspaceUtils.cleanUpRunningWorkspace(workspaceName);
|
|
48
|
+
await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
|
|
48
49
|
});
|
|
49
50
|
});
|
|
50
51
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DirectUrlFactoryWithSpecificBranchTest.spec.js","sourceRoot":"","sources":["../../../../tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.ts"],"names":[],"mappings":";AAAA,yEAAyE;AACzE,sCAAsC;AACtC,KAAK;AACL,0DAA0D;AAC1D,iEAAiE;AACjE,kEAAkE;AAClE,KAAK;AACL,sCAAsC;AACtC,2EAA2E;;;;;AAE3E,gEAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"DirectUrlFactoryWithSpecificBranchTest.spec.js","sourceRoot":"","sources":["../../../../tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.ts"],"names":[],"mappings":";AAAA,yEAAyE;AACzE,sCAAsC;AACtC,KAAK;AACL,0DAA0D;AAC1D,iEAAiE;AACjE,kEAAkE;AAClE,KAAK;AACL,sCAAsC;AACtC,2EAA2E;;;;;AAE3E,gEAAyD;AACzD,8DAAmD;AACnD,0DAAuD;AAEvD,8EAAsD;AAKtD,MAAM,kBAAkB,GAAuB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,kBAAkB,CAAC,CAAC;AAC5F,MAAM,sBAAsB,GAA2B,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,sBAAsB,CAAC,CAAC;AACxG,MAAM,mBAAmB,GAAwB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,mBAAmB,CAAC,CAAC;AAC/F,MAAM,eAAe,GAAoB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAC;AAEnF,IAAI,UAAU,GAAY,GAAG,6BAAa,CAAC,oBAAoB,yEAAyE,CAAC;AACzI,MAAM,mBAAmB,GAAW,qBAAqB,CAAC;AAC1D,MAAM,uBAAuB,GAAW,KAAK,CAAC;AAC9C,MAAM,cAAc,GAAW,GAAG,mBAAmB,IAAI,uBAAuB,qCAAqC,CAAC;AACtH,MAAM,QAAQ,GAAW,iBAAiB,CAAC;AAC3C,IAAI,aAAa,GAAW,qBAAqB,CAAC;AAElD,KAAK,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;IACnD,KAAK,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;QACjC,IAAI,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;YACzC,MAAM,eAAe,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;QACzC,mBAAmB,CAAC,sBAAsB,CAAC,mBAAmB,EAAE,uBAAuB,CAAC,CAAC;QAEzF,IAAI,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;YACnD,qBAAW,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAC;YAEpD,MAAM,kBAAkB,CAAC,oBAAoB,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;QACtF,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,wBAAwB,EAAE,KAAK,IAAI,EAAE;QACvC,mBAAmB,CAAC,QAAQ,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QACvD,mBAAmB,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,KAAK,CAAE,qCAAqC,EAAE,KAAK,IAAI,EAAE;QACrD,IAAI,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;YACzC,MAAM,sBAAsB,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC,CAAC"}
|
|
@@ -49,6 +49,7 @@ const terminal = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.T
|
|
|
49
49
|
const warningDialog = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.DialogWindow);
|
|
50
50
|
const debugView = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.DebugView);
|
|
51
51
|
const welcomeControllerJavaFileName = 'WelcomeController.java';
|
|
52
|
+
const factoryUrl = `${TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL}/f?url=https://raw.githubusercontent.com/eclipse/che-devfile-registry/master/devfiles/java-maven/devfile.yaml`;
|
|
52
53
|
const SpringAppLocators = {
|
|
53
54
|
springTitleLocator: selenium_webdriver_1.By.xpath('//div[@class=\'container-fluid\']//h2[text()=\'Welcome\']'),
|
|
54
55
|
springMenuButtonLocator: selenium_webdriver_1.By.css('button[data-target=\'#main-navbar\']'),
|
|
@@ -58,7 +59,7 @@ const SpringAppLocators = {
|
|
|
58
59
|
};
|
|
59
60
|
// this test checks only workspace created from "web-nodejs-sample" https://github.com/devfile/devworkspace-operator/blob/main/samples/flattened_theia-next.yaml.
|
|
60
61
|
suite('Workspace creation via factory url', async () => {
|
|
61
|
-
let factoryUrl = `${
|
|
62
|
+
// let factoryUrl : string = `${TestConstants.TS_SELENIUM_DEVWORKSPACE_URL}`;
|
|
62
63
|
const workspaceRootFolderName = 'src';
|
|
63
64
|
suite('Open factory URL', async () => {
|
|
64
65
|
// this is DevWorkspace test specific - we create the test ws. using factory instead of chectl
|
|
@@ -253,12 +254,14 @@ async function sendRequestToDebugApp(urlToApp) {
|
|
|
253
254
|
await httpClient.get(urlToApp);
|
|
254
255
|
}
|
|
255
256
|
catch (error) {
|
|
256
|
-
if (error
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
257
|
+
if (error instanceof Error) {
|
|
258
|
+
if (error.message === 'timeout of 1000ms exceeded') {
|
|
259
|
+
console.log('>>>>The debugger is set >>>>>>>>>>>>>>>>>>> ' + error.message);
|
|
260
|
+
}
|
|
261
|
+
else {
|
|
262
|
+
const { data } = await httpClient.get(urlToApp);
|
|
263
|
+
console.log('>>>>>>>seems the app. is not set under debug properly: >>>>>>>>>>>>>>' + data);
|
|
264
|
+
}
|
|
262
265
|
}
|
|
263
266
|
}
|
|
264
267
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DevWorkspaceHappyPath.spec.js","sourceRoot":"","sources":["../../../tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAUA,2DAAgD;AAIhD,6DAAsD;AAEtD,mDAAmE;AACnE,2DAAoD;AACpD,+CAA4C;AAG5C,uDAAoD;AACpD,6DAA0D;AAE1D,uCAAyB;AACzB,kDAA0B;AAC1B,2EAAmD;AAEnD,MAAM,GAAG,GAAQ,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,GAAG,CAAC,CAAC;AAC/C,MAAM,WAAW,GAAgB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,WAAW,CAAC,CAAC;AACvE,MAAM,eAAe,GAAoB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAC;AACnF,MAAM,WAAW,GAAW,uBAAuB,CAAC;AACpD,MAAM,uBAAuB,GAAW,KAAK,CAAC;AAC9C,MAAM,gBAAgB,GAAW,GAAG,WAAW,IAAI,uBAAuB,kDAAkD,CAAC;AAC7H,MAAM,YAAY,GAAW,2BAA2B,CAAC;AACzD,MAAM,MAAM,GAAW,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,MAAM,CAAC,CAAC;AACxD,MAAM,iBAAiB,GAAW,YAAY,CAAC;AAC/C,MAAM,YAAY,GAAiB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAC;AAC1E,MAAM,uBAAuB,GAAW,yBAAyB,CAAC;AAClE,MAAM,OAAO,GAAY,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,OAAO,CAAC,CAAC;AAC3D,MAAM,eAAe,GAAG,QAAQ,CAAC;AACjC,MAAM,QAAQ,GAAa,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,QAAQ,CAAC,CAAC;AAC9D,MAAM,aAAa,GAAiB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAC;AAC3E,MAAM,SAAS,GAAc,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,SAAS,CAAC,CAAC;AACjE,MAAM,6BAA6B,GAAW,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"DevWorkspaceHappyPath.spec.js","sourceRoot":"","sources":["../../../tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,6 @@ const inversify_types_1 = require("../../inversify.types");
|
|
|
18
18
|
const TimeoutConstants_1 = require("../../TimeoutConstants");
|
|
19
19
|
const TestConstants_1 = require("../../TestConstants");
|
|
20
20
|
const Logger_1 = require("../../utils/Logger");
|
|
21
|
-
const KeycloackUrlHandler_1 = require("../../utils/KeycloackUrlHandler");
|
|
22
21
|
const CheReporter_1 = __importDefault(require("../../driver/CheReporter"));
|
|
23
22
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
24
23
|
const ide = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.Ide);
|
|
@@ -39,6 +38,8 @@ const branchName = workspaceNameHandler.generateWorkspaceName('ghPrPlugin-', 10)
|
|
|
39
38
|
const projectName = 'Spoon-Knife';
|
|
40
39
|
const oAuthAppName = 'eclipse-che';
|
|
41
40
|
const changedFile = 'README.md';
|
|
41
|
+
// added call back url, but needs to be re-verified
|
|
42
|
+
const identityCallbackUrl = `${TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL}/api/oauth/callback`;
|
|
42
43
|
const currentDate = Date.now().toString();
|
|
43
44
|
let workspaceName;
|
|
44
45
|
suite(`The 'GitHubPullRequestPlugin' test`, async () => {
|
|
@@ -53,7 +54,7 @@ suite(`The 'GitHubPullRequestPlugin' test`, async () => {
|
|
|
53
54
|
test('Configure oauth application', async () => {
|
|
54
55
|
await gitOauthAppsSettings.scrollToUpdateApplicationButton();
|
|
55
56
|
await gitOauthAppsSettings.typeHomePageUrl(TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL);
|
|
56
|
-
await gitOauthAppsSettings.typeCallbackUrl(
|
|
57
|
+
await gitOauthAppsSettings.typeCallbackUrl(identityCallbackUrl);
|
|
57
58
|
await gitOauthAppsSettings.clickUpdateApplicationButton();
|
|
58
59
|
});
|
|
59
60
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GitHubPullRequestPlugin.spec.js","sourceRoot":"","sources":["../../../tests/plugins/GitHubPullRequestPlugin.spec.ts"],"names":[],"mappings":";;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,6DAAsD;AACtD,2DAAgD;AAEhD,6DAA0D;AAC1D,uDAAoD;AAGpD,+CAA4C;
|
|
1
|
+
{"version":3,"file":"GitHubPullRequestPlugin.spec.js","sourceRoot":"","sources":["../../../tests/plugins/GitHubPullRequestPlugin.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -78,6 +78,7 @@ let LanguageServerTests = class LanguageServerTests {
|
|
|
78
78
|
await this.editor.pressControlSpaceCombination(openedTab);
|
|
79
79
|
await this.editor.waitSuggestionContainer();
|
|
80
80
|
await this.editor.waitSuggestionWithScrolling(openedTab, expectedText);
|
|
81
|
+
await this.editor.waitTabWithSavedStatus(openedTab);
|
|
81
82
|
});
|
|
82
83
|
}
|
|
83
84
|
waitLSInitialization(startingNote, alternateNote = '', startTimeout = TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_LANGUAGE_SERVER_START_TIMEOUT) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LanguageServerTests.js","sourceRoot":"","sources":["../../testsLibrary/LanguageServerTests.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"LanguageServerTests.js","sourceRoot":"","sources":["../../testsLibrary/LanguageServerTests.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.45.0-dev-
|
|
3
|
+
"version": "7.45.0-dev-60c4bc4",
|
|
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",
|
|
@@ -16,6 +16,7 @@ import { TestConstants } from '../../TestConstants';
|
|
|
16
16
|
import { TimeoutConstants } from '../../TimeoutConstants';
|
|
17
17
|
import { Workspaces } from './Workspaces';
|
|
18
18
|
import { Logger } from '../../utils/Logger';
|
|
19
|
+
import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
|
|
19
20
|
|
|
20
21
|
@injectable()
|
|
21
22
|
export class Dashboard {
|
|
@@ -25,7 +26,8 @@ export class Dashboard {
|
|
|
25
26
|
private static readonly WORKSPACE_STARTING_PAGE_CSS: string = '.ide-loader-page';
|
|
26
27
|
|
|
27
28
|
constructor(@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper,
|
|
28
|
-
@inject(CLASSES.Workspaces) private readonly workspaces: Workspaces
|
|
29
|
+
@inject(CLASSES.Workspaces) private readonly workspaces: Workspaces,
|
|
30
|
+
@inject(CLASSES.BrowserTabsUtil) private readonly browserTabUtil: BrowserTabsUtil) { }
|
|
29
31
|
|
|
30
32
|
async stopWorkspaceByUI(workspaceName: string) {
|
|
31
33
|
Logger.debug(`Dashboard.stopWorkspaceByUI "${workspaceName}"`);
|
|
@@ -60,7 +62,11 @@ export class Dashboard {
|
|
|
60
62
|
|
|
61
63
|
async openDashboard() {
|
|
62
64
|
Logger.debug('Dashboard.openDashboard');
|
|
63
|
-
|
|
65
|
+
const windowHandles = await this.browserTabUtil.getAllWindowHandles();
|
|
66
|
+
if (windowHandles.length > 1) {
|
|
67
|
+
const windowHandle = await this.browserTabUtil.getCurrentWindowHandle();
|
|
68
|
+
await this.browserTabUtil.waitAndSwitchToAnotherWindow(windowHandle, 1000);
|
|
69
|
+
}
|
|
64
70
|
await this.driverHelper.getDriver().navigate().to(TestConstants.TS_SELENIUM_BASE_URL);
|
|
65
71
|
await this.waitPage();
|
|
66
72
|
|
|
@@ -109,4 +115,10 @@ export class Dashboard {
|
|
|
109
115
|
await this.driverHelper.waitPresence(By.css(Dashboard.WORKSPACE_STARTING_PAGE_CSS), timeout);
|
|
110
116
|
}
|
|
111
117
|
|
|
118
|
+
async getRecentWorkspaceName(timeout: number = TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
119
|
+
Logger.debug(`Dashboard.recentWorkspaceName`);
|
|
120
|
+
|
|
121
|
+
return await this.driverHelper.waitAndGetText(By.css('[data-testid="recent-workspace-item"]'), timeout);
|
|
122
|
+
}
|
|
123
|
+
|
|
112
124
|
}
|
package/pageobjects/ide/Ide.ts
CHANGED
|
@@ -47,15 +47,24 @@ export class Ide {
|
|
|
47
47
|
await this.driverHelper.waitAndSwitchToFrame(By.css(Ide.IDE_IFRAME_CSS), timeout);
|
|
48
48
|
} catch (err) {
|
|
49
49
|
if (err instanceof error.StaleElementReferenceError) {
|
|
50
|
-
Logger.warn('StaleElementException
|
|
50
|
+
Logger.warn('StaleElementException occurred during waiting for IDE. Sleeping for 2 secs and retrying.');
|
|
51
51
|
this.driverHelper.wait(2000);
|
|
52
|
-
|
|
52
|
+
try {
|
|
53
|
+
await this.driverHelper.waitAndSwitchToFrame(By.css(Ide.IDE_IFRAME_CSS), timeout);
|
|
54
|
+
} catch (err) {
|
|
55
|
+
if (err instanceof error.TimeoutError) {
|
|
56
|
+
Logger.warn(`Iframe is not available even after ${timeout} milliseconds, checking for visibility of #theia-main-content-panel.`);
|
|
57
|
+
await this.driverHelper.isVisible(By.css('#theia-main-content-panel'));
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
60
|
+
throw err;
|
|
61
|
+
}
|
|
53
62
|
return;
|
|
54
63
|
}
|
|
55
64
|
|
|
56
65
|
if (err instanceof error.TimeoutError) {
|
|
57
|
-
Logger.
|
|
58
|
-
|
|
66
|
+
Logger.warn(`Iframe is not available even after ${timeout} milliseconds, checking for visibility of #theia-main-content-panel.`);
|
|
67
|
+
await this.driverHelper.isVisible(By.css('#theia-main-content-panel'));
|
|
59
68
|
}
|
|
60
69
|
|
|
61
70
|
Logger.error(`Switching to IDE frame failed.`);
|
|
@@ -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,7 +239,7 @@ export class ProjectTree {
|
|
|
237
239
|
|
|
238
240
|
if (!isProjectFolderVisible) {
|
|
239
241
|
Logger.trace(`ProjectTree.waitProjectImported project not located, reloading page.`);
|
|
240
|
-
await this.
|
|
242
|
+
await this.browserTabsUtil.refreshPage();
|
|
241
243
|
await this.ide.waitAndSwitchToIdeFrame();
|
|
242
244
|
await this.ide.waitIde();
|
|
243
245
|
await this.openProjectTreeContainer();
|
|
@@ -253,13 +255,12 @@ export class ProjectTree {
|
|
|
253
255
|
|
|
254
256
|
if (!isRootSubItemVisible) {
|
|
255
257
|
Logger.trace(`ProjectTree.waitProjectImported sub-items not found, reloading page.`);
|
|
256
|
-
await this.
|
|
258
|
+
await this.browserTabsUtil.refreshPage();
|
|
257
259
|
await this.ide.waitAndSwitchToIdeFrame();
|
|
258
260
|
await this.ide.waitIde();
|
|
259
261
|
await this.openProjectTreeContainer();
|
|
260
262
|
continue;
|
|
261
263
|
}
|
|
262
|
-
|
|
263
264
|
return;
|
|
264
265
|
}
|
|
265
266
|
|
|
@@ -281,7 +282,7 @@ export class ProjectTree {
|
|
|
281
282
|
|
|
282
283
|
if (!isProjectFolderVisible) {
|
|
283
284
|
Logger.trace(`ProjectTree.waitProjectImportedNoSubfolder project not located, reloading page.`);
|
|
284
|
-
await this.
|
|
285
|
+
await this.browserTabsUtil.refreshPage();
|
|
285
286
|
await this.driverHelper.wait(triesPolling);
|
|
286
287
|
await this.ide.waitAndSwitchToIdeFrame();
|
|
287
288
|
await this.ide.waitIde();
|
|
@@ -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';
|