@eclipse-che/che-e2e 7.46.0 → 7.46.1-dev-8a64d75

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.
Files changed (124) hide show
  1. package/dist/driver/CheReporter.js +2 -5
  2. package/dist/driver/CheReporter.js.map +1 -1
  3. package/dist/pageobjects/ide/ProjectTree.js +12 -6
  4. package/dist/pageobjects/ide/ProjectTree.js.map +1 -1
  5. package/dist/tests/devfiles/CSlashCPlusPlus.spec.js +2 -10
  6. package/dist/tests/devfiles/CSlashCPlusPlus.spec.js.map +1 -1
  7. package/dist/tests/devfiles/DevfileSmoke.spec.js +2 -10
  8. package/dist/tests/devfiles/DevfileSmoke.spec.js.map +1 -1
  9. package/dist/tests/devfiles/DotNetCore.spec.js +2 -10
  10. package/dist/tests/devfiles/DotNetCore.spec.js.map +1 -1
  11. package/dist/tests/devfiles/Go.spec.js +2 -10
  12. package/dist/tests/devfiles/Go.spec.js.map +1 -1
  13. package/dist/tests/devfiles/JavaMaven.spec.js +2 -10
  14. package/dist/tests/devfiles/JavaMaven.spec.js.map +1 -1
  15. package/dist/tests/devfiles/JavaSpringBoot.spec.js +2 -10
  16. package/dist/tests/devfiles/JavaSpringBoot.spec.js.map +1 -1
  17. package/dist/tests/devfiles/JavaVertx.spec.js +2 -10
  18. package/dist/tests/devfiles/JavaVertx.spec.js.map +1 -1
  19. package/dist/tests/devfiles/NodeJS.spec.js +2 -10
  20. package/dist/tests/devfiles/NodeJS.spec.js.map +1 -1
  21. package/dist/tests/devfiles/PHPSimple.spec.js +2 -10
  22. package/dist/tests/devfiles/PHPSimple.spec.js.map +1 -1
  23. package/dist/tests/devfiles/Python.spec.js +2 -10
  24. package/dist/tests/devfiles/Python.spec.js.map +1 -1
  25. package/dist/tests/devfiles/PythonDjango.spec.js +2 -10
  26. package/dist/tests/devfiles/PythonDjango.spec.js.map +1 -1
  27. package/dist/tests/devfiles/Quarkus.spec.js +2 -10
  28. package/dist/tests/devfiles/Quarkus.spec.js.map +1 -1
  29. package/dist/tests/devfiles/Scala.spec.js +2 -10
  30. package/dist/tests/devfiles/Scala.spec.js.map +1 -1
  31. package/dist/tests/e2e/FactoryUrl.spec.js +4 -9
  32. package/dist/tests/e2e/FactoryUrl.spec.js.map +1 -1
  33. package/dist/tests/e2e/GitPublishBranch.spec.js +2 -5
  34. package/dist/tests/e2e/GitPublishBranch.spec.js.map +1 -1
  35. package/dist/tests/e2e/GitSelfSignCert.spec.js +2 -0
  36. package/dist/tests/e2e/GitSelfSignCert.spec.js.map +1 -1
  37. package/dist/tests/e2e/GitSsh.spec.js +3 -6
  38. package/dist/tests/e2e/GitSsh.spec.js.map +1 -1
  39. package/dist/tests/e2e/OpenshiftConnector.spec.js +2 -5
  40. package/dist/tests/e2e/OpenshiftConnector.spec.js.map +1 -1
  41. package/dist/tests/e2e/factories/DirectUrlFactoryWithKeepDirectoryTest.spec.js +3 -7
  42. package/dist/tests/e2e/factories/DirectUrlFactoryWithKeepDirectoryTest.spec.js.map +1 -1
  43. package/dist/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.js +3 -7
  44. package/dist/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.js.map +1 -1
  45. package/dist/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.js +3 -7
  46. package/dist/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.js.map +1 -1
  47. package/dist/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.js +2 -2
  48. package/dist/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.js.map +1 -1
  49. package/dist/tests/e2e_happy_path/HappyPath.spec.js +13 -13
  50. package/dist/tests/e2e_happy_path/HappyPath.spec.js.map +1 -1
  51. package/dist/tests/intelij/IntelijOpenWorkspace.spec.js +2 -6
  52. package/dist/tests/intelij/IntelijOpenWorkspace.spec.js.map +1 -1
  53. package/dist/tests/load_test/LoadTest.spec.js +2 -5
  54. package/dist/tests/load_test/LoadTest.spec.js.map +1 -1
  55. package/dist/tests/login/LinkCheAndOcpUsers.spec.js +2 -2
  56. package/dist/tests/login/LinkCheAndOcpUsers.spec.js.map +1 -1
  57. package/dist/tests/plugins/GitHubPullRequestPlugin.spec.js +4 -9
  58. package/dist/tests/plugins/GitHubPullRequestPlugin.spec.js.map +1 -1
  59. package/dist/tests/plugins/InstallPluginUsingUI.spec.js +4 -10
  60. package/dist/tests/plugins/InstallPluginUsingUI.spec.js.map +1 -1
  61. package/dist/tests/plugins/JavaPlugin.spec.js +4 -8
  62. package/dist/tests/plugins/JavaPlugin.spec.js.map +1 -1
  63. package/dist/tests/plugins/PhpPlugin.spec.js +12 -10
  64. package/dist/tests/plugins/PhpPlugin.spec.js.map +1 -1
  65. package/dist/tests/plugins/PythonPlugin.spec.js +4 -8
  66. package/dist/tests/plugins/PythonPlugin.spec.js.map +1 -1
  67. package/dist/tests/plugins/TypescriptPlugin.spec.js +4 -8
  68. package/dist/tests/plugins/TypescriptPlugin.spec.js.map +1 -1
  69. package/dist/tests/plugins/VscodeKubernetesPlugin.spec.js +3 -10
  70. package/dist/tests/plugins/VscodeKubernetesPlugin.spec.js.map +1 -1
  71. package/dist/tests/plugins/VscodeShellcheckPlugin.spec.js +3 -10
  72. package/dist/tests/plugins/VscodeShellcheckPlugin.spec.js.map +1 -1
  73. package/dist/tests/plugins/VscodeValePlugin.spec.js +3 -10
  74. package/dist/tests/plugins/VscodeValePlugin.spec.js.map +1 -1
  75. package/dist/tests/plugins/VscodeXmlPlugin.spec.js +10 -22
  76. package/dist/tests/plugins/VscodeXmlPlugin.spec.js.map +1 -1
  77. package/dist/tests/plugins/VscodeYamlPlugin.spec.js +4 -8
  78. package/dist/tests/plugins/VscodeYamlPlugin.spec.js.map +1 -1
  79. package/dist/testsLibrary/CodeExecutionTests.js +14 -2
  80. package/dist/testsLibrary/CodeExecutionTests.js.map +1 -1
  81. package/dist/testsLibrary/WorkspaceHandlingTests.js +68 -11
  82. package/dist/testsLibrary/WorkspaceHandlingTests.js.map +1 -1
  83. package/driver/CheReporter.ts +2 -8
  84. package/package.json +2 -2
  85. package/pageobjects/ide/ProjectTree.ts +13 -8
  86. package/tests/devfiles/CSlashCPlusPlus.spec.ts +2 -9
  87. package/tests/devfiles/DevfileSmoke.spec.ts +2 -9
  88. package/tests/devfiles/DotNetCore.spec.ts +2 -9
  89. package/tests/devfiles/Go.spec.ts +2 -7
  90. package/tests/devfiles/JavaMaven.spec.ts +2 -9
  91. package/tests/devfiles/JavaSpringBoot.spec.ts +2 -9
  92. package/tests/devfiles/JavaVertx.spec.ts +2 -9
  93. package/tests/devfiles/NodeJS.spec.ts +2 -9
  94. package/tests/devfiles/PHPSimple.spec.ts +2 -9
  95. package/tests/devfiles/Python.spec.ts +2 -9
  96. package/tests/devfiles/PythonDjango.spec.ts +2 -9
  97. package/tests/devfiles/Quarkus.spec.ts +2 -9
  98. package/tests/devfiles/Scala.spec.ts +2 -10
  99. package/tests/e2e/FactoryUrl.spec.ts +4 -8
  100. package/tests/e2e/GitPublishBranch.spec.ts +2 -2
  101. package/tests/e2e/GitSelfSignCert.spec.ts +66 -65
  102. package/tests/e2e/GitSsh.spec.ts +3 -3
  103. package/tests/e2e/OpenshiftConnector.spec.ts +2 -2
  104. package/tests/e2e/factories/DirectUrlFactoryWithKeepDirectoryTest.spec.ts +2 -5
  105. package/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.ts +2 -5
  106. package/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.ts +2 -5
  107. package/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts +2 -2
  108. package/tests/e2e_happy_path/HappyPath.spec.ts +13 -10
  109. package/tests/intelij/IntelijOpenWorkspace.spec.ts +2 -4
  110. package/tests/load_test/LoadTest.spec.ts +2 -2
  111. package/tests/login/LinkCheAndOcpUsers.spec.ts +4 -3
  112. package/tests/plugins/GitHubPullRequestPlugin.spec.ts +4 -7
  113. package/tests/plugins/InstallPluginUsingUI.spec.ts +4 -9
  114. package/tests/plugins/JavaPlugin.spec.ts +4 -6
  115. package/tests/plugins/PhpPlugin.spec.ts +3 -9
  116. package/tests/plugins/PythonPlugin.spec.ts +4 -6
  117. package/tests/plugins/TypescriptPlugin.spec.ts +4 -6
  118. package/tests/plugins/VscodeKubernetesPlugin.spec.ts +3 -9
  119. package/tests/plugins/VscodeShellcheckPlugin.spec.ts +3 -9
  120. package/tests/plugins/VscodeValePlugin.spec.ts +3 -9
  121. package/tests/plugins/VscodeXmlPlugin.spec.ts +14 -23
  122. package/tests/plugins/VscodeYamlPlugin.spec.ts +4 -7
  123. package/testsLibrary/CodeExecutionTests.ts +9 -1
  124. package/testsLibrary/WorkspaceHandlingTests.ts +66 -9
@@ -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 CheReporter_1 = __importDefault(require("../../driver/CheReporter"));
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('Wait until created workspace is started', async () => {
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(workspaceName);
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":"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"}
1
+ {"version":3,"file":"VscodeYamlPlugin.spec.js","sourceRoot":"","sources":["../../../tests/plugins/VscodeYamlPlugin.spec.ts"],"names":[],"mappings":"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"}
@@ -40,8 +40,10 @@ const PreviewWidget_1 = require("../pageobjects/ide/PreviewWidget");
40
40
  const RightToolBar_1 = require("../pageobjects/ide/RightToolBar");
41
41
  const Logger_1 = require("../utils/Logger");
42
42
  const QuickOpenContainer_1 = require("../pageobjects/ide/QuickOpenContainer");
43
+ const WorkspaceHandlingTests_1 = require("./WorkspaceHandlingTests");
44
+ const BrowserTabsUtil_1 = require("../utils/BrowserTabsUtil");
43
45
  let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
44
- constructor(terminal, topMenu, ide, dialogWindow, driverHelper, previewWidget, rightToolBar, quickOpenContainer) {
46
+ constructor(terminal, topMenu, ide, dialogWindow, driverHelper, previewWidget, rightToolBar, quickOpenContainer, browserTabsUtil, workspaceHandlingTests) {
45
47
  this.terminal = terminal;
46
48
  this.topMenu = topMenu;
47
49
  this.ide = ide;
@@ -50,6 +52,8 @@ let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
50
52
  this.previewWidget = previewWidget;
51
53
  this.rightToolBar = rightToolBar;
52
54
  this.quickOpenContainer = quickOpenContainer;
55
+ this.browserTabsUtil = browserTabsUtil;
56
+ this.workspaceHandlingTests = workspaceHandlingTests;
53
57
  }
54
58
  runTask(taskName, timeout) {
55
59
  test(`Run command '${taskName}'`, async () => {
@@ -76,6 +80,7 @@ let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
76
80
  runTaskWithDialogShellAndOpenLink(taskName, expectedDialogText, timeout) {
77
81
  test(`Run command '${taskName}' expecting dialog shell`, async () => {
78
82
  await this.runTaskUsingQuickOpenContainer(taskName);
83
+ this.workspaceHandlingTests.setWindowHandle(await this.browserTabsUtil.getCurrentWindowHandle());
79
84
  await this.dialogWindow.waitDialogAndOpenLink(expectedDialogText, timeout);
80
85
  });
81
86
  }
@@ -118,6 +123,7 @@ let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
118
123
  test(`Run command '${taskName}' expecting notification`, async () => {
119
124
  await this.runTaskUsingQuickOpenContainer(taskName);
120
125
  await this.ide.waitNotification(notificationText, timeout);
126
+ this.workspaceHandlingTests.setWindowHandle(await this.browserTabsUtil.getCurrentWindowHandle());
121
127
  await this.ide.clickOnNotificationButton(notificationText, buttonText);
122
128
  CodeExecutionTests_1.lastApplicationUrl = await this.previewWidget.getUrl();
123
129
  });
@@ -126,6 +132,7 @@ let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
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
  CodeExecutionTests_1.lastApplicationUrl = await this.previewWidget.getUrl();
131
138
  });
@@ -134,6 +141,7 @@ let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
134
141
  test(`Run command '${taskName}' expecting notification with unexposed port`, async () => {
135
142
  await this.runTaskUsingQuickOpenContainer(taskName);
136
143
  await this.ide.waitNotificationAndConfirm(notificationText, timeout);
144
+ this.workspaceHandlingTests.setWindowHandle(await this.browserTabsUtil.getCurrentWindowHandle());
137
145
  await this.ide.waitNotificationAndOpenLink(portOpenText, timeout);
138
146
  CodeExecutionTests_1.lastApplicationUrl = await this.previewWidget.getUrl();
139
147
  });
@@ -208,6 +216,8 @@ CodeExecutionTests = CodeExecutionTests_1 = __decorate([
208
216
  __param(5, inversify_1.inject(inversify_types_1.CLASSES.PreviewWidget)),
209
217
  __param(6, inversify_1.inject(inversify_types_1.CLASSES.RightToolBar)),
210
218
  __param(7, inversify_1.inject(inversify_types_1.CLASSES.QuickOpenContainer)),
219
+ __param(8, inversify_1.inject(inversify_types_1.CLASSES.BrowserTabsUtil)),
220
+ __param(9, inversify_1.inject(inversify_types_1.CLASSES.WorkspaceHandlingTests)),
211
221
  __metadata("design:paramtypes", [Terminal_1.Terminal,
212
222
  TopMenu_1.TopMenu,
213
223
  Ide_1.Ide,
@@ -215,7 +225,9 @@ CodeExecutionTests = CodeExecutionTests_1 = __decorate([
215
225
  DriverHelper_1.DriverHelper,
216
226
  PreviewWidget_1.PreviewWidget,
217
227
  RightToolBar_1.RightToolBar,
218
- QuickOpenContainer_1.QuickOpenContainer])
228
+ QuickOpenContainer_1.QuickOpenContainer,
229
+ BrowserTabsUtil_1.BrowserTabsUtil,
230
+ WorkspaceHandlingTests_1.WorkspaceHandlingTests])
219
231
  ], CodeExecutionTests);
220
232
  exports.CodeExecutionTests = CodeExecutionTests;
221
233
  //# sourceMappingURL=CodeExecutionTests.js.map
@@ -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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"}
@@ -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 __1 = require("..");
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(`Open 'New Workspace' page`, async () => {
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
- const parentGUID = await this.browserTabsUtil.getCurrentWindowHandle();
64
+ WorkspaceHandlingTests_1.parentGUID = await this.browserTabsUtil.getCurrentWindowHandle();
50
65
  await this.createWorkspace.clickOnSample(stack);
51
- await this.browserTabsUtil.switchToWindow(parentGUID);
52
- WorkspaceHandlingTests_1.workspaceName = await this.dashboard.getRecentWorkspaceName(10000);
53
- __1.Logger.debug(`Workspace Name is: ${WorkspaceHandlingTests_1.workspaceName}`);
54
- await this.browserTabsUtil.waitAndSwitchToAnotherWindow(parentGUID, 10000);
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('Start workspace', async () => {
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.BrowserTabsUtil)),
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
- BrowserTabsUtil_1.BrowserTabsUtil])
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":"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"}
1
+ {"version":3,"file":"WorkspaceHandlingTests.js","sourceRoot":"","sources":["../../testsLibrary/WorkspaceHandlingTests.ts"],"names":[],"mappings":"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"}
@@ -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(CheReporter.latestWorkspace);
189
+ await testWorkspaceUtil.cleanUpRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
196
190
  }
197
191
 
198
192
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eclipse-che/che-e2e",
3
- "version": "7.46.0",
3
+ "version": "7.46.1-dev-8a64d75",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
@@ -49,7 +49,7 @@
49
49
  "typescript": "3.9.9"
50
50
  },
51
51
  "dependencies": {
52
- "@eclipse-che/api": "latest",
52
+ "@eclipse-che/api": "7.46.0",
53
53
  "inversify": "5.0.1",
54
54
  "reflect-metadata": "0.1.13"
55
55
  },
@@ -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 isProjectFolderVisible = await this.driverHelper.waitVisibilityBoolean(rootItemLocator, 5, visibilityItemPolling / 5);
238
+ const isRootFolderVisible = await this.driverHelper.waitVisibilityBoolean(rootItemLocator, 5, visibilityItemPolling / 5);
239
239
 
240
- if (!isProjectFolderVisible) {
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 isRootSubItemVisible = await this.driverHelper.waitVisibilityBoolean(rootSubitemLocator, 5, visibilityItemPolling / 5);
256
+ const isSubfolderVisible = await this.driverHelper.waitVisibilityBoolean(rootSubitemLocator, 5, visibilityItemPolling / 5);
254
257
 
255
- if (!isRootSubItemVisible) {
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,
@@ -15,7 +15,6 @@ import { LanguageServerTests } from '../../testsLibrary/LanguageServerTests';
15
15
  import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
16
16
  import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
17
17
  import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
18
- import CheReporter from '../../driver/CheReporter';
19
18
 
20
19
  const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
21
20
  const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
@@ -29,17 +28,11 @@ const tabTitle: string = 'hello.cpp';
29
28
  const buildTaskName: string = 'build';
30
29
  const runTaskName: string = 'run';
31
30
  const stack: string = 'C/C++';
32
- let workspaceName: string;
33
31
 
34
32
  suite(`${stack} test`, async () => {
35
33
  suite(`Create ${stack} workspace`, async () => {
36
34
  workspaceHandlingTests.createAndOpenWorkspace(stack);
37
-
38
- test('Register running workspace', async () => {
39
- workspaceName = WorkspaceHandlingTests.getWorkspaceName();
40
- CheReporter.registerRunningWorkspace(workspaceName);
41
- });
42
-
35
+ workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
43
36
  projectAndFileTests.waitWorkspaceReadinessNoSubfolder(workspaceSampleName, false);
44
37
  });
45
38
 
@@ -63,7 +56,7 @@ suite(`${stack} test`, async () => {
63
56
 
64
57
  suite('Stopping and deleting the workspace', async () => {
65
58
  test(`Stop and remowe workspace`, async () => {
66
- await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
59
+ await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
67
60
  });
68
61
  });
69
62
 
@@ -9,7 +9,6 @@
9
9
  **********************************************************************/
10
10
  import 'reflect-metadata';
11
11
  import { CLASSES } from '../../inversify.types';
12
- import CheReporter from '../../driver/CheReporter';
13
12
  import { e2eContainer } from '../../inversify.config';
14
13
  import { PreferencesHandler } from '../../utils/PreferencesHandler';
15
14
  import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
@@ -26,17 +25,11 @@ const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
26
25
  const workspaceSampleName: string = 'console-java-simple';
27
26
  const workspaceRootFolderName: string = 'src';
28
27
  const stack: string = 'Java Maven';
29
- let workspaceName: string;
30
28
 
31
29
  suite(`${stack} test`, async () => {
32
30
  suite (`Create ${stack} workspace`, async () => {
33
31
  workspaceHandlingTests.createAndOpenWorkspace(stack);
34
-
35
- test('Register running workspace', async () => {
36
- workspaceName = WorkspaceHandlingTests.getWorkspaceName();
37
- CheReporter.registerRunningWorkspace(workspaceName);
38
- });
39
-
32
+ workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
40
33
  projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName, false);
41
34
 
42
35
  test('Set application.confirmExit user preferences to "never"', async () => {
@@ -47,7 +40,7 @@ suite(`${stack} test`, async () => {
47
40
  suite ('Stopping and deleting the workspace', async () => {
48
41
  test(`Stop and remowe workspace`, async () => {
49
42
  await navigationBar.openNavigationBar();
50
- await dashboard.stopAndRemoveWorkspaceByUI(workspaceName);
43
+ await dashboard.stopAndRemoveWorkspaceByUI(WorkspaceHandlingTests.getWorkspaceName());
51
44
  });
52
45
  });
53
46
  });
@@ -15,7 +15,6 @@ import { LanguageServerTests } from '../../testsLibrary/LanguageServerTests';
15
15
  import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
16
16
  import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
17
17
  import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
18
- import CheReporter from '../../driver/CheReporter';
19
18
 
20
19
  const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
21
20
  const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
@@ -32,17 +31,11 @@ const updateDependenciesTaskName: string = 'update dependencies';
32
31
  const buildTaskName: string = 'build';
33
32
  const runTaskName: string = 'run';
34
33
  const runTaskNameExpectedString: string = 'Process 5000-tcp is now listening on port 5000. Open it ?';
35
- let workspaceName: string;
36
34
 
37
35
  suite(`Test ${stack}`, async () => {
38
36
  suite (`Create ${stack} workspace`, async () => {
39
37
  workspaceHandlingTests.createAndOpenWorkspace(stack);
40
-
41
- test('Register running workspace', async () => {
42
- workspaceName = WorkspaceHandlingTests.getWorkspaceName();
43
- CheReporter.registerRunningWorkspace(workspaceName);
44
- });
45
-
38
+ workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
46
39
  projectAndFileTests.waitWorkspaceReadinessNoSubfolder(workspaceSampleName, false);
47
40
  });
48
41
 
@@ -75,7 +68,7 @@ suite(`Test ${stack}`, async () => {
75
68
 
76
69
  suite ('Stopping and deleting the workspace', async () => {
77
70
  test(`Stop and remowe workspace`, async () => {
78
- await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
71
+ await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
79
72
  });
80
73
  });
81
74
  });
@@ -16,7 +16,6 @@ import { LanguageServerTests } from '../../testsLibrary/LanguageServerTests';
16
16
  import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
17
17
  import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
18
18
  import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
19
- import CheReporter from '../../driver/CheReporter';
20
19
 
21
20
  const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
22
21
  const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
@@ -34,16 +33,12 @@ const taskRunServer: string = 'run-outyet';
34
33
  const taskStopServer: string = 'stop-outyet';
35
34
  const taskTestOutyet: string = 'test-outyet';
36
35
  const notificationText: string = 'Process 8080-tcp is now listening on port 8080. Open it ?';
37
- let workspaceName: string;
38
36
 
39
37
  suite(`${workspaceStack} test`, async () => {
40
38
 
41
39
  suite(`Create ${workspaceStack} workspace`, async () => {
42
40
  workspaceHandlingTests.createAndOpenWorkspace(workspaceStack);
43
- test('Register running workspace', async () => {
44
- workspaceName = WorkspaceHandlingTests.getWorkspaceName();
45
- CheReporter.registerRunningWorkspace(workspaceName);
46
- });
41
+ workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
47
42
  projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceSubfolderName, false);
48
43
  test('Workaround for issue #16113', async () => {
49
44
  Logger.warn(`Manually setting a preference for golang devFile LS based on issue: https://github.com/eclipse/che/issues/16113`);
@@ -75,7 +70,7 @@ suite(`${workspaceStack} test`, async () => {
75
70
 
76
71
  suite('Stop and remove workspace', async() => {
77
72
  test(`Stop and remove workspace`, async () => {
78
- await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
73
+ await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
79
74
  });
80
75
  });
81
76
 
@@ -14,7 +14,6 @@ import { e2eContainer } from '../../inversify.config';
14
14
  import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
15
15
  import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
16
16
  import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
17
- import CheReporter from '../../driver/CheReporter';
18
17
 
19
18
  const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
20
19
  const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
@@ -28,17 +27,11 @@ const tabTitle: string = 'HelloWorld.java';
28
27
  const codeNavigationClassName: string = 'String.class';
29
28
  const stack : string = 'Java Maven';
30
29
  const taskName: string = 'maven build';
31
- let workspaceName: string;
32
30
 
33
31
  suite(`${stack} test`, async () => {
34
32
  suite (`Create ${stack} workspace`, async () => {
35
33
  workspaceHandlingTests.createAndOpenWorkspace(stack);
36
-
37
- test('Register running workspace', async () => {
38
- workspaceName = WorkspaceHandlingTests.getWorkspaceName();
39
- CheReporter.registerRunningWorkspace(workspaceName);
40
- });
41
-
34
+ workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
42
35
  projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName, false);
43
36
  });
44
37
 
@@ -61,7 +54,7 @@ suite(`${stack} test`, async () => {
61
54
 
62
55
  suite('Stopping and deleting the workspace', async () => {
63
56
  test(`Stop and remowe workspace`, async () => {
64
- await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
57
+ await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
65
58
  });
66
59
  });
67
60
  });
@@ -14,7 +14,6 @@ import { e2eContainer } from '../../inversify.config';
14
14
  import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
15
15
  import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
16
16
  import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
17
- import CheReporter from '../../driver/CheReporter';
18
17
 
19
18
  const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
20
19
  const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
@@ -30,17 +29,11 @@ const codeNavigationClassName: string = 'SpringApplication.class';
30
29
  const buildTaskName: string = 'maven build';
31
30
  const runTaskName: string = 'run webapp';
32
31
  const runTaskExpectedDialogue: string = 'Process 8080-tcp is now listening on port 8080. Open it ?';
33
- let workspaceName: string;
34
32
 
35
33
  suite(`${stack} test`, async () => {
36
34
  suite(`Create ${stack} workspace`, async () => {
37
35
  workspaceHandlingTests.createAndOpenWorkspace(stack);
38
-
39
- test('Register running workspace', async () => {
40
- workspaceName = WorkspaceHandlingTests.getWorkspaceName();
41
- CheReporter.registerRunningWorkspace(workspaceName);
42
- });
43
-
36
+ workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
44
37
  projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName, false);
45
38
  });
46
39
 
@@ -68,7 +61,7 @@ suite(`${stack} test`, async () => {
68
61
 
69
62
  suite('Stopping and deleting the workspace', async () => {
70
63
  test(`Stop and remowe workspace`, async () => {
71
- await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
64
+ await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
72
65
  });
73
66
  });
74
67
  });