@eclipse-che/che-e2e 7.45.0-dev-564dd1b → 7.45.0-dev-ac76942
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +16 -1
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js +1 -1
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js.map +1 -1
- package/dist/pageobjects/ide/Ide.js +17 -3
- package/dist/pageobjects/ide/Ide.js.map +1 -1
- package/dist/pageobjects/ide/PreviewWidget.js +6 -2
- package/dist/pageobjects/ide/PreviewWidget.js.map +1 -1
- package/dist/pageobjects/ide/ProjectTree.js +3 -6
- package/dist/pageobjects/ide/ProjectTree.js.map +1 -1
- package/dist/tests/e2e/factories/DirectUrlFactoryWithKeepDirectoryTest.spec.js +10 -9
- package/dist/tests/e2e/factories/DirectUrlFactoryWithKeepDirectoryTest.spec.js.map +1 -1
- package/dist/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.js +10 -9
- package/dist/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.js.map +1 -1
- package/dist/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.js +15 -14
- package/dist/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.js.map +1 -1
- package/dist/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.js +2 -4
- package/dist/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.js.map +1 -1
- package/dist/tests/plugins/JavaPlugin.spec.js +27 -23
- package/dist/tests/plugins/JavaPlugin.spec.js.map +1 -1
- package/dist/tests/plugins/PythonPlugin.spec.js +10 -14
- package/dist/tests/plugins/PythonPlugin.spec.js.map +1 -1
- package/dist/testsLibrary/CodeExecutionTests.js +1 -2
- package/dist/testsLibrary/CodeExecutionTests.js.map +1 -1
- package/dist/testsLibrary/LanguageServerTests.js +4 -12
- package/dist/testsLibrary/LanguageServerTests.js.map +1 -1
- package/dist/testsLibrary/ProjectAndFileTests.js +0 -1
- package/dist/testsLibrary/ProjectAndFileTests.js.map +1 -1
- package/mocha-all-factories.json +2 -1
- package/package.json +1 -1
- package/pageobjects/dashboard/workspace-details/WorkspaceDetails.ts +1 -1
- package/pageobjects/ide/Ide.ts +17 -3
- package/pageobjects/ide/PreviewWidget.ts +6 -2
- package/pageobjects/ide/ProjectTree.ts +3 -6
- package/tests/e2e/factories/DirectUrlFactoryWithKeepDirectoryTest.spec.ts +15 -13
- package/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.ts +15 -14
- package/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.ts +19 -20
- package/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts +2 -4
- package/tests/plugins/JavaPlugin.spec.ts +20 -26
- package/tests/plugins/PythonPlugin.spec.ts +13 -17
- package/testsLibrary/CodeExecutionTests.ts +1 -2
- package/testsLibrary/LanguageServerTests.ts +3 -9
- package/testsLibrary/ProjectAndFileTests.ts +0 -1
|
@@ -3,6 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
/*********************************************************************
|
|
7
|
+
* Copyright (c) 2021 Red Hat, Inc.
|
|
8
|
+
*
|
|
9
|
+
* This program and the accompanying materials are made
|
|
10
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
11
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
12
|
+
*
|
|
13
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
14
|
+
**********************************************************************/
|
|
6
15
|
require("reflect-metadata");
|
|
7
16
|
const inversify_config_1 = require("../../inversify.config");
|
|
8
17
|
const inversify_types_1 = require("../../inversify.types");
|
|
@@ -15,30 +24,25 @@ const workspaceHandlingTests = inversify_config_1.e2eContainer.get(inversify_typ
|
|
|
15
24
|
const projectAndFileTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectAndFileTests);
|
|
16
25
|
const browserTabsUtil = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.BrowserTabsUtil);
|
|
17
26
|
const ide = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.Ide);
|
|
18
|
-
const projectTree = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectTree);
|
|
19
27
|
const editor = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.Editor);
|
|
20
|
-
const
|
|
21
|
-
const
|
|
22
|
-
const factoryUrl = `${TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL}/f?url=${
|
|
28
|
+
const preferencesHandler = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.PreferencesHandler);
|
|
29
|
+
const devFileUrl = 'https://github.com/che-samples/java-guestbook/tree/devfilev2';
|
|
30
|
+
const factoryUrl = `${TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devFileUrl}`;
|
|
23
31
|
const codeNavigationClassName = 'String.class';
|
|
24
|
-
const
|
|
25
|
-
const subRootFolder = '
|
|
26
|
-
const fileFolderPath = `${
|
|
27
|
-
const tabTitle = '
|
|
28
|
-
let workspaceName;
|
|
32
|
+
const projectName = 'java-guestbook';
|
|
33
|
+
const subRootFolder = 'backend';
|
|
34
|
+
const fileFolderPath = `${projectName}/backend/src/main/java/cloudcode/guestbook/backend`;
|
|
35
|
+
const tabTitle = 'GuestBookEntry.java';
|
|
36
|
+
let workspaceName = 'java-guestbook';
|
|
29
37
|
suite(`The 'JavaPlugin' test`, async () => {
|
|
30
38
|
suite('Create workspace', async () => {
|
|
31
39
|
test('Create workspace using factory', async () => {
|
|
32
40
|
await browserTabsUtil.navigateTo(factoryUrl);
|
|
33
41
|
});
|
|
42
|
+
projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
|
|
34
43
|
test('Wait until created workspace is started', async () => {
|
|
35
|
-
await ide.waitAndSwitchToIdeFrame();
|
|
36
|
-
workspaceName = await workspaceNameHandler.getNameFromUrl();
|
|
37
44
|
CheReporter_1.default.registerRunningWorkspace(workspaceName);
|
|
38
|
-
await
|
|
39
|
-
await ide.waitNotificationAndClickOnButton('Do you trust the authors of', 'Yes, I trust', 60000);
|
|
40
|
-
await projectTree.openProjectTreeContainer();
|
|
41
|
-
await projectTree.waitProjectImported(sampleName, subRootFolder);
|
|
45
|
+
await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
|
|
42
46
|
});
|
|
43
47
|
});
|
|
44
48
|
suite('Test opening file', async () => {
|
|
@@ -46,25 +50,25 @@ suite(`The 'JavaPlugin' test`, async () => {
|
|
|
46
50
|
projectAndFileTests.openFile(fileFolderPath, tabTitle);
|
|
47
51
|
});
|
|
48
52
|
suite('Language server validation', async () => {
|
|
49
|
-
test('Wait until Java LS is
|
|
53
|
+
test('Wait until Java LS is initialized', async () => {
|
|
50
54
|
await ide.checkLsInitializationStart('Activating');
|
|
51
55
|
await ide.waitStatusBarTextAbsence('Activating', 900000);
|
|
52
56
|
});
|
|
53
57
|
test('Autocomplete', async () => {
|
|
54
|
-
await editor.moveCursorToLineAndChar(tabTitle,
|
|
58
|
+
await editor.moveCursorToLineAndChar(tabTitle, 15, 1);
|
|
55
59
|
await editor.pressControlSpaceCombination(tabTitle);
|
|
56
60
|
await editor.waitSuggestionContainer();
|
|
57
|
-
await editor.waitSuggestion(tabTitle, '
|
|
61
|
+
await editor.waitSuggestion(tabTitle, 'clone() : Object');
|
|
58
62
|
});
|
|
59
63
|
test('Error highlighting', async () => {
|
|
60
64
|
const textForErrorDisplaying = '$';
|
|
61
|
-
await editor.type(tabTitle, textForErrorDisplaying,
|
|
62
|
-
await editor.waitErrorInLine(
|
|
65
|
+
await editor.type(tabTitle, textForErrorDisplaying, 15);
|
|
66
|
+
await editor.waitErrorInLine(15, tabTitle, TimeoutConstants_1.TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT);
|
|
63
67
|
await editor.performKeyCombination(tabTitle, selenium_webdriver_1.Key.chord(selenium_webdriver_1.Key.BACK_SPACE));
|
|
64
|
-
await editor.waitErrorInLineDisappearance(
|
|
68
|
+
await editor.waitErrorInLineDisappearance(15, tabTitle);
|
|
65
69
|
});
|
|
66
|
-
test('
|
|
67
|
-
await editor.moveCursorToLineAndChar(tabTitle, 9,
|
|
70
|
+
test('CodeNavigation', async () => {
|
|
71
|
+
await editor.moveCursorToLineAndChar(tabTitle, 9, 14);
|
|
68
72
|
await editor.performKeyCombination(tabTitle, selenium_webdriver_1.Key.chord(selenium_webdriver_1.Key.CONTROL, selenium_webdriver_1.Key.F12));
|
|
69
73
|
await editor.waitEditorAvailable(codeNavigationClassName, 60000);
|
|
70
74
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JavaPlugin.spec.js","sourceRoot":"","sources":["../../../tests/plugins/JavaPlugin.spec.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"JavaPlugin.spec.js","sourceRoot":"","sources":["../../../tests/plugins/JavaPlugin.spec.ts"],"names":[],"mappings":";;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,6DAAsD;AACtD,2DAAgD;AAEhD,6DAA0D;AAC1D,uDAAoD;AACpD,2DAAyC;AAIzC,+CAA4C;AAC5C,2EAAmD;AAInD,MAAM,sBAAsB,GAA2B,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,sBAAsB,CAAC,CAAC;AACxG,MAAM,mBAAmB,GAAwB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,mBAAmB,CAAC,CAAC;AAC/F,MAAM,eAAe,GAAoB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAC;AACnF,MAAM,GAAG,GAAQ,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,GAAG,CAAC,CAAC;AAC/C,MAAM,MAAM,GAAW,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,MAAM,CAAC,CAAC;AACxD,MAAM,kBAAkB,GAAuB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,kBAAkB,CAAC,CAAC;AAE5F,MAAM,UAAU,GAAW,8DAA8D,CAAC;AAC1F,MAAM,UAAU,GAAW,GAAG,6BAAa,CAAC,oBAAoB,UAAU,UAAU,EAAE,CAAC;AACvF,MAAM,uBAAuB,GAAW,cAAc,CAAC;AACvD,MAAM,WAAW,GAAW,gBAAgB,CAAC;AAC7C,MAAM,aAAa,GAAW,SAAS,CAAC;AAExC,MAAM,cAAc,GAAW,GAAG,WAAW,oDAAoD,CAAC;AAClG,MAAM,QAAQ,GAAW,qBAAqB,CAAC;AAC/C,IAAI,aAAa,GAAW,gBAAgB,CAAC;AAE7C,KAAK,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;IACtC,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,mBAAmB,EAAE,KAAK,IAAI,EAAE;QAClC,+DAA+D;QAC/D,mBAAmB,CAAC,QAAQ,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QAC3C,IAAI,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;YACjD,MAAM,GAAG,CAAC,0BAA0B,CAAC,YAAY,CAAC,CAAC;YACnD,MAAM,GAAG,CAAC,wBAAwB,CAAC,YAAY,EAAE,MAAO,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE;YAC5B,MAAM,MAAM,CAAC,uBAAuB,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;YACtD,MAAM,MAAM,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC;YACpD,MAAM,MAAM,CAAC,uBAAuB,EAAE,CAAC;YACvC,MAAM,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,oBAAoB,EAAE,KAAK,IAAI,EAAE;YAClC,MAAM,sBAAsB,GAAW,GAAG,CAAC;YAC3C,MAAM,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,sBAAsB,EAAE,EAAE,CAAC,CAAC;YACxD,MAAM,MAAM,CAAC,eAAe,CAAC,EAAE,EAAE,QAAQ,EAAE,mCAAgB,CAAC,6BAA6B,CAAC,CAAC;YAC3F,MAAM,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,wBAAG,CAAC,KAAK,CAAC,wBAAG,CAAC,UAAU,CAAC,CAAC,CAAC;YACxE,MAAM,MAAM,CAAC,4BAA4B,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;YAC9B,MAAM,MAAM,CAAC,uBAAuB,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACtD,MAAM,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,wBAAG,CAAC,KAAK,CAAC,wBAAG,CAAC,OAAO,EAAE,wBAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9E,MAAM,MAAM,CAAC,mBAAmB,CAAC,uBAAuB,EAAE,KAAM,CAAC,CAAC;QACtE,CAAC,CAAC,CAAC;IAEP,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;QACpD,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;IAEP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -20,32 +20,28 @@ const TestConstants_1 = require("../../TestConstants");
|
|
|
20
20
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
21
21
|
const Logger_1 = require("../../utils/Logger");
|
|
22
22
|
const CheReporter_1 = __importDefault(require("../../driver/CheReporter"));
|
|
23
|
+
const projectAndFileTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectAndFileTests);
|
|
23
24
|
const workspaceHandlingTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.WorkspaceHandlingTests);
|
|
24
25
|
const browserTabsUtil = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.BrowserTabsUtil);
|
|
25
|
-
const ide = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.Ide);
|
|
26
26
|
const projectTree = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectTree);
|
|
27
27
|
const editor = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.Editor);
|
|
28
|
-
const
|
|
29
|
-
const
|
|
30
|
-
const factoryUrl = `${TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL}/f?url=${
|
|
31
|
-
const
|
|
32
|
-
const
|
|
33
|
-
const fileFolderPath = `${
|
|
28
|
+
const preferencesHandler = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.PreferencesHandler);
|
|
29
|
+
const devFileUrl = 'https://github.com/che-samples/python-hello-world/tree/devfilev2';
|
|
30
|
+
const factoryUrl = `${TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devFileUrl}`;
|
|
31
|
+
const projectName = 'python-hello-world';
|
|
32
|
+
const subRootFolder = '.vscode';
|
|
33
|
+
const fileFolderPath = `${projectName}`;
|
|
34
34
|
const tabTitle = 'hello-world.py';
|
|
35
|
-
let workspaceName;
|
|
35
|
+
let workspaceName = 'python-hello-world';
|
|
36
36
|
suite(`The 'PythonPlugin' test`, async () => {
|
|
37
37
|
suite('Create workspace', async () => {
|
|
38
38
|
test('Create workspace using factory', async () => {
|
|
39
39
|
await browserTabsUtil.navigateTo(factoryUrl);
|
|
40
40
|
});
|
|
41
|
+
projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
|
|
41
42
|
test('Wait until created workspace is started', async () => {
|
|
42
|
-
await ide.waitAndSwitchToIdeFrame();
|
|
43
|
-
workspaceName = await workspaceNameHandler.getNameFromUrl();
|
|
44
43
|
CheReporter_1.default.registerRunningWorkspace(workspaceName);
|
|
45
|
-
await
|
|
46
|
-
await ide.waitNotificationAndClickOnButton('Do you trust the authors of', 'Yes, I trust', 60000);
|
|
47
|
-
await projectTree.openProjectTreeContainer();
|
|
48
|
-
await projectTree.waitProjectImported(sampleName, subRootFile);
|
|
44
|
+
await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
|
|
49
45
|
});
|
|
50
46
|
});
|
|
51
47
|
suite('Language server validation', async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PythonPlugin.spec.js","sourceRoot":"","sources":["../../../tests/plugins/PythonPlugin.spec.ts"],"names":[],"mappings":";;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,6DAAsD;AACtD,2DAAgD;
|
|
1
|
+
{"version":3,"file":"PythonPlugin.spec.js","sourceRoot":"","sources":["../../../tests/plugins/PythonPlugin.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -149,8 +149,7 @@ let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
|
|
|
149
149
|
// https://issues.redhat.com/browse/CRW-2175
|
|
150
150
|
if (err instanceof selenium_webdriver_1.error.TimeoutError) {
|
|
151
151
|
Logger_1.Logger.warn(`CodeExecutionTests.verifyRunningApplication application not located, probably blocked by preloader or content not available. Retrying.`);
|
|
152
|
-
await this.
|
|
153
|
-
await this.ide.waitAndSwitchToIdeFrame();
|
|
152
|
+
await this.ide.waitIde();
|
|
154
153
|
await this.previewWidget.refreshPage();
|
|
155
154
|
await this.previewWidget.waitContentAvailable(locator, applicationCheckTimeout, polling);
|
|
156
155
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodeExecutionTests.js","sourceRoot":"","sources":["../../testsLibrary/CodeExecutionTests.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CodeExecutionTests.js","sourceRoot":"","sources":["../../testsLibrary/CodeExecutionTests.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,15 +33,13 @@ const DebugView_1 = require("../pageobjects/ide/DebugView");
|
|
|
33
33
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
34
34
|
const Logger_1 = require("../utils/Logger");
|
|
35
35
|
const BrowserTabsUtil_1 = require("../utils/BrowserTabsUtil");
|
|
36
|
-
const DriverHelper_1 = require("../utils/DriverHelper");
|
|
37
36
|
let LanguageServerTests = class LanguageServerTests {
|
|
38
|
-
constructor(editor, ide, topMenu, debugView, browserTabsUtil
|
|
37
|
+
constructor(editor, ide, topMenu, debugView, browserTabsUtil) {
|
|
39
38
|
this.editor = editor;
|
|
40
39
|
this.ide = ide;
|
|
41
40
|
this.topMenu = topMenu;
|
|
42
41
|
this.debugView = debugView;
|
|
43
42
|
this.browserTabsUtil = browserTabsUtil;
|
|
44
|
-
this.driverHelper = driverHelper;
|
|
45
43
|
}
|
|
46
44
|
errorHighlighting(openedTab, textToWrite, line) {
|
|
47
45
|
test('Error highlighting', async () => {
|
|
@@ -177,9 +175,7 @@ let LanguageServerTests = class LanguageServerTests {
|
|
|
177
175
|
catch (err) {
|
|
178
176
|
// debug config is probably missing, refresh IDE and try again https://github.com/eclipse/che/issues/19887
|
|
179
177
|
await this.browserTabsUtil.refreshPage();
|
|
180
|
-
await this.
|
|
181
|
-
await this.ide.waitAndSwitchToIdeFrame();
|
|
182
|
-
await this.driverHelper.wait(TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM);
|
|
178
|
+
await this.ide.waitIde();
|
|
183
179
|
await this.debugView.clickOnRunDebugButton();
|
|
184
180
|
}
|
|
185
181
|
});
|
|
@@ -199,9 +195,7 @@ let LanguageServerTests = class LanguageServerTests {
|
|
|
199
195
|
catch (err) {
|
|
200
196
|
// debug config is probably missing, refresh IDE and try again https://github.com/eclipse/che/issues/19887
|
|
201
197
|
await this.browserTabsUtil.refreshPage();
|
|
202
|
-
await this.
|
|
203
|
-
await this.ide.waitAndSwitchToIdeFrame();
|
|
204
|
-
await this.driverHelper.wait(TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM);
|
|
198
|
+
await this.ide.waitIde();
|
|
205
199
|
await this.debugView.clickOnDebugConfigurationDropDown();
|
|
206
200
|
await this.debugView.clickOnDebugConfigurationItem(configurationName);
|
|
207
201
|
await this.debugView.clickOnRunDebugButton();
|
|
@@ -226,13 +220,11 @@ LanguageServerTests = __decorate([
|
|
|
226
220
|
__param(2, inversify_1.inject(inversify_types_1.CLASSES.TopMenu)),
|
|
227
221
|
__param(3, inversify_1.inject(inversify_types_1.CLASSES.DebugView)),
|
|
228
222
|
__param(4, inversify_1.inject(inversify_types_1.CLASSES.BrowserTabsUtil)),
|
|
229
|
-
__param(5, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
230
223
|
__metadata("design:paramtypes", [Editor_1.Editor,
|
|
231
224
|
Ide_1.Ide,
|
|
232
225
|
TopMenu_1.TopMenu,
|
|
233
226
|
DebugView_1.DebugView,
|
|
234
|
-
BrowserTabsUtil_1.BrowserTabsUtil
|
|
235
|
-
DriverHelper_1.DriverHelper])
|
|
227
|
+
BrowserTabsUtil_1.BrowserTabsUtil])
|
|
236
228
|
], LanguageServerTests);
|
|
237
229
|
exports.LanguageServerTests = LanguageServerTests;
|
|
238
230
|
//# sourceMappingURL=LanguageServerTests.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LanguageServerTests.js","sourceRoot":"","sources":["../../testsLibrary/LanguageServerTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,yCAA+C;AAC/C,wDAA6C;AAC7C,0DAAuD;AACvD,sDAAmD;AACnD,gDAAgE;AAChE,wDAAqD;AACrD,4DAAyD;AACzD,2DAAgD;AAChD,4CAAyC;AACzC,8DAA2D;
|
|
1
|
+
{"version":3,"file":"LanguageServerTests.js","sourceRoot":"","sources":["../../testsLibrary/LanguageServerTests.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,7 +55,6 @@ let ProjectAndFileTests = class ProjectAndFileTests {
|
|
|
55
55
|
}
|
|
56
56
|
waitWorkspaceReadinessNoSubfolder(sampleName, checkNotification = true) {
|
|
57
57
|
test('Wait for workspace readiness', async () => {
|
|
58
|
-
await this.ide.waitAndSwitchToIdeFrame();
|
|
59
58
|
await this.ide.waitIde(TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
|
|
60
59
|
if (checkNotification) {
|
|
61
60
|
await this.ide.waitNotificationAndClickOnButton('Do you trust the authors of', 'Yes, I trust', 60000);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectAndFileTests.js","sourceRoot":"","sources":["../../testsLibrary/ProjectAndFileTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,yCAA+C;AAC/C,2DAAwC;AACxC,gDAA6C;AAC7C,gEAA6D;AAC7D,gEAA6D;AAC7D,sDAAmD;AACnD,0DAAuD;AACvD,wDAAqD;AACrD,wDAA6C;AAG7C,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;IAE5B,YAC0C,GAAQ,EACC,YAA0B,EAC3B,WAAwB,EACxB,WAAwB,EAC7B,MAAc;QAJjB,QAAG,GAAH,GAAG,CAAK;QACC,iBAAY,GAAZ,YAAY,CAAc;QAC3B,gBAAW,GAAX,WAAW,CAAa;QACxB,gBAAW,GAAX,WAAW,CAAa;QAC7B,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAExD,sBAAsB,CAAC,UAAmB,EAAE,MAAc,EAAE,oBAA6B,IAAI,EAAE,mCAA4C,KAAK;QACnJ,IAAI,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;YAC5C,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,mCAAgB,CAAC,mCAAmC,CAAC,CAAC;YAE7E,IAAI,gCAAgC,EAAE;gBAClC,MAAM,IAAI,CAAC,GAAG,CAAC,yBAAyB,EAAE,CAAC;aAC9C;YAED,MAAM,IAAI,CAAC,WAAW,CAAC,wBAAwB,EAAE,CAAC;YAClD,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,0BAA0B,EAAE,EAAE;gBACtD,MAAM,IAAI,CAAC,WAAW,CAAC,2BAA2B,EAAE,CAAC;aACxD;YAED,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,iCAAiC,CAAC,UAAmB,EAAE,oBAA6B,IAAI;QAC3F,IAAI,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;YAC5C,MAAM,IAAI,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"ProjectAndFileTests.js","sourceRoot":"","sources":["../../testsLibrary/ProjectAndFileTests.ts"],"names":[],"mappings":"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"}
|
package/mocha-all-factories.json
CHANGED
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
"require": "source-map-support/register",
|
|
8
8
|
"spec": [
|
|
9
9
|
"dist/tests/login/Login.spec.js",
|
|
10
|
-
"dist/tests/e2e/factories
|
|
10
|
+
"dist/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.js",
|
|
11
|
+
"dist/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.js"
|
|
11
12
|
]
|
|
12
13
|
}
|
package/package.json
CHANGED
|
@@ -85,7 +85,7 @@ export class WorkspaceDetails {
|
|
|
85
85
|
Logger.debug(`WorkspaceDetails.openWorkspace "${namespace}/${workspaceName}"`);
|
|
86
86
|
|
|
87
87
|
await this.clickOnOpenButton(timeout);
|
|
88
|
-
await this.driverHelper.waitVisibility(By.css(Ide.
|
|
88
|
+
await this.driverHelper.waitVisibility(By.css(Ide.THEIA_EDITOR_CSS), TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT);
|
|
89
89
|
await this.testWorkspaceUtil.waitWorkspaceStatus(namespace, workspaceName, WorkspaceStatus.STARTING);
|
|
90
90
|
}
|
|
91
91
|
|
package/pageobjects/ide/Ide.ts
CHANGED
|
@@ -29,7 +29,7 @@ export enum LeftToolbarButton {
|
|
|
29
29
|
export class Ide {
|
|
30
30
|
public static readonly EXPLORER_BUTTON_ID: string = 'shell-tab-explorer-view-container';
|
|
31
31
|
public static readonly SELECTED_EXPLORER_BUTTON_CSS: string = 'li#shell-tab-explorer-view-container.theia-mod-active';
|
|
32
|
-
public static readonly
|
|
32
|
+
public static readonly THEIA_EDITOR_CSS: string = '#theia-main-content-panel';
|
|
33
33
|
public static readonly SELECTED_GIT_BUTTON_XPATH: string = '(//ul[@class=\'p-TabBar-content\']//li[@title=\'Git\' and contains(@class, \'p-mod-current\')])[1]';
|
|
34
34
|
private static readonly TOP_MENU_PANEL_CSS: string = '#theia-app-shell #theia-top-panel .p-MenuBar-content';
|
|
35
35
|
private static readonly LEFT_CONTENT_PANEL_CSS: string = '#theia-left-content-panel';
|
|
@@ -41,6 +41,10 @@ export class Ide {
|
|
|
41
41
|
@inject(CLASSES.NotificationCenter) private readonly notificationCenter: NotificationCenter
|
|
42
42
|
) { }
|
|
43
43
|
|
|
44
|
+
/**
|
|
45
|
+
* @deprecated Method deprecated. Iframe is not available, Replace it with waitForEditor() or waitIde() method incase for conditional wait
|
|
46
|
+
* @see Ide.waitForEditor()
|
|
47
|
+
*/
|
|
44
48
|
async waitAndSwitchToIdeFrame(timeout: number = TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT) {
|
|
45
49
|
Logger.debug('Ide.waitAndSwitchToIdeFrame');
|
|
46
50
|
try {
|
|
@@ -72,6 +76,16 @@ export class Ide {
|
|
|
72
76
|
}
|
|
73
77
|
}
|
|
74
78
|
|
|
79
|
+
async waitForEditor(timeout: number = TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT) {
|
|
80
|
+
Logger.debug('Ide.waitForEditor');
|
|
81
|
+
try {
|
|
82
|
+
await this.driverHelper.waitVisibility(By.css(Ide.THEIA_EDITOR_CSS), timeout);
|
|
83
|
+
} catch (err) {
|
|
84
|
+
Logger.warn(`Editor is not displayed even after ${timeout} milliseconds.`);
|
|
85
|
+
throw err;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
|
|
75
89
|
async waitNotification(notificationText: string, timeout: number = TimeoutConstants.TS_NOTIFICATION_CENTER_TIMEOUT) {
|
|
76
90
|
Logger.debug(`Ide.waitNotification "${notificationText}"`);
|
|
77
91
|
|
|
@@ -166,11 +180,11 @@ export class Ide {
|
|
|
166
180
|
|
|
167
181
|
Logger.debug('Ide.waitWorkspaceAndIde');
|
|
168
182
|
|
|
169
|
-
await this.
|
|
183
|
+
await this.waitForEditor(timeout);
|
|
170
184
|
await this.waitIde(timeout);
|
|
171
185
|
}
|
|
172
186
|
|
|
173
|
-
async waitIde(timeout: number = TimeoutConstants.
|
|
187
|
+
async waitIde(timeout: number = TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT) {
|
|
174
188
|
Logger.debug('Ide.waitIde');
|
|
175
189
|
|
|
176
190
|
const mainIdeParts: Array<By> = [By.css(Ide.TOP_MENU_PANEL_CSS), By.css(Ide.LEFT_CONTENT_PANEL_CSS), By.id(Ide.EXPLORER_BUTTON_ID)];
|
|
@@ -76,6 +76,9 @@ export class PreviewWidget {
|
|
|
76
76
|
}, timeout);
|
|
77
77
|
}
|
|
78
78
|
|
|
79
|
+
/**
|
|
80
|
+
* @deprecated Method deprecated. Iframe is not available anymore
|
|
81
|
+
*/
|
|
79
82
|
async waitAndSwitchToWidgetFrame() {
|
|
80
83
|
Logger.debug('PreviewWidget.waitAndSwitchToWidgetFrame');
|
|
81
84
|
|
|
@@ -98,8 +101,6 @@ export class PreviewWidget {
|
|
|
98
101
|
await this.driverHelper.getDriver().wait(async () => {
|
|
99
102
|
const isApplicationTitleVisible: boolean = await this.driverHelper.isVisible(contentLocator);
|
|
100
103
|
if (isApplicationTitleVisible) {
|
|
101
|
-
await this.driverHelper.getDriver().switchTo().defaultContent();
|
|
102
|
-
await this.ide.waitAndSwitchToIdeFrame();
|
|
103
104
|
return true;
|
|
104
105
|
}
|
|
105
106
|
|
|
@@ -125,6 +126,9 @@ export class PreviewWidget {
|
|
|
125
126
|
await this.driverHelper.waitAndClick(PreviewWidget.WIDGET_REFRESH_BUTTON_LOCATOR);
|
|
126
127
|
}
|
|
127
128
|
|
|
129
|
+
/**
|
|
130
|
+
* @deprecated Method deprecated. Iframe is not available.
|
|
131
|
+
*/
|
|
128
132
|
async switchBackToIdeFrame() {
|
|
129
133
|
Logger.debug('PreviewWidget.switchBackToIdeFrame');
|
|
130
134
|
|
|
@@ -240,8 +240,7 @@ export class ProjectTree {
|
|
|
240
240
|
if (!isProjectFolderVisible) {
|
|
241
241
|
Logger.trace(`ProjectTree.waitProjectImported project not located, reloading page.`);
|
|
242
242
|
await this.browserTabsUtil.refreshPage();
|
|
243
|
-
await this.ide.
|
|
244
|
-
await this.ide.waitIde();
|
|
243
|
+
await this.ide.waitWorkspaceAndIde();
|
|
245
244
|
await this.openProjectTreeContainer();
|
|
246
245
|
continue;
|
|
247
246
|
}
|
|
@@ -256,8 +255,7 @@ export class ProjectTree {
|
|
|
256
255
|
if (!isRootSubItemVisible) {
|
|
257
256
|
Logger.trace(`ProjectTree.waitProjectImported sub-items not found, reloading page.`);
|
|
258
257
|
await this.browserTabsUtil.refreshPage();
|
|
259
|
-
await this.ide.
|
|
260
|
-
await this.ide.waitIde();
|
|
258
|
+
await this.ide.waitWorkspaceAndIde();
|
|
261
259
|
await this.openProjectTreeContainer();
|
|
262
260
|
continue;
|
|
263
261
|
}
|
|
@@ -284,8 +282,7 @@ export class ProjectTree {
|
|
|
284
282
|
Logger.trace(`ProjectTree.waitProjectImportedNoSubfolder project not located, reloading page.`);
|
|
285
283
|
await this.browserTabsUtil.refreshPage();
|
|
286
284
|
await this.driverHelper.wait(triesPolling);
|
|
287
|
-
await this.ide.
|
|
288
|
-
await this.ide.waitIde();
|
|
285
|
+
await this.ide.waitWorkspaceAndIde();
|
|
289
286
|
await this.openProjectTreeContainer();
|
|
290
287
|
continue;
|
|
291
288
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// /*********************************************************************
|
|
2
|
-
// * Copyright (c)
|
|
2
|
+
// * Copyright (c) 2022 Red Hat, Inc.
|
|
3
3
|
// *
|
|
4
4
|
// * This program and the accompanying materials are made
|
|
5
5
|
// * available under the terms of the Eclipse Public License 2.0
|
|
@@ -9,18 +9,18 @@
|
|
|
9
9
|
// **********************************************************************/
|
|
10
10
|
|
|
11
11
|
import { e2eContainer } from '../../../inversify.config';
|
|
12
|
-
import { CLASSES
|
|
12
|
+
import { CLASSES } from '../../../inversify.types';
|
|
13
13
|
import { TestConstants } from '../../../TestConstants';
|
|
14
14
|
import { ProjectAndFileTests } from '../../../testsLibrary/ProjectAndFileTests';
|
|
15
15
|
import CheReporter from '../../../driver/CheReporter';
|
|
16
16
|
import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
|
|
17
|
-
import {
|
|
18
|
-
import {
|
|
17
|
+
import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
|
|
18
|
+
import { PreferencesHandler } from '../../../utils/PreferencesHandler';
|
|
19
19
|
|
|
20
|
+
const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
|
|
21
|
+
const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
|
|
20
22
|
const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
|
|
21
23
|
const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
|
|
22
|
-
const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler);
|
|
23
|
-
const testWorkspaceUtils: TestWorkspaceUtil = e2eContainer.get<TestWorkspaceUtil>(TYPES.WorkspaceUtil);
|
|
24
24
|
|
|
25
25
|
const factoryUrl : string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=https://github.com/che-samples/console-java-simple/tree/master/src`;
|
|
26
26
|
const workspaceSampleName: string = 'console-java-simple';
|
|
@@ -28,9 +28,8 @@ const workspaceRootFolderName: string = 'src';
|
|
|
28
28
|
const fileName: string = 'pom.xml';
|
|
29
29
|
const fileFolderPath: string = `${workspaceSampleName}/${workspaceRootFolderName}/main/java/org/eclipse/che/examples`;
|
|
30
30
|
const tabTitle: string = 'HelloWorld.java';
|
|
31
|
-
let workspaceName: string;
|
|
31
|
+
let workspaceName: string = 'console-java-simple';
|
|
32
32
|
|
|
33
|
-
// the suite expect user to be logged in
|
|
34
33
|
suite('Workspace creation via factory url', async () => {
|
|
35
34
|
suite('Open factory URL', async () => {
|
|
36
35
|
test(`Navigating to factory URL`, async () => {
|
|
@@ -39,7 +38,13 @@ suite('Workspace creation via factory url', async () => {
|
|
|
39
38
|
});
|
|
40
39
|
|
|
41
40
|
suite('Wait workspace readyness', async () => {
|
|
42
|
-
projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName
|
|
41
|
+
projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName);
|
|
42
|
+
|
|
43
|
+
test('Set confirmExit preference to never', async () => {
|
|
44
|
+
CheReporter.registerRunningWorkspace(workspaceName);
|
|
45
|
+
|
|
46
|
+
await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
|
|
47
|
+
});
|
|
43
48
|
});
|
|
44
49
|
|
|
45
50
|
suite('Check imported project', async () => {
|
|
@@ -51,10 +56,7 @@ suite('Workspace creation via factory url', async () => {
|
|
|
51
56
|
|
|
52
57
|
suite ('Stopping and deleting the workspace', async () => {
|
|
53
58
|
test('Stop and remove workspace', async () => {
|
|
54
|
-
|
|
55
|
-
CheReporter.registerRunningWorkspace(workspaceName);
|
|
56
|
-
|
|
57
|
-
await testWorkspaceUtils.cleanUpRunningWorkspace(workspaceName);
|
|
59
|
+
await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
|
|
58
60
|
});
|
|
59
61
|
});
|
|
60
62
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// /*********************************************************************
|
|
2
|
-
// * Copyright (c)
|
|
2
|
+
// * Copyright (c) 2022 Red Hat, Inc.
|
|
3
3
|
// *
|
|
4
4
|
// * This program and the accompanying materials are made
|
|
5
5
|
// * available under the terms of the Eclipse Public License 2.0
|
|
@@ -9,27 +9,26 @@
|
|
|
9
9
|
// **********************************************************************/
|
|
10
10
|
|
|
11
11
|
import { e2eContainer } from '../../../inversify.config';
|
|
12
|
-
import { CLASSES
|
|
12
|
+
import { CLASSES } from '../../../inversify.types';
|
|
13
13
|
import { TestConstants } from '../../../TestConstants';
|
|
14
14
|
import { ProjectAndFileTests } from '../../../testsLibrary/ProjectAndFileTests';
|
|
15
15
|
import CheReporter from '../../../driver/CheReporter';
|
|
16
16
|
import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
|
|
17
|
-
import {
|
|
18
|
-
import {
|
|
17
|
+
import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
|
|
18
|
+
import { PreferencesHandler } from '../../../utils/PreferencesHandler';
|
|
19
19
|
|
|
20
|
+
const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
|
|
21
|
+
const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
|
|
20
22
|
const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
|
|
21
23
|
const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
|
|
22
|
-
const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler);
|
|
23
|
-
const testWorkspaceUtils: TestWorkspaceUtil = e2eContainer.get<TestWorkspaceUtil>(TYPES.WorkspaceUtil);
|
|
24
24
|
|
|
25
25
|
const factoryUrl : string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=https://github.com/che-samples/console-java-simple`;
|
|
26
26
|
const workspaceSampleName: string = 'console-java-simple';
|
|
27
27
|
const workspaceRootFolderName: string = 'src';
|
|
28
28
|
const fileFolderPath: string = `${workspaceSampleName}/${workspaceRootFolderName}/main/java/org/eclipse/che/examples`;
|
|
29
29
|
const tabTitle: string = 'HelloWorld.java';
|
|
30
|
-
let workspaceName: string;
|
|
30
|
+
let workspaceName: string = 'console-java-simple';
|
|
31
31
|
|
|
32
|
-
// the suite expect user to be logged in
|
|
33
32
|
suite('Workspace creation via factory url', async () => {
|
|
34
33
|
suite('Open factory URL', async () => {
|
|
35
34
|
test(`Navigating to factory URL`, async () => {
|
|
@@ -38,21 +37,23 @@ suite('Workspace creation via factory url', async () => {
|
|
|
38
37
|
});
|
|
39
38
|
|
|
40
39
|
suite('Wait workspace readyness', async () => {
|
|
41
|
-
projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName
|
|
40
|
+
projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName);
|
|
41
|
+
|
|
42
|
+
test('Set confirmExit preference to never', async () => {
|
|
43
|
+
CheReporter.registerRunningWorkspace(workspaceName);
|
|
44
|
+
|
|
45
|
+
await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
|
|
46
|
+
});
|
|
42
47
|
});
|
|
43
48
|
|
|
44
49
|
suite('Check imported project', async () => {
|
|
45
50
|
projectAndFileTests.openFile(fileFolderPath, tabTitle);
|
|
46
|
-
|
|
47
51
|
projectAndFileTests.checkProjectBranchName('master');
|
|
48
52
|
});
|
|
49
53
|
|
|
50
54
|
suite ('Stopping and deleting the workspace', async () => {
|
|
51
55
|
test('Stop and remove workspace', async () => {
|
|
52
|
-
|
|
53
|
-
CheReporter.registerRunningWorkspace(workspaceName);
|
|
54
|
-
|
|
55
|
-
await testWorkspaceUtils.cleanUpRunningWorkspace(workspaceName);
|
|
56
|
+
await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
|
|
56
57
|
});
|
|
57
58
|
});
|
|
58
59
|
|