@eclipse-che/che-e2e 7.46.1-dev-cc22326 → 7.46.1-dev-957e450
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 +2 -5
- package/dist/driver/CheReporter.js.map +1 -1
- package/dist/pageobjects/ide/Editor.js +1 -1
- package/dist/pageobjects/ide/Editor.js.map +1 -1
- package/dist/pageobjects/ide/PreviewWidget.js +3 -0
- package/dist/pageobjects/ide/PreviewWidget.js.map +1 -1
- package/dist/pageobjects/ide/ProjectTree.js +12 -6
- package/dist/pageobjects/ide/ProjectTree.js.map +1 -1
- package/dist/tests/devfiles/CSlashCPlusPlus.spec.js +2 -10
- package/dist/tests/devfiles/CSlashCPlusPlus.spec.js.map +1 -1
- package/dist/tests/devfiles/DevfileSmoke.spec.js +2 -10
- package/dist/tests/devfiles/DevfileSmoke.spec.js.map +1 -1
- package/dist/tests/devfiles/DotNetCore.spec.js +2 -10
- package/dist/tests/devfiles/DotNetCore.spec.js.map +1 -1
- package/dist/tests/devfiles/Go.spec.js +2 -10
- package/dist/tests/devfiles/Go.spec.js.map +1 -1
- package/dist/tests/devfiles/JavaMaven.spec.js +2 -10
- package/dist/tests/devfiles/JavaMaven.spec.js.map +1 -1
- package/dist/tests/devfiles/JavaSpringBoot.spec.js +2 -10
- package/dist/tests/devfiles/JavaSpringBoot.spec.js.map +1 -1
- package/dist/tests/devfiles/JavaVertx.spec.js +2 -10
- package/dist/tests/devfiles/JavaVertx.spec.js.map +1 -1
- package/dist/tests/devfiles/NodeJS.spec.js +2 -10
- package/dist/tests/devfiles/NodeJS.spec.js.map +1 -1
- package/dist/tests/devfiles/PHPSimple.spec.js +2 -10
- package/dist/tests/devfiles/PHPSimple.spec.js.map +1 -1
- package/dist/tests/devfiles/Python.spec.js +2 -10
- package/dist/tests/devfiles/Python.spec.js.map +1 -1
- package/dist/tests/devfiles/PythonDjango.spec.js +2 -10
- package/dist/tests/devfiles/PythonDjango.spec.js.map +1 -1
- package/dist/tests/devfiles/Quarkus.spec.js +2 -10
- package/dist/tests/devfiles/Quarkus.spec.js.map +1 -1
- package/dist/tests/devfiles/Scala.spec.js +2 -10
- package/dist/tests/devfiles/Scala.spec.js.map +1 -1
- package/dist/tests/e2e/FactoryUrl.spec.js +4 -9
- package/dist/tests/e2e/FactoryUrl.spec.js.map +1 -1
- package/dist/tests/e2e/GitPublishBranch.spec.js +2 -5
- package/dist/tests/e2e/GitPublishBranch.spec.js.map +1 -1
- package/dist/tests/e2e/GitSelfSignCert.spec.js +2 -0
- package/dist/tests/e2e/GitSelfSignCert.spec.js.map +1 -1
- package/dist/tests/e2e/GitSsh.spec.js +3 -6
- package/dist/tests/e2e/GitSsh.spec.js.map +1 -1
- package/dist/tests/e2e/OpenshiftConnector.spec.js +2 -5
- package/dist/tests/e2e/OpenshiftConnector.spec.js.map +1 -1
- package/dist/tests/e2e/factories/DirectUrlFactoryWithKeepDirectoryTest.spec.js +3 -7
- package/dist/tests/e2e/factories/DirectUrlFactoryWithKeepDirectoryTest.spec.js.map +1 -1
- package/dist/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.js +3 -7
- package/dist/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.js.map +1 -1
- package/dist/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.js +3 -7
- 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 +2 -6
- package/dist/tests/intelij/IntelijOpenWorkspace.spec.js.map +1 -1
- package/dist/tests/load_test/LoadTest.spec.js +2 -5
- 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 +4 -9
- package/dist/tests/plugins/GitHubPullRequestPlugin.spec.js.map +1 -1
- package/dist/tests/plugins/InstallPluginUsingUI.spec.js +4 -10
- package/dist/tests/plugins/InstallPluginUsingUI.spec.js.map +1 -1
- package/dist/tests/plugins/JavaPlugin.spec.js +4 -8
- package/dist/tests/plugins/JavaPlugin.spec.js.map +1 -1
- package/dist/tests/plugins/PhpPlugin.spec.js +12 -10
- package/dist/tests/plugins/PhpPlugin.spec.js.map +1 -1
- package/dist/tests/plugins/PythonPlugin.spec.js +4 -8
- package/dist/tests/plugins/PythonPlugin.spec.js.map +1 -1
- package/dist/tests/plugins/TypescriptPlugin.spec.js +4 -8
- package/dist/tests/plugins/TypescriptPlugin.spec.js.map +1 -1
- package/dist/tests/plugins/VscodeKubernetesPlugin.spec.js +3 -10
- package/dist/tests/plugins/VscodeKubernetesPlugin.spec.js.map +1 -1
- package/dist/tests/plugins/VscodeShellcheckPlugin.spec.js +3 -10
- package/dist/tests/plugins/VscodeShellcheckPlugin.spec.js.map +1 -1
- package/dist/tests/plugins/VscodeValePlugin.spec.js +3 -10
- package/dist/tests/plugins/VscodeValePlugin.spec.js.map +1 -1
- package/dist/tests/plugins/VscodeXmlPlugin.spec.js +10 -22
- package/dist/tests/plugins/VscodeXmlPlugin.spec.js.map +1 -1
- package/dist/tests/plugins/VscodeYamlPlugin.spec.js +4 -8
- package/dist/tests/plugins/VscodeYamlPlugin.spec.js.map +1 -1
- package/dist/testsLibrary/CodeExecutionTests.js +52 -29
- package/dist/testsLibrary/CodeExecutionTests.js.map +1 -1
- package/dist/testsLibrary/WorkspaceHandlingTests.js +68 -11
- package/dist/testsLibrary/WorkspaceHandlingTests.js.map +1 -1
- package/driver/CheReporter.ts +2 -8
- package/package.json +1 -1
- package/pageobjects/ide/Editor.ts +1 -1
- package/pageobjects/ide/PreviewWidget.ts +3 -0
- package/pageobjects/ide/ProjectTree.ts +13 -8
- package/tests/devfiles/CSlashCPlusPlus.spec.ts +2 -9
- package/tests/devfiles/DevfileSmoke.spec.ts +2 -9
- package/tests/devfiles/DotNetCore.spec.ts +2 -9
- package/tests/devfiles/Go.spec.ts +2 -7
- package/tests/devfiles/JavaMaven.spec.ts +2 -9
- package/tests/devfiles/JavaSpringBoot.spec.ts +2 -9
- package/tests/devfiles/JavaVertx.spec.ts +2 -9
- package/tests/devfiles/NodeJS.spec.ts +2 -9
- package/tests/devfiles/PHPSimple.spec.ts +2 -9
- package/tests/devfiles/Python.spec.ts +2 -9
- package/tests/devfiles/PythonDjango.spec.ts +2 -9
- package/tests/devfiles/Quarkus.spec.ts +2 -9
- package/tests/devfiles/Scala.spec.ts +2 -10
- package/tests/e2e/FactoryUrl.spec.ts +4 -8
- package/tests/e2e/GitPublishBranch.spec.ts +2 -2
- package/tests/e2e/GitSelfSignCert.spec.ts +66 -65
- package/tests/e2e/GitSsh.spec.ts +3 -3
- package/tests/e2e/OpenshiftConnector.spec.ts +2 -2
- package/tests/e2e/factories/DirectUrlFactoryWithKeepDirectoryTest.spec.ts +2 -5
- package/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.ts +2 -5
- package/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.ts +2 -5
- package/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts +2 -2
- package/tests/e2e_happy_path/HappyPath.spec.ts +13 -10
- package/tests/intelij/IntelijOpenWorkspace.spec.ts +2 -4
- package/tests/load_test/LoadTest.spec.ts +2 -2
- package/tests/login/LinkCheAndOcpUsers.spec.ts +4 -3
- package/tests/plugins/GitHubPullRequestPlugin.spec.ts +4 -7
- package/tests/plugins/InstallPluginUsingUI.spec.ts +4 -9
- package/tests/plugins/JavaPlugin.spec.ts +4 -6
- package/tests/plugins/PhpPlugin.spec.ts +3 -9
- package/tests/plugins/PythonPlugin.spec.ts +4 -6
- package/tests/plugins/TypescriptPlugin.spec.ts +4 -6
- package/tests/plugins/VscodeKubernetesPlugin.spec.ts +3 -9
- package/tests/plugins/VscodeShellcheckPlugin.spec.ts +3 -9
- package/tests/plugins/VscodeValePlugin.spec.ts +3 -9
- package/tests/plugins/VscodeXmlPlugin.spec.ts +14 -23
- package/tests/plugins/VscodeYamlPlugin.spec.ts +4 -7
- package/testsLibrary/CodeExecutionTests.ts +43 -22
- package/testsLibrary/WorkspaceHandlingTests.ts +66 -9
|
@@ -8,46 +8,34 @@
|
|
|
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
|
-
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
12
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
16
13
|
const inversify_config_1 = require("../../inversify.config");
|
|
17
14
|
const inversify_types_1 = require("../../inversify.types");
|
|
18
15
|
const TestConstants_1 = require("../../TestConstants");
|
|
19
|
-
const TimeoutConstants_1 = require("../../TimeoutConstants");
|
|
20
16
|
const Logger_1 = require("../../utils/Logger");
|
|
21
|
-
const
|
|
22
|
-
const ide = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.Ide);
|
|
17
|
+
const projectAndFileTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectAndFileTests);
|
|
23
18
|
const projectTree = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectTree);
|
|
24
19
|
const editor = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.Editor);
|
|
25
20
|
const browserTabsUtil = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.BrowserTabsUtil);
|
|
26
21
|
const workspaceHandlingTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.WorkspaceHandlingTests);
|
|
27
|
-
const
|
|
28
|
-
const devfileUrl = 'https://
|
|
22
|
+
const preferencesHandler = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.PreferencesHandler);
|
|
23
|
+
const devfileUrl = 'https://github.com/che-samples/web-nodejs-sample/tree/xml-plugin';
|
|
29
24
|
const factoryUrl = `${TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;
|
|
30
|
-
const projectName = 'nodejs-
|
|
25
|
+
const projectName = 'web-nodejs-sample';
|
|
31
26
|
const pathToFile = `${projectName}`;
|
|
32
27
|
const xmlFileName = 'hello.xml';
|
|
33
|
-
|
|
28
|
+
const subRootFolder = 'app';
|
|
29
|
+
let workspaceName = 'xml-plugin';
|
|
34
30
|
suite('The "VscodeXmlPlugin" userstory', async () => {
|
|
35
31
|
suite('Create workspace', async () => {
|
|
36
32
|
test('Create workspace using factory', async () => {
|
|
37
33
|
await browserTabsUtil.navigateTo(factoryUrl);
|
|
38
34
|
});
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
await ide.waitIde(TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
|
|
44
|
-
await ide.waitNotificationAndClickOnButton('Do you trust the authors of', 'Yes, I trust', 60000);
|
|
45
|
-
});
|
|
46
|
-
});
|
|
47
|
-
suite('Check workspace readiness to work', async () => {
|
|
48
|
-
test('Wait until project is imported', async () => {
|
|
49
|
-
await projectTree.openProjectTreeContainer();
|
|
50
|
-
await projectTree.waitProjectImported(projectName, 'app');
|
|
35
|
+
workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
|
|
36
|
+
projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
|
|
37
|
+
test('Set confirmExit preference to never', async () => {
|
|
38
|
+
await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
|
|
51
39
|
});
|
|
52
40
|
});
|
|
53
41
|
suite('Check the "vscode-xml" plugin', async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VscodeXmlPlugin.spec.js","sourceRoot":"","sources":["../../../tests/plugins/VscodeXmlPlugin.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE
|
|
1
|
+
{"version":3,"file":"VscodeXmlPlugin.spec.js","sourceRoot":"","sources":["../../../tests/plugins/VscodeXmlPlugin.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,16 +8,13 @@
|
|
|
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
|
-
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
12
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
16
13
|
const inversify_config_1 = require("../../inversify.config");
|
|
17
14
|
const inversify_types_1 = require("../../inversify.types");
|
|
18
15
|
const TestConstants_1 = require("../../TestConstants");
|
|
19
16
|
const Logger_1 = require("../../utils/Logger");
|
|
20
|
-
const
|
|
17
|
+
const WorkspaceHandlingTests_1 = require("../../testsLibrary/WorkspaceHandlingTests");
|
|
21
18
|
const projectAndFileTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectAndFileTests);
|
|
22
19
|
const projectTree = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectTree);
|
|
23
20
|
const editor = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.Editor);
|
|
@@ -31,15 +28,14 @@ const subRootFolder = 'app';
|
|
|
31
28
|
const pathToFile = `${projectName}`;
|
|
32
29
|
const yamlFileName = 'routes.yaml';
|
|
33
30
|
const yamlSchema = { 'yaml-schema.json': '*.yaml' };
|
|
34
|
-
let workspaceName = 'yaml-plugin';
|
|
35
31
|
suite('The "VscodeYamlPlugin" userstory', async () => {
|
|
36
32
|
suite('Create workspace', async () => {
|
|
37
33
|
test('Create workspace using factory', async () => {
|
|
38
34
|
await browserTabsUtil.navigateTo(factoryUrl);
|
|
39
35
|
});
|
|
36
|
+
workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
|
|
40
37
|
projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
|
|
41
|
-
test('
|
|
42
|
-
CheReporter_1.default.registerRunningWorkspace(workspaceName);
|
|
38
|
+
test('Set confirmExit preference to never', async () => {
|
|
43
39
|
await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
|
|
44
40
|
});
|
|
45
41
|
});
|
|
@@ -77,7 +73,7 @@ suite('The "VscodeYamlPlugin" userstory', async () => {
|
|
|
77
73
|
suite('Delete workspace', async () => {
|
|
78
74
|
test('Stop and remove workspace', async () => {
|
|
79
75
|
if (TestConstants_1.TestConstants.TS_DELETE_PLUGINS_TEST_WORKSPACE === 'true') {
|
|
80
|
-
await workspaceHandlingTests.stopAndRemoveWorkspace(
|
|
76
|
+
await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
|
|
81
77
|
return;
|
|
82
78
|
}
|
|
83
79
|
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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"}
|
|
@@ -36,20 +36,20 @@ const Terminal_1 = require("../pageobjects/ide/Terminal");
|
|
|
36
36
|
const TopMenu_1 = require("../pageobjects/ide/TopMenu");
|
|
37
37
|
const DialogWindow_1 = require("../pageobjects/ide/DialogWindow");
|
|
38
38
|
const DriverHelper_1 = require("../utils/DriverHelper");
|
|
39
|
-
const PreviewWidget_1 = require("../pageobjects/ide/PreviewWidget");
|
|
40
|
-
const RightToolBar_1 = require("../pageobjects/ide/RightToolBar");
|
|
41
39
|
const Logger_1 = require("../utils/Logger");
|
|
42
40
|
const QuickOpenContainer_1 = require("../pageobjects/ide/QuickOpenContainer");
|
|
41
|
+
const WorkspaceHandlingTests_1 = require("./WorkspaceHandlingTests");
|
|
42
|
+
const BrowserTabsUtil_1 = require("../utils/BrowserTabsUtil");
|
|
43
43
|
let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
|
|
44
|
-
constructor(terminal, topMenu, ide, dialogWindow, driverHelper,
|
|
44
|
+
constructor(terminal, topMenu, ide, dialogWindow, driverHelper, quickOpenContainer, browserTabsUtil, workspaceHandlingTests) {
|
|
45
45
|
this.terminal = terminal;
|
|
46
46
|
this.topMenu = topMenu;
|
|
47
47
|
this.ide = ide;
|
|
48
48
|
this.dialogWindow = dialogWindow;
|
|
49
49
|
this.driverHelper = driverHelper;
|
|
50
|
-
this.previewWidget = previewWidget;
|
|
51
|
-
this.rightToolBar = rightToolBar;
|
|
52
50
|
this.quickOpenContainer = quickOpenContainer;
|
|
51
|
+
this.browserTabsUtil = browserTabsUtil;
|
|
52
|
+
this.workspaceHandlingTests = workspaceHandlingTests;
|
|
53
53
|
}
|
|
54
54
|
runTask(taskName, timeout) {
|
|
55
55
|
test(`Run command '${taskName}'`, async () => {
|
|
@@ -76,6 +76,7 @@ let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
|
|
|
76
76
|
runTaskWithDialogShellAndOpenLink(taskName, expectedDialogText, timeout) {
|
|
77
77
|
test(`Run command '${taskName}' expecting dialog shell`, async () => {
|
|
78
78
|
await this.runTaskUsingQuickOpenContainer(taskName);
|
|
79
|
+
this.workspaceHandlingTests.setWindowHandle(await this.browserTabsUtil.getCurrentWindowHandle());
|
|
79
80
|
await this.dialogWindow.waitDialogAndOpenLink(expectedDialogText, timeout);
|
|
80
81
|
});
|
|
81
82
|
}
|
|
@@ -118,40 +119,57 @@ let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
|
|
|
118
119
|
test(`Run command '${taskName}' expecting notification`, async () => {
|
|
119
120
|
await this.runTaskUsingQuickOpenContainer(taskName);
|
|
120
121
|
await this.ide.waitNotification(notificationText, timeout);
|
|
122
|
+
this.workspaceHandlingTests.setWindowHandle(await this.browserTabsUtil.getCurrentWindowHandle());
|
|
121
123
|
await this.ide.clickOnNotificationButton(notificationText, buttonText);
|
|
122
|
-
|
|
124
|
+
await this.driverHelper.wait(5000);
|
|
125
|
+
CodeExecutionTests_1.lastApplicationUrl = await this.driverHelper.getDriver().getCurrentUrl();
|
|
123
126
|
});
|
|
124
127
|
}
|
|
128
|
+
/**
|
|
129
|
+
* @deprecated This method should not be used, preview widget is no longer a valid page fragment.
|
|
130
|
+
*/
|
|
125
131
|
runTaskWithNotificationAndOpenLinkPreviewNoUrl(taskName, notificationText, timeout) {
|
|
126
132
|
test(`Run command '${taskName}' expecting notification`, async () => {
|
|
127
133
|
await this.runTaskUsingQuickOpenContainer(taskName);
|
|
128
134
|
await this.ide.waitNotification(notificationText, timeout);
|
|
135
|
+
this.workspaceHandlingTests.setWindowHandle(await this.browserTabsUtil.getCurrentWindowHandle());
|
|
129
136
|
await this.ide.clickOnNotificationButton(notificationText, 'Open In Preview');
|
|
130
|
-
|
|
137
|
+
await this.driverHelper.wait(5000);
|
|
138
|
+
CodeExecutionTests_1.lastApplicationUrl = await this.driverHelper.getDriver().getCurrentUrl();
|
|
131
139
|
});
|
|
132
140
|
}
|
|
133
141
|
runTaskWithNotificationAndOpenLinkUnexposedPort(taskName, notificationText, portOpenText, timeout) {
|
|
134
142
|
test(`Run command '${taskName}' expecting notification with unexposed port`, async () => {
|
|
135
143
|
await this.runTaskUsingQuickOpenContainer(taskName);
|
|
136
144
|
await this.ide.waitNotificationAndConfirm(notificationText, timeout);
|
|
145
|
+
this.workspaceHandlingTests.setWindowHandle(await this.browserTabsUtil.getCurrentWindowHandle());
|
|
137
146
|
await this.ide.waitNotificationAndOpenLink(portOpenText, timeout);
|
|
138
|
-
|
|
147
|
+
await this.driverHelper.wait(5000);
|
|
148
|
+
CodeExecutionTests_1.lastApplicationUrl = await this.driverHelper.getDriver().getCurrentUrl();
|
|
139
149
|
});
|
|
140
150
|
}
|
|
141
151
|
verifyRunningApplication(locator, applicationCheckTimeout, polling) {
|
|
142
152
|
test(`Verify running application by locator: '${locator}'`, async () => {
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
153
|
+
let timeout = applicationCheckTimeout / polling;
|
|
154
|
+
let attempts = applicationCheckTimeout / timeout;
|
|
155
|
+
for (let i = 0; i < attempts; i++) {
|
|
156
|
+
try {
|
|
157
|
+
await this.driverHelper.waitPresence(locator, timeout);
|
|
158
|
+
}
|
|
159
|
+
catch (err) {
|
|
160
|
+
if (err instanceof selenium_webdriver_1.error.TimeoutError) {
|
|
161
|
+
if (i === attempts - 1) {
|
|
162
|
+
Logger_1.Logger.error(`CodeExecutionTests.verifyRunningApplication out of retries to wait for ${locator} presence.`);
|
|
163
|
+
throw err;
|
|
164
|
+
}
|
|
165
|
+
else {
|
|
166
|
+
Logger_1.Logger.trace(`CodeExecutionTests.verifyRunningApplication timed out waiting for ${locator} presence. Retrying ${i}.`);
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
else {
|
|
170
|
+
Logger_1.Logger.error(`CodeExecutionTests.verifyRunningApplication failed with unexpected exception.`);
|
|
171
|
+
throw err;
|
|
172
|
+
}
|
|
155
173
|
}
|
|
156
174
|
}
|
|
157
175
|
});
|
|
@@ -159,15 +177,20 @@ let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
|
|
|
159
177
|
getLastApplicationUrl() {
|
|
160
178
|
return CodeExecutionTests_1.lastApplicationUrl;
|
|
161
179
|
}
|
|
180
|
+
/**
|
|
181
|
+
* @deprecated This method should not be used, preview widget is no longer a valid page fragment.
|
|
182
|
+
*/
|
|
162
183
|
refreshPreviewWindow() {
|
|
163
184
|
test('Refreshing preview widget', async () => {
|
|
164
|
-
|
|
185
|
+
Logger_1.Logger.warn(`Method is deprecated.`);
|
|
165
186
|
});
|
|
166
187
|
}
|
|
188
|
+
/**
|
|
189
|
+
* @deprecated This method should not be used, preview widget is no longer a valid page fragment.
|
|
190
|
+
*/
|
|
167
191
|
closePreviewWidget() {
|
|
168
192
|
test('Close preview widget', async () => {
|
|
169
|
-
|
|
170
|
-
await this.previewWidget.waitPreviewWidgetAbsence();
|
|
193
|
+
Logger_1.Logger.warn(`Method is deprecated.`);
|
|
171
194
|
});
|
|
172
195
|
}
|
|
173
196
|
waitTerminalPresent(terminalTabName, timeout) {
|
|
@@ -205,17 +228,17 @@ CodeExecutionTests = CodeExecutionTests_1 = __decorate([
|
|
|
205
228
|
__param(2, inversify_1.inject(inversify_types_1.CLASSES.Ide)),
|
|
206
229
|
__param(3, inversify_1.inject(inversify_types_1.CLASSES.DialogWindow)),
|
|
207
230
|
__param(4, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
208
|
-
__param(5, inversify_1.inject(inversify_types_1.CLASSES.
|
|
209
|
-
__param(6, inversify_1.inject(inversify_types_1.CLASSES.
|
|
210
|
-
__param(7, inversify_1.inject(inversify_types_1.CLASSES.
|
|
231
|
+
__param(5, inversify_1.inject(inversify_types_1.CLASSES.QuickOpenContainer)),
|
|
232
|
+
__param(6, inversify_1.inject(inversify_types_1.CLASSES.BrowserTabsUtil)),
|
|
233
|
+
__param(7, inversify_1.inject(inversify_types_1.CLASSES.WorkspaceHandlingTests)),
|
|
211
234
|
__metadata("design:paramtypes", [Terminal_1.Terminal,
|
|
212
235
|
TopMenu_1.TopMenu,
|
|
213
236
|
Ide_1.Ide,
|
|
214
237
|
DialogWindow_1.DialogWindow,
|
|
215
238
|
DriverHelper_1.DriverHelper,
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
239
|
+
QuickOpenContainer_1.QuickOpenContainer,
|
|
240
|
+
BrowserTabsUtil_1.BrowserTabsUtil,
|
|
241
|
+
WorkspaceHandlingTests_1.WorkspaceHandlingTests])
|
|
219
242
|
], CodeExecutionTests);
|
|
220
243
|
exports.CodeExecutionTests = CodeExecutionTests;
|
|
221
244
|
//# 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,
|
|
1
|
+
{"version":3,"file":"CodeExecutionTests.js","sourceRoot":"","sources":["../../testsLibrary/CodeExecutionTests.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,38 +30,90 @@ 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
|
|
33
|
+
const Logger_1 = require("../utils/Logger");
|
|
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");
|
|
34
38
|
let WorkspaceHandlingTests = WorkspaceHandlingTests_1 = class WorkspaceHandlingTests {
|
|
35
|
-
constructor(dashboard, createWorkspace, workspaces, browserTabsUtil) {
|
|
39
|
+
constructor(dashboard, createWorkspace, workspaces, driverHelper, browserTabsUtil, ide) {
|
|
36
40
|
this.dashboard = dashboard;
|
|
37
41
|
this.createWorkspace = createWorkspace;
|
|
38
42
|
this.workspaces = workspaces;
|
|
43
|
+
this.driverHelper = driverHelper;
|
|
39
44
|
this.browserTabsUtil = browserTabsUtil;
|
|
45
|
+
this.ide = ide;
|
|
40
46
|
}
|
|
41
47
|
static getWorkspaceName() {
|
|
42
48
|
return WorkspaceHandlingTests_1.workspaceName;
|
|
43
49
|
}
|
|
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
|
+
}
|
|
44
59
|
createAndOpenWorkspace(stack) {
|
|
45
|
-
test(`
|
|
60
|
+
test(`Create and open new workspace, stack:${stack}`, async () => {
|
|
46
61
|
await this.dashboard.waitPage();
|
|
47
62
|
await this.dashboard.clickCreateWorkspaceButton();
|
|
48
63
|
await this.createWorkspace.waitPage();
|
|
49
|
-
|
|
64
|
+
WorkspaceHandlingTests_1.parentGUID = await this.browserTabsUtil.getCurrentWindowHandle();
|
|
50
65
|
await this.createWorkspace.clickOnSample(stack);
|
|
51
|
-
await this.browserTabsUtil.
|
|
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);
|
|
66
|
+
await this.browserTabsUtil.waitAndSwitchToAnotherWindow(WorkspaceHandlingTests_1.parentGUID, TimeoutConstants_1.TimeoutConstants.TS_IDE_LOAD_TIMEOUT);
|
|
55
67
|
});
|
|
56
68
|
}
|
|
57
69
|
openExistingWorkspace(workspaceName) {
|
|
58
|
-
test('
|
|
70
|
+
test('Open and start existing workspace', async () => {
|
|
59
71
|
await this.dashboard.waitPage();
|
|
60
72
|
await this.dashboard.clickWorkspacesButton();
|
|
61
73
|
await this.workspaces.waitPage();
|
|
62
74
|
await this.workspaces.clickOpenButton(workspaceName);
|
|
63
75
|
});
|
|
64
76
|
}
|
|
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
|
+
}
|
|
65
117
|
async stopWorkspace(workspaceName) {
|
|
66
118
|
await this.dashboard.openDashboard();
|
|
67
119
|
await this.dashboard.stopWorkspaceByUI(workspaceName);
|
|
@@ -75,17 +127,22 @@ let WorkspaceHandlingTests = WorkspaceHandlingTests_1 = class WorkspaceHandlingT
|
|
|
75
127
|
await this.dashboard.stopAndRemoveWorkspaceByUI(workspaceName);
|
|
76
128
|
}
|
|
77
129
|
};
|
|
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`);
|
|
78
131
|
WorkspaceHandlingTests.workspaceName = 'undefined';
|
|
79
132
|
WorkspaceHandlingTests = WorkspaceHandlingTests_1 = __decorate([
|
|
80
133
|
inversify_1.injectable(),
|
|
81
134
|
__param(0, inversify_1.inject(inversify_types_1.CLASSES.Dashboard)),
|
|
82
135
|
__param(1, inversify_1.inject(inversify_types_1.CLASSES.CreateWorkspace)),
|
|
83
136
|
__param(2, inversify_1.inject(inversify_types_1.CLASSES.Workspaces)),
|
|
84
|
-
__param(3, inversify_1.inject(inversify_types_1.CLASSES.
|
|
137
|
+
__param(3, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
138
|
+
__param(4, inversify_1.inject(inversify_types_1.CLASSES.BrowserTabsUtil)),
|
|
139
|
+
__param(5, inversify_1.inject(inversify_types_1.CLASSES.Ide)),
|
|
85
140
|
__metadata("design:paramtypes", [Dashboard_1.Dashboard,
|
|
86
141
|
CreateWorkspace_1.CreateWorkspace,
|
|
87
142
|
Workspaces_1.Workspaces,
|
|
88
|
-
|
|
143
|
+
DriverHelper_1.DriverHelper,
|
|
144
|
+
BrowserTabsUtil_1.BrowserTabsUtil,
|
|
145
|
+
Ide_1.Ide])
|
|
89
146
|
], WorkspaceHandlingTests);
|
|
90
147
|
exports.WorkspaceHandlingTests = WorkspaceHandlingTests;
|
|
91
148
|
//# 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":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,yCAA+C;AAC/C,wDAA6C;AAC7C,kEAA+D;AAC/D,8EAA2E;AAC3E,oEAAiE;AACjE,8DAA2D;AAC3D,4CAAyC;AACzC,0DAAuD;AACvD,wDAAqD;AACrD,gDAA6C;AAC7C,2DAA+C;AAG/C,IAAa,sBAAsB,8BAAnC,MAAa,sBAAsB;IAsB/B,YACgD,SAAoB,EACd,eAAgC,EACrC,UAAsB,EACpB,YAA0B,EACvB,eAAgC,EAC5C,GAAQ;QALF,cAAS,GAAT,SAAS,CAAW;QACd,oBAAe,GAAf,eAAe,CAAiB;QACrC,eAAU,GAAV,UAAU,CAAY;QACpB,iBAAY,GAAZ,YAAY,CAAc;QACvB,oBAAe,GAAf,eAAe,CAAiB;QAC5C,QAAG,GAAH,GAAG,CAAK;IAAG,CAAC;IAtB/C,MAAM,CAAC,gBAAgB;QAC1B,OAAO,wBAAsB,CAAC,aAAa,CAAC;IAChD,CAAC;IAEM,MAAM,CAAC,gBAAgB,CAAC,aAAqB;QAChD,wBAAsB,CAAC,aAAa,GAAG,aAAa,CAAC;IACzD,CAAC;IAEM,eAAe,CAAC,IAAY;QAC/B,wBAAsB,CAAC,UAAU,GAAG,IAAI,CAAC;IAC7C,CAAC;IAEM,eAAe;QAClB,OAAO,wBAAsB,CAAC,UAAU,CAAC;IAC7C,CAAC;IAUM,sBAAsB,CAAC,KAAa;QACvC,IAAI,CAAC,wCAAwC,KAAK,EAAE,EAAE,KAAK,IAAI,EAAE;YAC7D,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YAChC,MAAM,IAAI,CAAC,SAAS,CAAC,0BAA0B,EAAE,CAAC;YAClD,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;YACtC,wBAAsB,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,EAAE,CAAC;YACxF,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAChD,MAAM,IAAI,CAAC,eAAe,CAAC,4BAA4B,CAAC,wBAAsB,CAAC,UAAU,EAAE,mCAAgB,CAAC,mBAAmB,CAAC,CAAC;QACrI,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,qBAAqB,CAAC,aAAqB;QAC9C,IAAI,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;YACjD,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YAChC,MAAM,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE,CAAC;YAC7C,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;YACjC,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,mCAAmC;QACtC,IAAI,CAAC,kDAAkD,EAAE,KAAK,IAAG,EAAE;YAC/D,IAAI;gBACA,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,wBAAsB,CAAC,iCAAiC,EAAE,mCAAgB,CAAC,+BAA+B,CAAC,CAAC;gBACnJ,iEAAiE;gBACjE,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAM,CAAC,CAAC;gBACrC,IAAI,4BAA4B,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,wBAAsB,CAAC,iCAAiC,CAAC,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;gBACvK,4BAA4B;gBAC5B,wBAAsB,CAAC,aAAa,GAAG,4BAA4B,CAAC,SAAS,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;gBACnH,eAAM,CAAC,IAAI,CAAC,uDAAuD,wBAAsB,CAAC,aAAa,EAAE,CAAC,CAAC;aAC9G;YAAC,OAAO,GAAG,EAAE;gBACV,eAAM,CAAC,KAAK,CAAC,+DAA+D,GAAG,EAAE,CAAC,CAAC;gBACnF,MAAM,GAAG,CAAC;aACb;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,0CAA0C;QAC7C,IAAI,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;YACzD,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,mBAAmB,EAAE,CAAC;YACrE,eAAM,CAAC,KAAK,CAAC,mDAAmD,IAAI,CAAC,MAAM,+BAA+B,CAAC,CAAC;YAC5G,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAClC,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;gBACnD,IAAI;oBACA,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,mCAAgB,CAAC,mBAAmB,CAAC,CAAC;oBAC7D,eAAM,CAAC,IAAI,CAAC,2EAA2E,CAAC,CAAC;oBACzF,OAAO;iBACV;gBAAC,OAAO,GAAG,EAAE;oBACV,IAAI,GAAG,YAAY,0BAAK,CAAC,YAAY,EAAE;wBACnC,eAAM,CAAC,IAAI,CAAC,iGAAiG,CAAC,CAAC;wBAC/G,SAAS;qBACZ;oBACD,eAAM,CAAC,KAAK,CAAC,0GAA0G,GAAG,EAAE,CAAC,CAAC;oBAC9H,MAAM,GAAG,CAAC;iBACb;aACJ;YACD,eAAM,CAAC,KAAK,CAAC,4FAA4F,CAAC,CAAC;QAC/G,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,aAAqB;QAC5C,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;QACrC,MAAM,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;IAC1D,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,aAAqB;QAC9C,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;QACrC,MAAM,IAAI,CAAC,SAAS,CAAC,0BAA0B,CAAC,aAAa,CAAC,CAAC;IACnE,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,aAAqB;QACrD,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;QACrC,MAAM,IAAI,CAAC,SAAS,CAAC,0BAA0B,CAAC,aAAa,CAAC,CAAC;IACnE,CAAC;CACJ,CAAA;AAtGkB,wDAAiC,GAAO,uBAAE,CAAC,KAAK,CAAC,qFAAqF,CAAC,CAAC;AACxI,oCAAa,GAAW,WAAW,CAAC;AAH1C,sBAAsB;IADlC,sBAAU,EAAE;IAwBJ,WAAA,kBAAM,CAAC,yBAAO,CAAC,SAAS,CAAC,CAAA;IACzB,WAAA,kBAAM,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAA;IAC/B,WAAA,kBAAM,CAAC,yBAAO,CAAC,UAAU,CAAC,CAAA;IAC1B,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;IAC5B,WAAA,kBAAM,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAA;IAC/B,WAAA,kBAAM,CAAC,yBAAO,CAAC,GAAG,CAAC,CAAA;qCALmC,qBAAS;QACG,iCAAe;QACzB,uBAAU;QACN,2BAAY;QACN,iCAAe;QACvC,SAAG;GA5BzC,sBAAsB,CAwGlC;AAxGY,wDAAsB"}
|
package/driver/CheReporter.ts
CHANGED
|
@@ -23,6 +23,7 @@ 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';
|
|
26
27
|
|
|
27
28
|
const e2eContainer = inversifyConfig.e2eContainer;
|
|
28
29
|
const driver: IDriver = e2eContainer.get(TYPES.Driver);
|
|
@@ -36,13 +37,6 @@ let testWorkspaceUtil: ITestWorkspaceUtil = e2eContainer.get(TYPES.WorkspaceUtil
|
|
|
36
37
|
|
|
37
38
|
class CheReporter extends mocha.reporters.Spec {
|
|
38
39
|
|
|
39
|
-
private static latestWorkspace: string;
|
|
40
|
-
|
|
41
|
-
public static registerRunningWorkspace(workspaceName: string) {
|
|
42
|
-
Logger.debug(`CheReporter.registerRunningWorkspace {${workspaceName}}`);
|
|
43
|
-
CheReporter.latestWorkspace = workspaceName;
|
|
44
|
-
}
|
|
45
|
-
|
|
46
40
|
constructor(runner: mocha.Runner, options: mocha.MochaOptions) {
|
|
47
41
|
super(runner, options);
|
|
48
42
|
|
|
@@ -192,7 +186,7 @@ class CheReporter extends mocha.reporters.Spec {
|
|
|
192
186
|
// stop and remove running workspace
|
|
193
187
|
if (TestConstants.DELETE_WORKSPACE_ON_FAILED_TEST) {
|
|
194
188
|
Logger.warn('Property DELETE_WORKSPACE_ON_FAILED_TEST se to true - trying to stop and delete running workspace.');
|
|
195
|
-
await testWorkspaceUtil.cleanUpRunningWorkspace(
|
|
189
|
+
await testWorkspaceUtil.cleanUpRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
|
|
196
190
|
}
|
|
197
191
|
|
|
198
192
|
});
|
package/package.json
CHANGED
|
@@ -183,7 +183,7 @@ export class Editor {
|
|
|
183
183
|
async closeTab(tabTitle: string, timeout: number = TimeoutConstants.TS_EDITOR_TAB_INTERACTION_TIMEOUT) {
|
|
184
184
|
Logger.debug(`Editor.closeTab "${tabTitle}"`);
|
|
185
185
|
|
|
186
|
-
const tabCloseButtonLocator: By = By.xpath(`//
|
|
186
|
+
const tabCloseButtonLocator: By = By.xpath(`//li[contains(@id,'${tabTitle}')]//div[contains(@class, 'p-TabBar-tabCloseIcon')]`);
|
|
187
187
|
|
|
188
188
|
await this.driverHelper.waitAndClick(tabCloseButtonLocator, timeout);
|
|
189
189
|
}
|
|
@@ -17,6 +17,9 @@ import { Ide } from './Ide';
|
|
|
17
17
|
import { Logger } from '../../utils/Logger';
|
|
18
18
|
import { TimeoutConstants } from '../../TimeoutConstants';
|
|
19
19
|
|
|
20
|
+
/**
|
|
21
|
+
* @deprecated Preview widget is no longer a valid page fragment.
|
|
22
|
+
*/
|
|
20
23
|
@injectable()
|
|
21
24
|
export class PreviewWidget {
|
|
22
25
|
private static readonly WIDGET_LOCATOR: By = By.css('div.theia-mini-browser');
|
|
@@ -235,13 +235,16 @@ 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 isRootFolderVisible = await this.driverHelper.waitVisibilityBoolean(rootItemLocator, 5, visibilityItemPolling / 5);
|
|
239
239
|
|
|
240
|
-
if (!
|
|
240
|
+
if (!isRootFolderVisible) {
|
|
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
|
+
}
|
|
245
248
|
continue;
|
|
246
249
|
}
|
|
247
250
|
|
|
@@ -250,20 +253,22 @@ export class ProjectTree {
|
|
|
250
253
|
await this.waitItemExpanded(rootItem);
|
|
251
254
|
|
|
252
255
|
// do five checks of the item in one fifth of the time given for root folder item (was causing frequent reloads of the workspace)
|
|
253
|
-
const
|
|
256
|
+
const isSubfolderVisible = await this.driverHelper.waitVisibilityBoolean(rootSubitemLocator, 5, visibilityItemPolling / 5);
|
|
254
257
|
|
|
255
|
-
if (!
|
|
258
|
+
if (!isSubfolderVisible) {
|
|
256
259
|
Logger.trace(`ProjectTree.waitProjectImported sub-items not found, reloading page.`);
|
|
257
260
|
await this.browserTabsUtil.refreshPage();
|
|
258
261
|
await this.ide.waitWorkspaceAndIde();
|
|
259
262
|
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
|
+
}
|
|
260
266
|
continue;
|
|
261
267
|
}
|
|
262
|
-
return;
|
|
263
|
-
}
|
|
264
|
-
|
|
265
|
-
throw new error.TimeoutError('Exceeded the maximum number of checking attempts, project has not been imported');
|
|
266
268
|
|
|
269
|
+
Logger.trace(`ProjectTree.waitProjectImported project successfully imported`);
|
|
270
|
+
break;
|
|
271
|
+
}
|
|
267
272
|
}
|
|
268
273
|
|
|
269
274
|
async waitProjectImportedNoSubfolder(projectName: string,
|