@eclipse-che/che-e2e 7.43.0-dev-4a58500 → 7.43.0-dev-eb3962f
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/plugins/TypescriptPlugin.spec.js +2 -3
- package/dist/tests/plugins/TypescriptPlugin.spec.js.map +1 -1
- package/dist/tests/plugins/VscodeYamlPlugin.spec.js +7 -10
- 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/plugins/TypescriptPlugin.spec.ts +4 -5
- package/tests/plugins/VscodeYamlPlugin.spec.ts +10 -13
- package/testsLibrary/ProjectAndFileTests.ts +3 -5
- package/utils/PreferencesHandler.ts +3 -0
|
@@ -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);
|
|
@@ -47,11 +48,9 @@ suite(`The 'TypescriptPlugin and Node-debug' tests`, 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
53
|
CheReporter_1.default.registerRunningWorkspace(workspaceName);
|
|
52
|
-
await ide.waitIde(TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
|
|
53
|
-
await projectTree.openProjectTreeContainer();
|
|
54
|
-
await projectTree.waitProjectImported(projectName, subRootFolder);
|
|
55
54
|
await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
|
|
56
55
|
});
|
|
57
56
|
});
|
|
@@ -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,10 +16,9 @@ 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);
|
|
@@ -28,6 +27,7 @@ const preferencesHandler = inversify_config_1.e2eContainer.get(inversify_types_1
|
|
|
28
27
|
const devfileUrl = 'https://github.com/che-samples/web-nodejs-sample/tree/yaml-plugin';
|
|
29
28
|
const factoryUrl = `${TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;
|
|
30
29
|
const projectName = 'web-nodejs-sample';
|
|
30
|
+
const subRootFolder = 'app';
|
|
31
31
|
const pathToFile = `${projectName}`;
|
|
32
32
|
const yamlFileName = 'routes.yaml';
|
|
33
33
|
const yamlSchema = { 'yaml-schema.json': '*.yaml' };
|
|
@@ -37,22 +37,19 @@ suite('The "VscodeYamlPlugin" userstory', async () => {
|
|
|
37
37
|
test('Create workspace using factory', async () => {
|
|
38
38
|
await browserTabsUtil.navigateTo(factoryUrl);
|
|
39
39
|
});
|
|
40
|
+
projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
|
|
40
41
|
test('Wait until created workspace is started', async () => {
|
|
41
42
|
CheReporter_1.default.registerRunningWorkspace(workspaceName);
|
|
42
|
-
await ide.waitIde(TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
|
|
43
|
-
});
|
|
44
|
-
});
|
|
45
|
-
suite('Check workspace readiness to work', async () => {
|
|
46
|
-
test('Wait until project is imported', async () => {
|
|
47
|
-
await projectTree.openProjectTreeContainer();
|
|
48
|
-
await projectTree.waitProjectImported(projectName, 'app');
|
|
49
43
|
await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
|
|
50
44
|
});
|
|
51
45
|
});
|
|
52
46
|
suite('Check the "vscode-yaml" plugin', async () => {
|
|
47
|
+
test('Set the yaml schema path', async () => {
|
|
48
|
+
await preferencesHandler.setPreferenceUsingUI('yaml.schemas', yamlSchema);
|
|
49
|
+
});
|
|
53
50
|
test('Check autocomplete', async () => {
|
|
54
51
|
await projectTree.expandPathAndOpenFile(pathToFile, yamlFileName);
|
|
55
|
-
await editor.waitSuggestion(yamlFileName, '
|
|
52
|
+
await editor.waitSuggestion(yamlFileName, 'from', 60000, 18, 5);
|
|
56
53
|
});
|
|
57
54
|
test('Check error appearance', async () => {
|
|
58
55
|
await projectTree.expandPathAndOpenFile(pathToFile, yamlFileName);
|
|
@@ -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":";AAAA;;;;;;;;wEAQwE;;;;;AAExE,2DAAyC;AACzC,6DAAsD;AACtD,2DAAgD;AAGhD,uDAAoD;AACpD,+CAA4C;AAE5C,2EAAmD;AAKnD,MAAM,mBAAmB,GAAwB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,mBAAmB,CAAC,CAAC;AAC/F,MAAM,WAAW,GAAgB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,WAAW,CAAC,CAAC;AACvE,MAAM,MAAM,GAAW,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,MAAM,CAAC,CAAC;AACxD,MAAM,eAAe,GAAoB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAC;AACnF,MAAM,sBAAsB,GAA2B,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,sBAAsB,CAAC,CAAC;AACxG,MAAM,kBAAkB,GAAuB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,kBAAkB,CAAC,CAAC;AAE5F,MAAM,UAAU,GAAW,mEAAmE,CAAC;AAC/F,MAAM,UAAU,GAAW,GAAG,6BAAa,CAAC,oBAAoB,UAAU,UAAU,EAAE,CAAC;AACvF,MAAM,WAAW,GAAW,mBAAmB,CAAC;AAChD,MAAM,aAAa,GAAW,KAAK,CAAC;AACpC,MAAM,UAAU,GAAW,GAAG,WAAW,EAAE,CAAC;AAC5C,MAAM,YAAY,GAAW,aAAa,CAAC;AAC3C,MAAM,UAAU,GAAG,EAAE,kBAAkB,EAAE,QAAQ,EAAE,CAAC;AAEpD,IAAI,aAAa,GAAW,aAAa,CAAC;AAE1C,KAAK,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;IACjD,KAAK,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;QACjC,IAAI,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;YAC9C,MAAM,eAAe,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,mBAAmB,CAAC,sBAAsB,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QAEvE,IAAI,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;YACvD,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,gCAAgC,EAAE,KAAK,IAAI,EAAE;QAC/C,IAAI,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;YACxC,MAAM,kBAAkB,CAAC,oBAAoB,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QAC9E,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,oBAAoB,EAAE,KAAK,IAAI,EAAE;YAClC,MAAM,WAAW,CAAC,qBAAqB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;YAClE,MAAM,MAAM,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,wBAAwB,EAAE,KAAK,IAAI,EAAE;YACtC,MAAM,WAAW,CAAC,qBAAqB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;YAElE,MAAM,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,wBAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC/C,MAAM,MAAM,CAAC,eAAe,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;YACzC,MAAM,MAAM,CAAC,qBAAqB,CAAC,YAAY,EAAE,wBAAG,CAAC,UAAU,CAAC,CAAC;YACjE,MAAM,MAAM,CAAC,4BAA4B,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;YAC3C,MAAM,2BAA2B,GAAW,uBAAuB,CAAC;YACpE,MAAM,WAAW,CAAC,qBAAqB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;YAElE,MAAM,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;YACrC,MAAM,MAAM,CAAC,uBAAuB,CAAC,YAAY,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YAC3D,MAAM,MAAM,CAAC,qBAAqB,CAAC,YAAY,EAAE,wBAAG,CAAC,KAAK,CAAC,wBAAG,CAAC,KAAK,EAAE,wBAAG,CAAC,KAAK,EAAE,wBAAG,CAAC,KAAK,EAAE,wBAAG,CAAC,KAAK,CAAC,CAAC,CAAC;YACxG,MAAM,MAAM,CAAC,QAAQ,CAAC,YAAY,EAAE,2BAA2B,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QACnF,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;YAC7C,MAAM,0BAA0B,GAAW,mBAAmB,CAAC;YAE/D,MAAM,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,wBAAG,CAAC,KAAK,CAAC,wBAAG,CAAC,OAAO,EAAE,wBAAG,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;YAC5E,MAAM,MAAM,CAAC,QAAQ,CAAC,YAAY,EAAE,0BAA0B,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAClF,CAAC,CAAC,CAAC;IAEP,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;QACjC,IAAI,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;YACzC,IAAI,6BAAa,CAAC,gCAAgC,KAAK,MAAM,EAAE;gBAC3D,MAAM,sBAAsB,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC;gBACnE,OAAO;aACV;YAED,eAAM,CAAC,IAAI,CAAC,qGAAqG,CAAC,CAAC;QACvH,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -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.43.0-dev-
|
|
3
|
+
"version": "7.43.0-dev-eb3962f",
|
|
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)",
|
|
@@ -25,7 +25,9 @@ import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTest
|
|
|
25
25
|
import { Logger } from '../../utils/Logger';
|
|
26
26
|
import CheReporter from '../../driver/CheReporter';
|
|
27
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);
|
|
@@ -43,7 +45,6 @@ const codeNavigationClassName: string = 'OpenDefinition.ts';
|
|
|
43
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';
|
|
@@ -56,13 +57,11 @@ 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
63
|
CheReporter.registerRunningWorkspace(workspaceName);
|
|
61
64
|
|
|
62
|
-
await ide.waitIde(TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
|
|
63
|
-
await projectTree.openProjectTreeContainer();
|
|
64
|
-
await projectTree.waitProjectImported(projectName, subRootFolder);
|
|
65
|
-
|
|
66
65
|
await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
|
|
67
66
|
});
|
|
68
67
|
});
|
|
@@ -11,18 +11,17 @@
|
|
|
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
16
|
import { TestConstants } from '../../TestConstants';
|
|
18
|
-
import { TimeoutConstants } from '../../TimeoutConstants';
|
|
19
17
|
import { Logger } from '../../utils/Logger';
|
|
20
18
|
import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
|
|
21
19
|
import CheReporter from '../../driver/CheReporter';
|
|
22
20
|
import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
|
|
23
21
|
import { PreferencesHandler } from '../../utils/PreferencesHandler';
|
|
22
|
+
import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
|
|
24
23
|
|
|
25
|
-
const
|
|
24
|
+
const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
|
|
26
25
|
const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
|
|
27
26
|
const editor: Editor = e2eContainer.get(CLASSES.Editor);
|
|
28
27
|
const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
|
|
@@ -32,6 +31,7 @@ const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.Preferen
|
|
|
32
31
|
const devfileUrl: string = 'https://github.com/che-samples/web-nodejs-sample/tree/yaml-plugin';
|
|
33
32
|
const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;
|
|
34
33
|
const projectName: string = 'web-nodejs-sample';
|
|
34
|
+
const subRootFolder: string = 'app';
|
|
35
35
|
const pathToFile: string = `${projectName}`;
|
|
36
36
|
const yamlFileName: string = 'routes.yaml';
|
|
37
37
|
const yamlSchema = { 'yaml-schema.json': '*.yaml' };
|
|
@@ -44,26 +44,23 @@ suite('The "VscodeYamlPlugin" userstory', async () => {
|
|
|
44
44
|
await browserTabsUtil.navigateTo(factoryUrl);
|
|
45
45
|
});
|
|
46
46
|
|
|
47
|
+
projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
|
|
48
|
+
|
|
47
49
|
test('Wait until created workspace is started', async () => {
|
|
48
50
|
CheReporter.registerRunningWorkspace(workspaceName);
|
|
49
51
|
|
|
50
|
-
await ide.waitIde(TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
|
|
51
|
-
});
|
|
52
|
-
});
|
|
53
|
-
|
|
54
|
-
suite('Check workspace readiness to work', async () => {
|
|
55
|
-
test('Wait until project is imported', async () => {
|
|
56
|
-
await projectTree.openProjectTreeContainer();
|
|
57
|
-
await projectTree.waitProjectImported(projectName, 'app');
|
|
58
|
-
|
|
59
52
|
await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
|
|
60
53
|
});
|
|
61
54
|
});
|
|
62
55
|
|
|
63
56
|
suite('Check the "vscode-yaml" plugin', async () => {
|
|
57
|
+
test('Set the yaml schema path', async () => {
|
|
58
|
+
await preferencesHandler.setPreferenceUsingUI('yaml.schemas', yamlSchema);
|
|
59
|
+
});
|
|
60
|
+
|
|
64
61
|
test('Check autocomplete', async () => {
|
|
65
62
|
await projectTree.expandPathAndOpenFile(pathToFile, yamlFileName);
|
|
66
|
-
await editor.waitSuggestion(yamlFileName, '
|
|
63
|
+
await editor.waitSuggestion(yamlFileName, 'from', 60000, 18, 5);
|
|
67
64
|
});
|
|
68
65
|
|
|
69
66
|
test('Check error appearance', 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
|
|