@eclipse-che/che-e2e 7.43.0 → 7.45.0-dev-0129fe6
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/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.js +8 -8
- package/dist/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.js.map +1 -1
- package/dist/tests/plugins/TypescriptPlugin.spec.js +14 -22
- package/dist/tests/plugins/TypescriptPlugin.spec.js.map +1 -1
- package/dist/tests/plugins/VscodeYamlPlugin.spec.js +11 -20
- package/dist/tests/plugins/VscodeYamlPlugin.spec.js.map +1 -1
- package/dist/testsLibrary/ProjectAndFileTests.js +0 -4
- package/dist/testsLibrary/ProjectAndFileTests.js.map +1 -1
- package/dist/utils/PreferencesHandler.js +3 -0
- package/dist/utils/PreferencesHandler.js.map +1 -1
- package/package.json +2 -2
- package/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts +10 -12
- package/tests/plugins/TypescriptPlugin.spec.ts +18 -27
- package/tests/plugins/VscodeYamlPlugin.spec.ts +14 -24
- package/testsLibrary/ProjectAndFileTests.ts +3 -5
- package/utils/PreferencesHandler.ts +3 -0
|
@@ -130,14 +130,14 @@ suite('Language server validation', async () => {
|
|
|
130
130
|
});
|
|
131
131
|
});
|
|
132
132
|
suite('Validation of workspace build and run', async () => {
|
|
133
|
+
const mavenBuildTaskName = 'maven-build';
|
|
134
|
+
const runAppTaskName = 'run-with-hsqldb';
|
|
133
135
|
test('Build application', async () => {
|
|
134
|
-
|
|
135
|
-
await
|
|
136
|
-
await terminal.waitIconSuccess(taskName, 500000);
|
|
136
|
+
await topMenu.runTask(`${mavenBuildTaskName}, ${globalTaskScope}`);
|
|
137
|
+
await terminal.waitIconSuccess(mavenBuildTaskName, 500000);
|
|
137
138
|
});
|
|
138
139
|
test('Run application', async () => {
|
|
139
|
-
|
|
140
|
-
await topMenu.runTask(`${taskName}, ${globalTaskScope}`);
|
|
140
|
+
await topMenu.runTask(`${runAppTaskName}, ${globalTaskScope}`);
|
|
141
141
|
await ide.waitNotification('Process 8080-tcp is now listening on port 8080. Open it ?', 120000);
|
|
142
142
|
// devWs specific. After running test application we can open it just in the new window.
|
|
143
143
|
// the preview widget is not available yet.
|
|
@@ -148,10 +148,10 @@ suite('Validation of workspace build and run', async () => {
|
|
|
148
148
|
await switchAppWindowAndCheck(SpringAppLocators.springTitleLocator);
|
|
149
149
|
});
|
|
150
150
|
test('Close the terminal running tasks', async () => {
|
|
151
|
-
await terminal.rejectTerminalProcess(
|
|
152
|
-
await terminal.closeTerminalTab(
|
|
151
|
+
await terminal.rejectTerminalProcess(runAppTaskName);
|
|
152
|
+
await terminal.closeTerminalTab(runAppTaskName);
|
|
153
153
|
await warningDialog.waitAndCloseIfAppear();
|
|
154
|
-
await terminal.closeTerminalTab(
|
|
154
|
+
await terminal.closeTerminalTab(mavenBuildTaskName);
|
|
155
155
|
});
|
|
156
156
|
});
|
|
157
157
|
suite('Validation of debug functionality', async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DevWorkspaceHappyPath.spec.js","sourceRoot":"","sources":["../../../tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DevWorkspaceHappyPath.spec.js","sourceRoot":"","sources":["../../../tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,7 @@ const TestConstants_1 = require("../../TestConstants");
|
|
|
21
21
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
22
22
|
const Logger_1 = require("../../utils/Logger");
|
|
23
23
|
const CheReporter_1 = __importDefault(require("../../driver/CheReporter"));
|
|
24
|
+
const projectAndFileTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectAndFileTests);
|
|
24
25
|
const workspaceHandlingTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.WorkspaceHandlingTests);
|
|
25
26
|
const driverHelper = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.DriverHelper);
|
|
26
27
|
const ide = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.Ide);
|
|
@@ -30,31 +31,27 @@ const topMenu = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.To
|
|
|
30
31
|
const debugView = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.DebugView);
|
|
31
32
|
const terminal = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.Terminal);
|
|
32
33
|
const browserTabsUtil = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.BrowserTabsUtil);
|
|
33
|
-
const
|
|
34
|
-
const devfileUrl = 'https://
|
|
34
|
+
const preferencesHandler = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.PreferencesHandler);
|
|
35
|
+
const devfileUrl = 'https://github.com/che-samples/web-nodejs-sample/tree/typescript-plugin';
|
|
35
36
|
const factoryUrl = `${TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;
|
|
36
37
|
const codeNavigationClassName = 'OpenDefinition.ts';
|
|
37
|
-
const projectName = 'nodejs-
|
|
38
|
+
const projectName = 'web-nodejs-sample';
|
|
38
39
|
const subRootFolder = 'app';
|
|
39
40
|
const sampleBodyLocator = selenium_webdriver_1.By.xpath(`//body[text()='Hello World!']`);
|
|
40
41
|
const fileFolderPath = `${projectName}`;
|
|
41
42
|
const debugFileFolderPath = `${projectName}/app`;
|
|
42
43
|
const debugFile = 'app.js';
|
|
43
44
|
const tabTitle = 'typescript-node-debug.ts';
|
|
44
|
-
let workspaceName;
|
|
45
|
+
let workspaceName = 'typescript-plugin';
|
|
45
46
|
suite(`The 'TypescriptPlugin and Node-debug' tests`, async () => {
|
|
46
47
|
suite('Create workspace', async () => {
|
|
47
48
|
test('Create workspace using factory', async () => {
|
|
48
49
|
await browserTabsUtil.navigateTo(factoryUrl);
|
|
49
50
|
});
|
|
51
|
+
projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
|
|
50
52
|
test('Wait until created workspace is started', async () => {
|
|
51
|
-
await ide.waitAndSwitchToIdeFrame();
|
|
52
|
-
workspaceName = await workspaceNameHandler.getNameFromUrl();
|
|
53
53
|
CheReporter_1.default.registerRunningWorkspace(workspaceName);
|
|
54
|
-
await
|
|
55
|
-
await ide.waitNotificationAndClickOnButton('Do you trust the authors of', 'Yes, I trust', 60000);
|
|
56
|
-
await projectTree.openProjectTreeContainer();
|
|
57
|
-
await projectTree.waitProjectImported(projectName, subRootFolder);
|
|
54
|
+
await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
|
|
58
55
|
});
|
|
59
56
|
});
|
|
60
57
|
suite('The Typescript plugin test', async () => {
|
|
@@ -88,20 +85,19 @@ suite(`The 'TypescriptPlugin and Node-debug' tests`, async () => {
|
|
|
88
85
|
suite(`The 'Node-debug' plugin test`, async () => {
|
|
89
86
|
let currentWindow = '';
|
|
90
87
|
let applicationPreviewWindow = '';
|
|
91
|
-
test('Run application in debug mode', async () => {
|
|
92
|
-
await topMenu.runTask('run the web app (debugging enabled), Global');
|
|
93
|
-
await ide.waitNotification('Process nodejs is now listening on port 3000.');
|
|
94
|
-
currentWindow = await browserTabsUtil.getCurrentWindowHandle();
|
|
95
|
-
});
|
|
96
88
|
test('Open application in the new editor window', async () => {
|
|
97
|
-
await
|
|
89
|
+
currentWindow = await browserTabsUtil.getCurrentWindowHandle();
|
|
90
|
+
await topMenu.runTask('run-the-web-app, Global');
|
|
91
|
+
await ide.waitNotification('A new process is now listening on port 3000', TimeoutConstants_1.TimeoutConstants.TS_DEBUGGER_CONNECTION_TIMEOUT);
|
|
92
|
+
await ide.clickOnNotificationButton('A new process is now listening on port 3000', 'yes');
|
|
93
|
+
await ide.waitNotification('Redirect is now enabled on port 3000.', TimeoutConstants_1.TimeoutConstants.TS_DEBUGGER_CONNECTION_TIMEOUT);
|
|
94
|
+
await ide.clickOnNotificationButton('Redirect is now enabled on port 3000.', 'Open In New Tab');
|
|
98
95
|
await browserTabsUtil.waitAndSwitchToAnotherWindow(currentWindow, 60000);
|
|
99
96
|
await browserTabsUtil.waitContentAvailableInTheNewTab(sampleBodyLocator, 60000);
|
|
100
97
|
applicationPreviewWindow = await browserTabsUtil.getCurrentWindowHandle();
|
|
101
98
|
});
|
|
102
99
|
test('Switch back to the IDE window', async () => {
|
|
103
100
|
await browserTabsUtil.switchToWindow(currentWindow);
|
|
104
|
-
await ide.waitAndSwitchToIdeFrame(60000);
|
|
105
101
|
});
|
|
106
102
|
test('Activate breakpoint', async () => {
|
|
107
103
|
await projectTree.expandPathAndOpenFile(debugFileFolderPath, debugFile);
|
|
@@ -110,11 +106,8 @@ suite(`The 'TypescriptPlugin and Node-debug' tests`, async () => {
|
|
|
110
106
|
test('Run debug', async () => {
|
|
111
107
|
await topMenu.selectOption('View', 'Debug');
|
|
112
108
|
await ide.waitLeftToolbarButton(Ide_1.LeftToolbarButton.Debug);
|
|
113
|
-
// workaround for the issue: https://github.com/eclipse/che/issues/20067
|
|
114
|
-
await debugView.clickOnDebugConfigurationDropDown();
|
|
115
|
-
await debugView.clickOnDebugConfigurationItem('Add Configuration...');
|
|
116
109
|
await debugView.clickOnDebugConfigurationDropDown();
|
|
117
|
-
await debugView.clickOnDebugConfigurationItem('Attach
|
|
110
|
+
await debugView.clickOnDebugConfigurationItem('Attach (web-nodejs-sample)');
|
|
118
111
|
await debugView.clickOnRunDebugButton();
|
|
119
112
|
});
|
|
120
113
|
test('Wait debug connected', async () => {
|
|
@@ -130,7 +123,6 @@ suite(`The 'TypescriptPlugin and Node-debug' tests`, async () => {
|
|
|
130
123
|
});
|
|
131
124
|
test('Check breakpoint stopped', async () => {
|
|
132
125
|
await browserTabsUtil.switchToWindow(currentWindow);
|
|
133
|
-
await ide.waitAndSwitchToIdeFrame(60000);
|
|
134
126
|
await editor.waitStoppedDebugBreakpoint(debugFile, 19, 60000);
|
|
135
127
|
});
|
|
136
128
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypescriptPlugin.spec.js","sourceRoot":"","sources":["../../../tests/plugins/TypescriptPlugin.spec.ts"],"names":[],"mappings":";;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAE1B,6DAAsD;AACtD,2DAAgD;AAChD,mDAAmE;AACnE,6DAA0D;AAC1D,uDAAoD;AAEpD,2DAA6C;AAO7C,+CAA4C;AAC5C,2EAAmD;
|
|
1
|
+
{"version":3,"file":"TypescriptPlugin.spec.js","sourceRoot":"","sources":["../../../tests/plugins/TypescriptPlugin.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,40 +16,31 @@ const selenium_webdriver_1 = require("selenium-webdriver");
|
|
|
16
16
|
const inversify_config_1 = require("../../inversify.config");
|
|
17
17
|
const inversify_types_1 = require("../../inversify.types");
|
|
18
18
|
const TestConstants_1 = require("../../TestConstants");
|
|
19
|
-
const TimeoutConstants_1 = require("../../TimeoutConstants");
|
|
20
19
|
const Logger_1 = require("../../utils/Logger");
|
|
21
20
|
const CheReporter_1 = __importDefault(require("../../driver/CheReporter"));
|
|
22
|
-
const
|
|
21
|
+
const projectAndFileTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectAndFileTests);
|
|
23
22
|
const projectTree = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectTree);
|
|
24
23
|
const editor = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.Editor);
|
|
25
24
|
const browserTabsUtil = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.BrowserTabsUtil);
|
|
26
|
-
const preferencesHandler = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.PreferencesHandler);
|
|
27
25
|
const workspaceHandlingTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.WorkspaceHandlingTests);
|
|
28
|
-
const
|
|
29
|
-
const devfileUrl = 'https://
|
|
26
|
+
const preferencesHandler = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.PreferencesHandler);
|
|
27
|
+
const devfileUrl = 'https://github.com/che-samples/web-nodejs-sample/tree/yaml-plugin';
|
|
30
28
|
const factoryUrl = `${TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;
|
|
31
|
-
const projectName = 'nodejs-
|
|
29
|
+
const projectName = 'web-nodejs-sample';
|
|
30
|
+
const subRootFolder = 'app';
|
|
32
31
|
const pathToFile = `${projectName}`;
|
|
33
32
|
const yamlFileName = 'routes.yaml';
|
|
34
33
|
const yamlSchema = { 'yaml-schema.json': '*.yaml' };
|
|
35
|
-
let workspaceName = '';
|
|
34
|
+
let workspaceName = 'yaml-plugin';
|
|
36
35
|
suite('The "VscodeYamlPlugin" userstory', async () => {
|
|
37
36
|
suite('Create workspace', async () => {
|
|
38
37
|
test('Create workspace using factory', async () => {
|
|
39
38
|
await browserTabsUtil.navigateTo(factoryUrl);
|
|
40
39
|
});
|
|
40
|
+
projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
|
|
41
41
|
test('Wait until created workspace is started', async () => {
|
|
42
|
-
await ide.waitAndSwitchToIdeFrame();
|
|
43
|
-
workspaceName = await workspaceNameHandler.getNameFromUrl();
|
|
44
42
|
CheReporter_1.default.registerRunningWorkspace(workspaceName);
|
|
45
|
-
await
|
|
46
|
-
await ide.waitNotificationAndClickOnButton('Do you trust the authors of', 'Yes, I trust', 60000);
|
|
47
|
-
});
|
|
48
|
-
});
|
|
49
|
-
suite('Check workspace readiness to work', async () => {
|
|
50
|
-
test('Wait until project is imported', async () => {
|
|
51
|
-
await projectTree.openProjectTreeContainer();
|
|
52
|
-
await projectTree.waitProjectImported(projectName, 'app');
|
|
43
|
+
await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
|
|
53
44
|
});
|
|
54
45
|
});
|
|
55
46
|
suite('Check the "vscode-yaml" plugin', async () => {
|
|
@@ -62,12 +53,12 @@ suite('The "VscodeYamlPlugin" userstory', async () => {
|
|
|
62
53
|
});
|
|
63
54
|
test('Check error appearance', async () => {
|
|
64
55
|
await projectTree.expandPathAndOpenFile(pathToFile, yamlFileName);
|
|
65
|
-
await editor.type(yamlFileName, selenium_webdriver_1.Key.SPACE,
|
|
66
|
-
await editor.waitErrorInLine(
|
|
56
|
+
await editor.type(yamlFileName, selenium_webdriver_1.Key.SPACE, 20);
|
|
57
|
+
await editor.waitErrorInLine(20, yamlFileName);
|
|
67
58
|
});
|
|
68
59
|
test('Check error disappearance', async () => {
|
|
69
60
|
await editor.performKeyCombination(yamlFileName, selenium_webdriver_1.Key.BACK_SPACE);
|
|
70
|
-
await editor.waitErrorInLineDisappearance(
|
|
61
|
+
await editor.waitErrorInLineDisappearance(20, yamlFileName);
|
|
71
62
|
});
|
|
72
63
|
test('To unformat the "yaml" file', async () => {
|
|
73
64
|
const expectedTextBeforeFormating = 'uri: "timer:tick"';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VscodeYamlPlugin.spec.js","sourceRoot":"","sources":["../../../tests/plugins/VscodeYamlPlugin.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;AAExE,2DAAyC;AACzC,6DAAsD;AACtD,2DAAgD;
|
|
1
|
+
{"version":3,"file":"VscodeYamlPlugin.spec.js","sourceRoot":"","sources":["../../../tests/plugins/VscodeYamlPlugin.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,11 +42,7 @@ let ProjectAndFileTests = class ProjectAndFileTests {
|
|
|
42
42
|
}
|
|
43
43
|
waitWorkspaceReadiness(sampleName, folder, checkNotification = true, restartWorkspaceDialogIsExpected = false) {
|
|
44
44
|
test('Wait for workspace readiness', async () => {
|
|
45
|
-
await this.ide.waitAndSwitchToIdeFrame();
|
|
46
45
|
await this.ide.waitIde(TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
|
|
47
|
-
if (checkNotification) {
|
|
48
|
-
await this.ide.waitNotificationAndClickOnButton('Do you trust the authors of', 'Yes, I trust', 60000);
|
|
49
|
-
}
|
|
50
46
|
if (restartWorkspaceDialogIsExpected) {
|
|
51
47
|
await this.ide.clickOnCancelDialogButton();
|
|
52
48
|
}
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"ProjectAndFileTests.js","sourceRoot":"","sources":["../../testsLibrary/ProjectAndFileTests.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,6 +56,9 @@ let PreferencesHandler = class PreferencesHandler {
|
|
|
56
56
|
await this.topMenu.selectOption('View', 'Find Command...');
|
|
57
57
|
await this.quickOpenContainer.typeAndSelectSuggestion('Preferences:', 'Preferences: Open Preferences (JSON)');
|
|
58
58
|
let editorText = await this.editor.getEditorVisibleText(tabTitle);
|
|
59
|
+
if (!editorText) {
|
|
60
|
+
editorText = '{}';
|
|
61
|
+
}
|
|
59
62
|
let preferences = JSON.parse(editorText);
|
|
60
63
|
preferences[property] = value;
|
|
61
64
|
await this.editor.deleteAllText(tabTitle);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PreferencesHandler.js","sourceRoot":"","sources":["../../utils/PreferencesHandler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"PreferencesHandler.js","sourceRoot":"","sources":["../../utils/PreferencesHandler.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-che/che-e2e",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.45.0-dev-0129fe6",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"tsc": "tsc -p .",
|
|
27
27
|
"init-mocha-opts": "tsc && mocha --config mocha-single-devfile.json --spec dist/tests/login/Login.spec.js",
|
|
28
28
|
"test-plugin": "./initPluginTest.sh",
|
|
29
|
-
"test-plugin-ci": "export TS_DELETE_PLUGINS_TEST_WORKSPACE=
|
|
29
|
+
"test-plugin-ci": "export TS_DELETE_PLUGINS_TEST_WORKSPACE=true && npm run init-mocha-opts -- --spec dist/tests/plugins/${USERSTORY}.spec.js",
|
|
30
30
|
"test-all-plugins": "tsc && mocha --config mocha-all-plugins.json"
|
|
31
31
|
},
|
|
32
32
|
"author": "Ihor Okhrimenko (iokhrime@redhat.com)",
|
|
@@ -137,15 +137,15 @@ suite('Workspace creation via factory url', async () => {
|
|
|
137
137
|
});
|
|
138
138
|
});
|
|
139
139
|
suite('Validation of workspace build and run', async () => {
|
|
140
|
+
const mavenBuildTaskName: string = 'maven-build';
|
|
141
|
+
const runAppTaskName: string = 'run-with-hsqldb';
|
|
140
142
|
test('Build application', async () => {
|
|
141
|
-
|
|
142
|
-
await
|
|
143
|
-
await terminal.waitIconSuccess(taskName, 500_000);
|
|
143
|
+
await topMenu.runTask(`${mavenBuildTaskName}, ${globalTaskScope}`);
|
|
144
|
+
await terminal.waitIconSuccess(mavenBuildTaskName, 500_000);
|
|
144
145
|
});
|
|
145
146
|
|
|
146
147
|
test('Run application', async () => {
|
|
147
|
-
|
|
148
|
-
await topMenu.runTask(`${taskName}, ${globalTaskScope}`);
|
|
148
|
+
await topMenu.runTask(`${runAppTaskName}, ${globalTaskScope}`);
|
|
149
149
|
await ide.waitNotification('Process 8080-tcp is now listening on port 8080. Open it ?', 120_000);
|
|
150
150
|
// devWs specific. After running test application we can open it just in the new window.
|
|
151
151
|
// the preview widget is not available yet.
|
|
@@ -157,10 +157,10 @@ suite('Workspace creation via factory url', async () => {
|
|
|
157
157
|
});
|
|
158
158
|
|
|
159
159
|
test('Close the terminal running tasks', async () => {
|
|
160
|
-
await terminal.rejectTerminalProcess(
|
|
161
|
-
await terminal.closeTerminalTab(
|
|
160
|
+
await terminal.rejectTerminalProcess(runAppTaskName);
|
|
161
|
+
await terminal.closeTerminalTab(runAppTaskName);
|
|
162
162
|
await warningDialog.waitAndCloseIfAppear();
|
|
163
|
-
await terminal.closeTerminalTab(
|
|
163
|
+
await terminal.closeTerminalTab(mavenBuildTaskName);
|
|
164
164
|
});
|
|
165
165
|
});
|
|
166
166
|
|
|
@@ -275,10 +275,8 @@ async function sendRequestToDebugApp(urlToApp: string) {
|
|
|
275
275
|
} catch (error) {
|
|
276
276
|
if (error.message === 'timeout of 1000ms exceeded') {
|
|
277
277
|
console.log('>>>>The debugger is set >>>>>>>>>>>>>>>>>>> ' + error.message);
|
|
278
|
-
}
|
|
279
|
-
|
|
280
|
-
const {data} = await httpClient.get(urlToApp);
|
|
281
|
-
console.log('>>>>>>>seems the app. is not set under debug properly: >>>>>>>>>>>>>>'+ data)
|
|
278
|
+
} else { const {data} = await httpClient.get(urlToApp);
|
|
279
|
+
console.log('>>>>>>>seems the app. is not set under debug properly: >>>>>>>>>>>>>>' + data);
|
|
282
280
|
}
|
|
283
281
|
}
|
|
284
282
|
}
|
|
@@ -24,8 +24,10 @@ import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
|
|
|
24
24
|
import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
|
|
25
25
|
import { Logger } from '../../utils/Logger';
|
|
26
26
|
import CheReporter from '../../driver/CheReporter';
|
|
27
|
-
import {
|
|
27
|
+
import { PreferencesHandler } from '../../utils/PreferencesHandler';
|
|
28
|
+
import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
|
|
28
29
|
|
|
30
|
+
const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
|
|
29
31
|
const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
|
|
30
32
|
const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
|
|
31
33
|
const ide: Ide = e2eContainer.get(CLASSES.Ide);
|
|
@@ -35,20 +37,19 @@ const topMenu: TopMenu = e2eContainer.get(CLASSES.TopMenu);
|
|
|
35
37
|
const debugView: DebugView = e2eContainer.get(CLASSES.DebugView);
|
|
36
38
|
const terminal: Terminal = e2eContainer.get(CLASSES.Terminal);
|
|
37
39
|
const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
|
|
38
|
-
const
|
|
40
|
+
const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
|
|
39
41
|
|
|
40
|
-
const devfileUrl: string = 'https://
|
|
42
|
+
const devfileUrl: string = 'https://github.com/che-samples/web-nodejs-sample/tree/typescript-plugin';
|
|
41
43
|
const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;
|
|
42
44
|
const codeNavigationClassName: string = 'OpenDefinition.ts';
|
|
43
|
-
const projectName: string = 'nodejs-
|
|
45
|
+
const projectName: string = 'web-nodejs-sample';
|
|
44
46
|
const subRootFolder: string = 'app';
|
|
45
47
|
const sampleBodyLocator: By = By.xpath(`//body[text()='Hello World!']`);
|
|
46
|
-
|
|
47
48
|
const fileFolderPath: string = `${projectName}`;
|
|
48
49
|
const debugFileFolderPath: string = `${projectName}/app`;
|
|
49
50
|
const debugFile: string = 'app.js';
|
|
50
51
|
const tabTitle: string = 'typescript-node-debug.ts';
|
|
51
|
-
let workspaceName: string;
|
|
52
|
+
let workspaceName: string = 'typescript-plugin';
|
|
52
53
|
|
|
53
54
|
suite(`The 'TypescriptPlugin and Node-debug' tests`, async () => {
|
|
54
55
|
suite('Create workspace', async () => {
|
|
@@ -56,16 +57,12 @@ suite(`The 'TypescriptPlugin and Node-debug' tests`, async () => {
|
|
|
56
57
|
await browserTabsUtil.navigateTo(factoryUrl);
|
|
57
58
|
});
|
|
58
59
|
|
|
60
|
+
projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
|
|
61
|
+
|
|
59
62
|
test('Wait until created workspace is started', async () => {
|
|
60
|
-
await ide.waitAndSwitchToIdeFrame();
|
|
61
|
-
workspaceName = await workspaceNameHandler.getNameFromUrl();
|
|
62
63
|
CheReporter.registerRunningWorkspace(workspaceName);
|
|
63
64
|
|
|
64
|
-
await
|
|
65
|
-
await ide.waitNotificationAndClickOnButton('Do you trust the authors of', 'Yes, I trust', 60_000);
|
|
66
|
-
|
|
67
|
-
await projectTree.openProjectTreeContainer();
|
|
68
|
-
await projectTree.waitProjectImported(projectName, subRootFolder);
|
|
65
|
+
await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
|
|
69
66
|
});
|
|
70
67
|
});
|
|
71
68
|
|
|
@@ -106,15 +103,15 @@ suite(`The 'TypescriptPlugin and Node-debug' tests`, async () => {
|
|
|
106
103
|
let currentWindow: string = '';
|
|
107
104
|
let applicationPreviewWindow: string = '';
|
|
108
105
|
|
|
109
|
-
test('
|
|
110
|
-
await topMenu.runTask('run the web app (debugging enabled), Global');
|
|
111
|
-
await ide.waitNotification('Process nodejs is now listening on port 3000.');
|
|
112
|
-
|
|
106
|
+
test('Open application in the new editor window', async () => {
|
|
113
107
|
currentWindow = await browserTabsUtil.getCurrentWindowHandle();
|
|
114
|
-
});
|
|
115
108
|
|
|
116
|
-
|
|
117
|
-
await ide.
|
|
109
|
+
await topMenu.runTask('run-the-web-app, Global');
|
|
110
|
+
await ide.waitNotification('A new process is now listening on port 3000', TimeoutConstants.TS_DEBUGGER_CONNECTION_TIMEOUT);
|
|
111
|
+
await ide.clickOnNotificationButton('A new process is now listening on port 3000', 'yes');
|
|
112
|
+
|
|
113
|
+
await ide.waitNotification('Redirect is now enabled on port 3000.', TimeoutConstants.TS_DEBUGGER_CONNECTION_TIMEOUT);
|
|
114
|
+
await ide.clickOnNotificationButton('Redirect is now enabled on port 3000.', 'Open In New Tab');
|
|
118
115
|
await browserTabsUtil.waitAndSwitchToAnotherWindow(currentWindow, 60_000);
|
|
119
116
|
await browserTabsUtil.waitContentAvailableInTheNewTab(sampleBodyLocator, 60_000);
|
|
120
117
|
|
|
@@ -123,7 +120,6 @@ suite(`The 'TypescriptPlugin and Node-debug' tests`, async () => {
|
|
|
123
120
|
|
|
124
121
|
test('Switch back to the IDE window', async () => {
|
|
125
122
|
await browserTabsUtil.switchToWindow(currentWindow);
|
|
126
|
-
await ide.waitAndSwitchToIdeFrame(60_000);
|
|
127
123
|
});
|
|
128
124
|
|
|
129
125
|
test('Activate breakpoint', async () => {
|
|
@@ -135,12 +131,8 @@ suite(`The 'TypescriptPlugin and Node-debug' tests`, async () => {
|
|
|
135
131
|
await topMenu.selectOption('View', 'Debug');
|
|
136
132
|
await ide.waitLeftToolbarButton(LeftToolbarButton.Debug);
|
|
137
133
|
|
|
138
|
-
// workaround for the issue: https://github.com/eclipse/che/issues/20067
|
|
139
|
-
await debugView.clickOnDebugConfigurationDropDown();
|
|
140
|
-
await debugView.clickOnDebugConfigurationItem('Add Configuration...');
|
|
141
|
-
|
|
142
134
|
await debugView.clickOnDebugConfigurationDropDown();
|
|
143
|
-
await debugView.clickOnDebugConfigurationItem('Attach
|
|
135
|
+
await debugView.clickOnDebugConfigurationItem('Attach (web-nodejs-sample)');
|
|
144
136
|
await debugView.clickOnRunDebugButton();
|
|
145
137
|
});
|
|
146
138
|
|
|
@@ -160,7 +152,6 @@ suite(`The 'TypescriptPlugin and Node-debug' tests`, async () => {
|
|
|
160
152
|
|
|
161
153
|
test('Check breakpoint stopped', async () => {
|
|
162
154
|
await browserTabsUtil.switchToWindow(currentWindow);
|
|
163
|
-
await ide.waitAndSwitchToIdeFrame(60000);
|
|
164
155
|
|
|
165
156
|
await editor.waitStoppedDebugBreakpoint(debugFile, 19, 60_000);
|
|
166
157
|
});
|
|
@@ -11,34 +11,32 @@
|
|
|
11
11
|
import { Key } from 'selenium-webdriver';
|
|
12
12
|
import { e2eContainer } from '../../inversify.config';
|
|
13
13
|
import { CLASSES } from '../../inversify.types';
|
|
14
|
-
import { Ide } from '../../pageobjects/ide/Ide';
|
|
15
14
|
import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
|
|
16
15
|
import { Editor } from '../../pageobjects/ide/Editor';
|
|
17
|
-
import { PreferencesHandler } from '../../utils/PreferencesHandler';
|
|
18
16
|
import { TestConstants } from '../../TestConstants';
|
|
19
|
-
import { TimeoutConstants } from '../../TimeoutConstants';
|
|
20
|
-
import { WorkspaceNameHandler } from '../../utils/WorkspaceNameHandler';
|
|
21
17
|
import { Logger } from '../../utils/Logger';
|
|
22
18
|
import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
|
|
23
19
|
import CheReporter from '../../driver/CheReporter';
|
|
24
20
|
import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
|
|
21
|
+
import { PreferencesHandler } from '../../utils/PreferencesHandler';
|
|
22
|
+
import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
|
|
25
23
|
|
|
26
|
-
const
|
|
24
|
+
const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
|
|
27
25
|
const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
|
|
28
26
|
const editor: Editor = e2eContainer.get(CLASSES.Editor);
|
|
29
27
|
const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
|
|
30
|
-
const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
|
|
31
28
|
const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
|
|
32
|
-
const
|
|
29
|
+
const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
|
|
33
30
|
|
|
34
|
-
const devfileUrl: string = 'https://
|
|
31
|
+
const devfileUrl: string = 'https://github.com/che-samples/web-nodejs-sample/tree/yaml-plugin';
|
|
35
32
|
const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;
|
|
36
|
-
const projectName: string = 'nodejs-
|
|
33
|
+
const projectName: string = 'web-nodejs-sample';
|
|
34
|
+
const subRootFolder: string = 'app';
|
|
37
35
|
const pathToFile: string = `${projectName}`;
|
|
38
36
|
const yamlFileName: string = 'routes.yaml';
|
|
39
37
|
const yamlSchema = { 'yaml-schema.json': '*.yaml' };
|
|
40
38
|
|
|
41
|
-
let workspaceName: string = '';
|
|
39
|
+
let workspaceName: string = 'yaml-plugin';
|
|
42
40
|
|
|
43
41
|
suite('The "VscodeYamlPlugin" userstory', async () => {
|
|
44
42
|
suite('Create workspace', async () => {
|
|
@@ -46,20 +44,12 @@ suite('The "VscodeYamlPlugin" userstory', async () => {
|
|
|
46
44
|
await browserTabsUtil.navigateTo(factoryUrl);
|
|
47
45
|
});
|
|
48
46
|
|
|
47
|
+
projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
|
|
48
|
+
|
|
49
49
|
test('Wait until created workspace is started', async () => {
|
|
50
|
-
await ide.waitAndSwitchToIdeFrame();
|
|
51
|
-
workspaceName = await workspaceNameHandler.getNameFromUrl();
|
|
52
50
|
CheReporter.registerRunningWorkspace(workspaceName);
|
|
53
51
|
|
|
54
|
-
await
|
|
55
|
-
await ide.waitNotificationAndClickOnButton('Do you trust the authors of', 'Yes, I trust', 60_000);
|
|
56
|
-
});
|
|
57
|
-
});
|
|
58
|
-
|
|
59
|
-
suite('Check workspace readiness to work', async () => {
|
|
60
|
-
test('Wait until project is imported', async () => {
|
|
61
|
-
await projectTree.openProjectTreeContainer();
|
|
62
|
-
await projectTree.waitProjectImported(projectName, 'app');
|
|
52
|
+
await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
|
|
63
53
|
});
|
|
64
54
|
});
|
|
65
55
|
|
|
@@ -76,13 +66,13 @@ suite('The "VscodeYamlPlugin" userstory', async () => {
|
|
|
76
66
|
test('Check error appearance', async () => {
|
|
77
67
|
await projectTree.expandPathAndOpenFile(pathToFile, yamlFileName);
|
|
78
68
|
|
|
79
|
-
await editor.type(yamlFileName, Key.SPACE,
|
|
80
|
-
await editor.waitErrorInLine(
|
|
69
|
+
await editor.type(yamlFileName, Key.SPACE, 20);
|
|
70
|
+
await editor.waitErrorInLine(20, yamlFileName);
|
|
81
71
|
});
|
|
82
72
|
|
|
83
73
|
test('Check error disappearance', async () => {
|
|
84
74
|
await editor.performKeyCombination(yamlFileName, Key.BACK_SPACE);
|
|
85
|
-
await editor.waitErrorInLineDisappearance(
|
|
75
|
+
await editor.waitErrorInLineDisappearance(20, yamlFileName);
|
|
86
76
|
});
|
|
87
77
|
|
|
88
78
|
test('To unformat the "yaml" file', async () => {
|
|
@@ -31,19 +31,17 @@ export class ProjectAndFileTests {
|
|
|
31
31
|
|
|
32
32
|
public waitWorkspaceReadiness(sampleName : string, folder: string, checkNotification: boolean = true, restartWorkspaceDialogIsExpected: boolean = false) {
|
|
33
33
|
test('Wait for workspace readiness', async () => {
|
|
34
|
-
await this.ide.waitAndSwitchToIdeFrame();
|
|
35
34
|
await this.ide.waitIde(TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
|
|
36
|
-
|
|
37
|
-
await this.ide.waitNotificationAndClickOnButton('Do you trust the authors of', 'Yes, I trust', 60_000);
|
|
38
|
-
}
|
|
35
|
+
|
|
39
36
|
if (restartWorkspaceDialogIsExpected) {
|
|
40
37
|
await this.ide.clickOnCancelDialogButton();
|
|
41
|
-
|
|
42
38
|
}
|
|
39
|
+
|
|
43
40
|
await this.projectTree.openProjectTreeContainer();
|
|
44
41
|
if (!await this.openEditors.isExpansionToggleCollapsed()) {
|
|
45
42
|
await this.openEditors.waitAndClickExpansionToggle();
|
|
46
43
|
}
|
|
44
|
+
|
|
47
45
|
await this.projectTree.waitProjectImported(sampleName, folder);
|
|
48
46
|
});
|
|
49
47
|
}
|
|
@@ -47,6 +47,9 @@ export class PreferencesHandler {
|
|
|
47
47
|
await this.quickOpenContainer.typeAndSelectSuggestion('Preferences:', 'Preferences: Open Preferences (JSON)');
|
|
48
48
|
|
|
49
49
|
let editorText: string = await this.editor.getEditorVisibleText(tabTitle);
|
|
50
|
+
if (!editorText) {
|
|
51
|
+
editorText = '{}';
|
|
52
|
+
}
|
|
50
53
|
let preferences = JSON.parse(editorText);
|
|
51
54
|
preferences[property] = value;
|
|
52
55
|
|