@eclipse-che/che-e2e 7.50.0-dev-d6432ff → 7.51.0-dev-6c69f4f

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 (151) hide show
  1. package/dist/driver/CheReporter.js +2 -1
  2. package/dist/driver/CheReporter.js.map +1 -1
  3. package/dist/index.js +1 -0
  4. package/dist/index.js.map +1 -1
  5. package/dist/inversify.config.js +2 -0
  6. package/dist/inversify.config.js.map +1 -1
  7. package/dist/inversify.types.js +2 -1
  8. package/dist/inversify.types.js.map +1 -1
  9. package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js.map +1 -1
  10. package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetailsPlugins.js.map +1 -1
  11. package/dist/pageobjects/ide/ProjectTree.js +12 -6
  12. package/dist/pageobjects/ide/ProjectTree.js.map +1 -1
  13. package/dist/tests/devfiles/CSlashCPlusPlus.spec.js +3 -4
  14. package/dist/tests/devfiles/CSlashCPlusPlus.spec.js.map +1 -1
  15. package/dist/tests/devfiles/DevfileSmoke.spec.js +4 -5
  16. package/dist/tests/devfiles/DevfileSmoke.spec.js.map +1 -1
  17. package/dist/tests/devfiles/DotNetCore.spec.js +3 -4
  18. package/dist/tests/devfiles/DotNetCore.spec.js.map +1 -1
  19. package/dist/tests/devfiles/Go.spec.js +3 -4
  20. package/dist/tests/devfiles/Go.spec.js.map +1 -1
  21. package/dist/tests/devfiles/JavaMaven.spec.js +3 -4
  22. package/dist/tests/devfiles/JavaMaven.spec.js.map +1 -1
  23. package/dist/tests/devfiles/JavaSpringBoot.spec.js +3 -4
  24. package/dist/tests/devfiles/JavaSpringBoot.spec.js.map +1 -1
  25. package/dist/tests/devfiles/JavaVertx.spec.js +3 -4
  26. package/dist/tests/devfiles/JavaVertx.spec.js.map +1 -1
  27. package/dist/tests/devfiles/NodeJS.spec.js +3 -4
  28. package/dist/tests/devfiles/NodeJS.spec.js.map +1 -1
  29. package/dist/tests/devfiles/PHPSimple.spec.js +3 -4
  30. package/dist/tests/devfiles/PHPSimple.spec.js.map +1 -1
  31. package/dist/tests/devfiles/Python.spec.js +3 -4
  32. package/dist/tests/devfiles/Python.spec.js.map +1 -1
  33. package/dist/tests/devfiles/PythonDjango.spec.js +3 -4
  34. package/dist/tests/devfiles/PythonDjango.spec.js.map +1 -1
  35. package/dist/tests/devfiles/Quarkus.spec.js +3 -4
  36. package/dist/tests/devfiles/Quarkus.spec.js.map +1 -1
  37. package/dist/tests/devfiles/Scala.spec.js +3 -4
  38. package/dist/tests/devfiles/Scala.spec.js.map +1 -1
  39. package/dist/tests/e2e/FactoryUrl.spec.js +4 -9
  40. package/dist/tests/e2e/FactoryUrl.spec.js.map +1 -1
  41. package/dist/tests/e2e/GitPublishBranch.spec.js +2 -0
  42. package/dist/tests/e2e/GitPublishBranch.spec.js.map +1 -1
  43. package/dist/tests/e2e/GitSelfSignCert.spec.js +7 -0
  44. package/dist/tests/e2e/GitSelfSignCert.spec.js.map +1 -1
  45. package/dist/tests/e2e/GitSsh.spec.js +4 -1
  46. package/dist/tests/e2e/GitSsh.spec.js.map +1 -1
  47. package/dist/tests/e2e/OpenshiftConnector.spec.js +2 -0
  48. package/dist/tests/e2e/OpenshiftConnector.spec.js.map +1 -1
  49. package/dist/tests/e2e/factories/DirectUrlFactoryWithKeepDirectoryTest.spec.js +3 -7
  50. package/dist/tests/e2e/factories/DirectUrlFactoryWithKeepDirectoryTest.spec.js.map +1 -1
  51. package/dist/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.js +3 -7
  52. package/dist/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.js.map +1 -1
  53. package/dist/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.js +3 -7
  54. package/dist/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.js.map +1 -1
  55. package/dist/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.js +2 -0
  56. package/dist/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.js.map +1 -1
  57. package/dist/tests/e2e_happy_path/HappyPath.spec.js +13 -8
  58. package/dist/tests/e2e_happy_path/HappyPath.spec.js.map +1 -1
  59. package/dist/tests/intelij/IntelijOpenWorkspace.spec.js +2 -6
  60. package/dist/tests/intelij/IntelijOpenWorkspace.spec.js.map +1 -1
  61. package/dist/tests/load_test/LoadTest.spec.js +2 -5
  62. package/dist/tests/load_test/LoadTest.spec.js.map +1 -1
  63. package/dist/tests/login/LinkCheAndOcpUsers.spec.js +2 -2
  64. package/dist/tests/login/LinkCheAndOcpUsers.spec.js.map +1 -1
  65. package/dist/tests/plugins/GitHubPullRequestPlugin.spec.js +4 -9
  66. package/dist/tests/plugins/GitHubPullRequestPlugin.spec.js.map +1 -1
  67. package/dist/tests/plugins/InstallPluginUsingUI.spec.js +4 -10
  68. package/dist/tests/plugins/InstallPluginUsingUI.spec.js.map +1 -1
  69. package/dist/tests/plugins/JavaPlugin.spec.js +4 -8
  70. package/dist/tests/plugins/JavaPlugin.spec.js.map +1 -1
  71. package/dist/tests/plugins/PhpPlugin.spec.js +12 -10
  72. package/dist/tests/plugins/PhpPlugin.spec.js.map +1 -1
  73. package/dist/tests/plugins/PythonPlugin.spec.js +4 -8
  74. package/dist/tests/plugins/PythonPlugin.spec.js.map +1 -1
  75. package/dist/tests/plugins/TypescriptPlugin.spec.js +4 -8
  76. package/dist/tests/plugins/TypescriptPlugin.spec.js.map +1 -1
  77. package/dist/tests/plugins/VscodeKubernetesPlugin.spec.js +3 -10
  78. package/dist/tests/plugins/VscodeKubernetesPlugin.spec.js.map +1 -1
  79. package/dist/tests/plugins/VscodeShellcheckPlugin.spec.js +3 -10
  80. package/dist/tests/plugins/VscodeShellcheckPlugin.spec.js.map +1 -1
  81. package/dist/tests/plugins/VscodeValePlugin.spec.js +3 -10
  82. package/dist/tests/plugins/VscodeValePlugin.spec.js.map +1 -1
  83. package/dist/tests/plugins/VscodeXmlPlugin.spec.js +15 -1
  84. package/dist/tests/plugins/VscodeXmlPlugin.spec.js.map +1 -1
  85. package/dist/tests/plugins/VscodeYamlPlugin.spec.js +4 -8
  86. package/dist/tests/plugins/VscodeYamlPlugin.spec.js.map +1 -1
  87. package/dist/testsLibrary/CodeExecutionTests.js +14 -2
  88. package/dist/testsLibrary/CodeExecutionTests.js.map +1 -1
  89. package/dist/testsLibrary/WorkspaceHandlingTests.js +75 -10
  90. package/dist/testsLibrary/WorkspaceHandlingTests.js.map +1 -1
  91. package/dist/utils/requestHandlers/CheApiRequestHandler.js.map +1 -1
  92. package/dist/utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.js +17 -2
  93. package/dist/utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.js.map +1 -1
  94. package/dist/utils/workspace/ApiUrlResolver.js +67 -0
  95. package/dist/utils/workspace/ApiUrlResolver.js.map +1 -0
  96. package/dist/utils/workspace/TestWorkspaceUtil.js +60 -30
  97. package/dist/utils/workspace/TestWorkspaceUtil.js.map +1 -1
  98. package/dist/utils/workspace/WorkspaceStatus.js.map +1 -1
  99. package/driver/CheReporter.ts +2 -2
  100. package/index.ts +1 -0
  101. package/inversify.config.ts +4 -2
  102. package/inversify.types.ts +2 -1
  103. package/package.json +1 -1
  104. package/pageobjects/dashboard/workspace-details/WorkspaceDetails.ts +2 -2
  105. package/pageobjects/dashboard/workspace-details/WorkspaceDetailsPlugins.ts +3 -3
  106. package/pageobjects/ide/ProjectTree.ts +13 -8
  107. package/tests/devfiles/CSlashCPlusPlus.spec.ts +3 -6
  108. package/tests/devfiles/DevfileSmoke.spec.ts +4 -7
  109. package/tests/devfiles/DotNetCore.spec.ts +3 -6
  110. package/tests/devfiles/Go.spec.ts +3 -4
  111. package/tests/devfiles/JavaMaven.spec.ts +3 -6
  112. package/tests/devfiles/JavaSpringBoot.spec.ts +3 -6
  113. package/tests/devfiles/JavaVertx.spec.ts +3 -6
  114. package/tests/devfiles/NodeJS.spec.ts +3 -6
  115. package/tests/devfiles/PHPSimple.spec.ts +3 -6
  116. package/tests/devfiles/Python.spec.ts +3 -6
  117. package/tests/devfiles/PythonDjango.spec.ts +3 -6
  118. package/tests/devfiles/Quarkus.spec.ts +3 -6
  119. package/tests/devfiles/Scala.spec.ts +3 -7
  120. package/tests/e2e/FactoryUrl.spec.ts +6 -10
  121. package/tests/e2e/GitPublishBranch.spec.ts +5 -3
  122. package/tests/e2e/GitSelfSignCert.spec.ts +68 -65
  123. package/tests/e2e/GitSsh.spec.ts +6 -3
  124. package/tests/e2e/OpenshiftConnector.spec.ts +4 -2
  125. package/tests/e2e/factories/DirectUrlFactoryWithKeepDirectoryTest.spec.ts +2 -5
  126. package/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.ts +2 -5
  127. package/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.ts +2 -5
  128. package/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts +2 -0
  129. package/tests/e2e_happy_path/HappyPath.spec.ts +13 -8
  130. package/tests/intelij/IntelijOpenWorkspace.spec.ts +2 -4
  131. package/tests/load_test/LoadTest.spec.ts +4 -4
  132. package/tests/login/LinkCheAndOcpUsers.spec.ts +4 -3
  133. package/tests/plugins/GitHubPullRequestPlugin.spec.ts +4 -7
  134. package/tests/plugins/InstallPluginUsingUI.spec.ts +4 -9
  135. package/tests/plugins/JavaPlugin.spec.ts +4 -6
  136. package/tests/plugins/PhpPlugin.spec.ts +3 -9
  137. package/tests/plugins/PythonPlugin.spec.ts +4 -6
  138. package/tests/plugins/TypescriptPlugin.spec.ts +4 -6
  139. package/tests/plugins/VscodeKubernetesPlugin.spec.ts +3 -9
  140. package/tests/plugins/VscodeShellcheckPlugin.spec.ts +3 -9
  141. package/tests/plugins/VscodeValePlugin.spec.ts +3 -9
  142. package/tests/plugins/VscodeXmlPlugin.spec.ts +17 -1
  143. package/tests/plugins/VscodeYamlPlugin.spec.ts +4 -7
  144. package/testsLibrary/CodeExecutionTests.ts +9 -1
  145. package/testsLibrary/WorkspaceHandlingTests.ts +72 -9
  146. package/utils/requestHandlers/CheApiRequestHandler.ts +1 -1
  147. package/utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.ts +17 -2
  148. package/utils/workspace/ApiUrlResolver.ts +50 -0
  149. package/utils/workspace/ITestWorkspaceUtil.ts +73 -1
  150. package/utils/workspace/TestWorkspaceUtil.ts +65 -33
  151. package/utils/workspace/WorkspaceStatus.ts +1 -1
@@ -38,14 +38,18 @@ const DialogWindow_1 = require("../pageobjects/ide/DialogWindow");
38
38
  const DriverHelper_1 = require("../utils/DriverHelper");
39
39
  const Logger_1 = require("../utils/Logger");
40
40
  const QuickOpenContainer_1 = require("../pageobjects/ide/QuickOpenContainer");
41
+ const WorkspaceHandlingTests_1 = require("./WorkspaceHandlingTests");
42
+ const BrowserTabsUtil_1 = require("../utils/BrowserTabsUtil");
41
43
  let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
42
- constructor(terminal, topMenu, ide, dialogWindow, driverHelper, quickOpenContainer) {
44
+ constructor(terminal, topMenu, ide, dialogWindow, driverHelper, quickOpenContainer, browserTabsUtil, workspaceHandlingTests) {
43
45
  this.terminal = terminal;
44
46
  this.topMenu = topMenu;
45
47
  this.ide = ide;
46
48
  this.dialogWindow = dialogWindow;
47
49
  this.driverHelper = driverHelper;
48
50
  this.quickOpenContainer = quickOpenContainer;
51
+ this.browserTabsUtil = browserTabsUtil;
52
+ this.workspaceHandlingTests = workspaceHandlingTests;
49
53
  }
50
54
  runTask(taskName, timeout) {
51
55
  test(`Run command '${taskName}'`, async () => {
@@ -72,6 +76,7 @@ let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
72
76
  runTaskWithDialogShellAndOpenLink(taskName, expectedDialogText, timeout) {
73
77
  test(`Run command '${taskName}' expecting dialog shell`, async () => {
74
78
  await this.runTaskUsingQuickOpenContainer(taskName);
79
+ this.workspaceHandlingTests.setWindowHandle(await this.browserTabsUtil.getCurrentWindowHandle());
75
80
  await this.dialogWindow.waitDialogAndOpenLink(expectedDialogText, timeout);
76
81
  });
77
82
  }
@@ -114,6 +119,7 @@ let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
114
119
  test(`Run command '${taskName}' expecting notification`, async () => {
115
120
  await this.runTaskUsingQuickOpenContainer(taskName);
116
121
  await this.ide.waitNotification(notificationText, timeout);
122
+ this.workspaceHandlingTests.setWindowHandle(await this.browserTabsUtil.getCurrentWindowHandle());
117
123
  await this.ide.clickOnNotificationButton(notificationText, buttonText);
118
124
  await this.driverHelper.wait(5000);
119
125
  CodeExecutionTests_1.lastApplicationUrl = await this.driverHelper.getDriver().getCurrentUrl();
@@ -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
  await this.driverHelper.wait(5000);
131
138
  CodeExecutionTests_1.lastApplicationUrl = await this.driverHelper.getDriver().getCurrentUrl();
@@ -135,6 +142,7 @@ let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
135
142
  test(`Run command '${taskName}' expecting notification with unexposed port`, async () => {
136
143
  await this.runTaskUsingQuickOpenContainer(taskName);
137
144
  await this.ide.waitNotificationAndConfirm(notificationText, timeout);
145
+ this.workspaceHandlingTests.setWindowHandle(await this.browserTabsUtil.getCurrentWindowHandle());
138
146
  await this.ide.waitNotificationAndOpenLink(portOpenText, timeout);
139
147
  await this.driverHelper.wait(5000);
140
148
  CodeExecutionTests_1.lastApplicationUrl = await this.driverHelper.getDriver().getCurrentUrl();
@@ -221,12 +229,16 @@ CodeExecutionTests = CodeExecutionTests_1 = __decorate([
221
229
  __param(3, inversify_1.inject(inversify_types_1.CLASSES.DialogWindow)),
222
230
  __param(4, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
223
231
  __param(5, inversify_1.inject(inversify_types_1.CLASSES.QuickOpenContainer)),
232
+ __param(6, inversify_1.inject(inversify_types_1.CLASSES.BrowserTabsUtil)),
233
+ __param(7, inversify_1.inject(inversify_types_1.CLASSES.WorkspaceHandlingTests)),
224
234
  __metadata("design:paramtypes", [Terminal_1.Terminal,
225
235
  TopMenu_1.TopMenu,
226
236
  Ide_1.Ide,
227
237
  DialogWindow_1.DialogWindow,
228
238
  DriverHelper_1.DriverHelper,
229
- QuickOpenContainer_1.QuickOpenContainer])
239
+ QuickOpenContainer_1.QuickOpenContainer,
240
+ BrowserTabsUtil_1.BrowserTabsUtil,
241
+ WorkspaceHandlingTests_1.WorkspaceHandlingTests])
230
242
  ], CodeExecutionTests);
231
243
  exports.CodeExecutionTests = CodeExecutionTests;
232
244
  //# 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,96 @@ 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 ApiUrlResolver_1 = require("../utils/workspace/ApiUrlResolver");
35
+ const TimeoutConstants_1 = require("../TimeoutConstants");
36
+ const DriverHelper_1 = require("../utils/DriverHelper");
37
+ const Ide_1 = require("../pageobjects/ide/Ide");
38
+ const selenium_webdriver_1 = require("selenium-webdriver");
34
39
  let WorkspaceHandlingTests = WorkspaceHandlingTests_1 = class WorkspaceHandlingTests {
35
- constructor(dashboard, createWorkspace, workspaces, browserTabsUtil) {
40
+ constructor(dashboard, createWorkspace, workspaces, browserTabsUtil, apiUrlResolver, driverHelper, ide) {
36
41
  this.dashboard = dashboard;
37
42
  this.createWorkspace = createWorkspace;
38
43
  this.workspaces = workspaces;
39
44
  this.browserTabsUtil = browserTabsUtil;
45
+ this.apiUrlResolver = apiUrlResolver;
46
+ this.driverHelper = driverHelper;
47
+ this.ide = ide;
40
48
  }
41
49
  static getWorkspaceName() {
42
50
  return WorkspaceHandlingTests_1.workspaceName;
43
51
  }
52
+ static setWorkspaceName(workspaceName) {
53
+ WorkspaceHandlingTests_1.workspaceName = workspaceName;
54
+ }
55
+ setWindowHandle(guid) {
56
+ WorkspaceHandlingTests_1.parentGUID = guid;
57
+ }
58
+ getWindowHandle() {
59
+ return WorkspaceHandlingTests_1.parentGUID;
60
+ }
44
61
  createAndOpenWorkspace(stack) {
45
- test(`Open 'New Workspace' page`, async () => {
62
+ test(`Create and open new workspace, stack:${stack}`, async () => {
46
63
  await this.dashboard.waitPage();
64
+ Logger_1.Logger.debug(`Fetching user kubernetes namespace, storing auth token by getting workspaces API URL.`);
65
+ await this.apiUrlResolver.getWorkspacesApiUrl();
47
66
  await this.dashboard.clickCreateWorkspaceButton();
48
67
  await this.createWorkspace.waitPage();
49
- const parentGUID = await this.browserTabsUtil.getCurrentWindowHandle();
68
+ WorkspaceHandlingTests_1.parentGUID = await this.browserTabsUtil.getCurrentWindowHandle();
50
69
  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);
70
+ await this.browserTabsUtil.waitAndSwitchToAnotherWindow(WorkspaceHandlingTests_1.parentGUID, TimeoutConstants_1.TimeoutConstants.TS_IDE_LOAD_TIMEOUT);
55
71
  });
56
72
  }
57
73
  openExistingWorkspace(workspaceName) {
58
- test('Start workspace', async () => {
74
+ test('Open and start existing workspace', async () => {
59
75
  await this.dashboard.waitPage();
76
+ Logger_1.Logger.debug(`Fetching user kubernetes namespace, storing auth token by getting workspaces API URL.`);
77
+ await this.apiUrlResolver.getWorkspacesApiUrl();
60
78
  await this.dashboard.clickWorkspacesButton();
61
79
  await this.workspaces.waitPage();
62
80
  await this.workspaces.clickOpenButton(workspaceName);
63
81
  });
64
82
  }
83
+ obtainWorkspaceNameFromStartingPage() {
84
+ test('Obtain workspace name from workspace loader page', async () => {
85
+ try {
86
+ await this.driverHelper.waitVisibility(WorkspaceHandlingTests_1.START_WORKSPACE_PAGE_NAME_LOCATOR, TimeoutConstants_1.TimeoutConstants.TS_WAIT_LOADER_PRESENCE_TIMEOUT);
87
+ // it takes a while to update the element with the workspace name
88
+ await this.driverHelper.wait(TimeoutConstants_1.TimeoutConstants.TS_IDE_LOAD_TIMEOUT);
89
+ let startingWorkspaceLineContent = await this.driverHelper.getDriver().findElement(WorkspaceHandlingTests_1.START_WORKSPACE_PAGE_NAME_LOCATOR).getAttribute('innerHTML');
90
+ // cutting away leading text
91
+ WorkspaceHandlingTests_1.workspaceName = startingWorkspaceLineContent.substring('Starting workspace '.length).trim();
92
+ Logger_1.Logger.info(`Obtained workspace name from workspace loader page: ${WorkspaceHandlingTests_1.workspaceName}`);
93
+ }
94
+ catch (err) {
95
+ Logger_1.Logger.error(`Failed to obtain workspace name from workspace loader page: ${err}`);
96
+ throw err;
97
+ }
98
+ });
99
+ }
100
+ switchBackToFirstOpenIdeTabFromLeftToRight() {
101
+ test('WorkspaceHandlingTests.switchBackToIdeTab', async () => {
102
+ let tabs = await this.driverHelper.getDriver().getAllWindowHandles();
103
+ Logger_1.Logger.trace(`WorkspaceHandlingTests.switchBackToIdeTab Found ${tabs.length} window handles, iterating...`);
104
+ for (let i = 0; i < tabs.length; i++) {
105
+ await this.browserTabsUtil.switchToWindow(tabs[i]);
106
+ try {
107
+ await this.ide.waitIde(TimeoutConstants_1.TimeoutConstants.TS_IDE_LOAD_TIMEOUT);
108
+ Logger_1.Logger.debug(`WorkspaceHandlingTests.switchBackToIdeTab located and switched to IDE tab`);
109
+ return;
110
+ }
111
+ catch (err) {
112
+ if (err instanceof selenium_webdriver_1.error.TimeoutError) {
113
+ Logger_1.Logger.warn(`WorkspaceHandlingTests.switchBackToIdeTab Locator timed out, trying with another window handle.`);
114
+ continue;
115
+ }
116
+ Logger_1.Logger.error(`WorkspaceHandlingTests.switchBackToIdeTab Received unexpected exception while trying to locate IDE tab:${err}`);
117
+ throw err;
118
+ }
119
+ }
120
+ Logger_1.Logger.error(`WorkspaceHandlingTests.switchBackToIdeTab Failed to locate IDE tab, out of window handles.`);
121
+ });
122
+ }
65
123
  async stopWorkspace(workspaceName) {
66
124
  await this.dashboard.openDashboard();
67
125
  await this.dashboard.stopWorkspaceByUI(workspaceName);
@@ -75,6 +133,7 @@ let WorkspaceHandlingTests = WorkspaceHandlingTests_1 = class WorkspaceHandlingT
75
133
  await this.dashboard.stopAndRemoveWorkspaceByUI(workspaceName);
76
134
  }
77
135
  };
136
+ 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
137
  WorkspaceHandlingTests.workspaceName = 'undefined';
79
138
  WorkspaceHandlingTests = WorkspaceHandlingTests_1 = __decorate([
80
139
  inversify_1.injectable(),
@@ -82,10 +141,16 @@ WorkspaceHandlingTests = WorkspaceHandlingTests_1 = __decorate([
82
141
  __param(1, inversify_1.inject(inversify_types_1.CLASSES.CreateWorkspace)),
83
142
  __param(2, inversify_1.inject(inversify_types_1.CLASSES.Workspaces)),
84
143
  __param(3, inversify_1.inject(inversify_types_1.CLASSES.BrowserTabsUtil)),
144
+ __param(4, inversify_1.inject(inversify_types_1.CLASSES.ApiUrlResolver)),
145
+ __param(5, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
146
+ __param(6, inversify_1.inject(inversify_types_1.CLASSES.Ide)),
85
147
  __metadata("design:paramtypes", [Dashboard_1.Dashboard,
86
148
  CreateWorkspace_1.CreateWorkspace,
87
149
  Workspaces_1.Workspaces,
88
- BrowserTabsUtil_1.BrowserTabsUtil])
150
+ BrowserTabsUtil_1.BrowserTabsUtil,
151
+ ApiUrlResolver_1.ApiUrlResolver,
152
+ DriverHelper_1.DriverHelper,
153
+ Ide_1.Ide])
89
154
  ], WorkspaceHandlingTests);
90
155
  exports.WorkspaceHandlingTests = WorkspaceHandlingTests;
91
156
  //# 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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"}
@@ -1 +1 @@
1
- {"version":3,"file":"CheApiRequestHandler.js","sourceRoot":"","sources":["../../../utils/requestHandlers/CheApiRequestHandler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CheApiRequestHandler.js","sourceRoot":"","sources":["../../../utils/requestHandlers/CheApiRequestHandler.ts"],"names":[],"mappings":"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"}
@@ -16,13 +16,28 @@ exports.CheMultiuserAuthorizationHeaderHandler = void 0;
16
16
  const inversify_1 = require("inversify");
17
17
  const DriverHelper_1 = require("../../DriverHelper");
18
18
  const inversify_types_1 = require("../../../inversify.types");
19
+ const Logger_1 = require("../../Logger");
19
20
  let CheMultiuserAuthorizationHeaderHandler = class CheMultiuserAuthorizationHeaderHandler {
20
21
  constructor(driverHelper) {
21
22
  this.driverHelper = driverHelper;
23
+ this.authorizationToken = '';
22
24
  }
23
25
  async get() {
24
- let token = await this.driverHelper.getDriver().manage().getCookie('_oauth_proxy');
25
- return { headers: { 'cookie': `_oauth_proxy=${token.value}` } };
26
+ try {
27
+ let token = await this.driverHelper.getDriver().manage().getCookie('_oauth_proxy');
28
+ if (this.authorizationToken !== token.value) {
29
+ this.authorizationToken = token.value;
30
+ }
31
+ }
32
+ catch (err) {
33
+ if (this.authorizationToken.length > 0) {
34
+ Logger_1.Logger.warn(`Could not obtain _oauth_proxy cookie from chromedriver, browser session may have been killed. Using stored value.`);
35
+ }
36
+ else {
37
+ throw new Error(`Could not obtain _oauth_proxy cookie from chromedriver, browser session may have been killed. No stored token present!`);
38
+ }
39
+ }
40
+ return { headers: { 'cookie': `_oauth_proxy=${this.authorizationToken}` } };
26
41
  }
27
42
  };
28
43
  CheMultiuserAuthorizationHeaderHandler = __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"CheMultiuserAuthorizationHeaderHandler.js","sourceRoot":"","sources":["../../../../utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAWA,yCAA+C;AAC/C,qDAAkD;AAClD,8DAAmD;AAGnD,IAAa,sCAAsC,GAAnD,MAAa,sCAAsC;IAC/C,YAA2D,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAI,CAAC;IAE1F,KAAK,CAAC,GAAG;QACL,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QACnF,OAAO,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,gBAAgB,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC;IACpE,CAAC;CACJ,CAAA;AAPY,sCAAsC;IADlD,sBAAU,EAAE;IAEI,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCAAgC,2BAAY;GAD5E,sCAAsC,CAOlD;AAPY,wFAAsC"}
1
+ {"version":3,"file":"CheMultiuserAuthorizationHeaderHandler.js","sourceRoot":"","sources":["../../../../utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAWA,yCAA+C;AAC/C,qDAAkD;AAClD,8DAAmD;AACnD,yCAAsC;AAGtC,IAAa,sCAAsC,GAAnD,MAAa,sCAAsC;IAG/C,YAA2D,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;QAF7E,uBAAkB,GAAW,EAAE,CAAC;IAEiD,CAAC;IAE1F,KAAK,CAAC,GAAG;QACL,IAAI;YACA,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;YACnF,IAAI,IAAI,CAAC,kBAAkB,KAAK,KAAK,CAAC,KAAK,EAAE;gBACzC,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC,KAAK,CAAC;aACzC;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,IAAI,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE;gBACpC,eAAM,CAAC,IAAI,CAAC,mHAAmH,CAAC,CAAC;aACpI;iBAAM;gBACH,MAAM,IAAI,KAAK,CAAC,wHAAwH,CAAC,CAAC;aAC7I;SACJ;QAED,OAAO,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,gBAAgB,IAAI,CAAC,kBAAkB,EAAE,EAAE,EAAE,CAAC;IAChF,CAAC;CACJ,CAAA;AArBY,sCAAsC;IADlD,sBAAU,EAAE;IAII,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCAAgC,2BAAY;GAH5E,sCAAsC,CAqBlD;AArBY,wFAAsC"}
@@ -0,0 +1,67 @@
1
+ "use strict";
2
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
7
+ };
8
+ var __metadata = (this && this.__metadata) || function (k, v) {
9
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
+ };
11
+ var __param = (this && this.__param) || function (paramIndex, decorator) {
12
+ return function (target, key) { decorator(target, key, paramIndex); }
13
+ };
14
+ var ApiUrlResolver_1;
15
+ Object.defineProperty(exports, "__esModule", { value: true });
16
+ exports.ApiUrlResolver = void 0;
17
+ /*********************************************************************
18
+ * Copyright (c) 2019 Red Hat, Inc.
19
+ *
20
+ * This program and the accompanying materials are made
21
+ * available under the terms of the Eclipse Public License 2.0
22
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
23
+ *
24
+ * SPDX-License-Identifier: EPL-2.0
25
+ **********************************************************************/
26
+ const inversify_1 = require("inversify");
27
+ const inversify_types_1 = require("../../inversify.types");
28
+ const Logger_1 = require("../Logger");
29
+ const CheApiRequestHandler_1 = require("../requestHandlers/CheApiRequestHandler");
30
+ let ApiUrlResolver = ApiUrlResolver_1 = class ApiUrlResolver {
31
+ constructor(processRequestHandler) {
32
+ this.processRequestHandler = processRequestHandler;
33
+ this.userNamespace = '';
34
+ }
35
+ async getWorkspaceApiUrl(workspaceName) {
36
+ return `${await this.getWorkspacesApiUrl()}/${workspaceName}`;
37
+ }
38
+ async getWorkspacesApiUrl() {
39
+ const namespace = await this.obtainUserNamespace();
40
+ return `${ApiUrlResolver_1.DASHBOARD_API_URL}/${namespace}/devworkspaces`;
41
+ }
42
+ getKubernetesApiUrl() {
43
+ return ApiUrlResolver_1.KUBERNETES_API_URL;
44
+ }
45
+ async obtainUserNamespace() {
46
+ Logger_1.Logger.debug(`ApiUrlResolver.obtainUserNamespace ${this.userNamespace}`);
47
+ if (this.userNamespace.length === 0) {
48
+ Logger_1.Logger.trace(`ApiUrlResolver.obtainUserNamespace USER_NAMESPACE.length = 0, calling kubernetes API`);
49
+ const kubernetesResponse = await this.processRequestHandler.get(ApiUrlResolver_1.KUBERNETES_API_URL);
50
+ if (kubernetesResponse.status !== 200) {
51
+ throw new Error(`Cannot get user namespace from kubernetes API. Code: ${kubernetesResponse.status} Data: ${kubernetesResponse.data}`);
52
+ }
53
+ this.userNamespace = kubernetesResponse.data[0].name;
54
+ Logger_1.Logger.debug(`ApiUrlResolver.obtainUserNamespace kubeapi success: ${this.userNamespace}`);
55
+ }
56
+ return this.userNamespace;
57
+ }
58
+ };
59
+ ApiUrlResolver.DASHBOARD_API_URL = 'dashboard/api/namespace';
60
+ ApiUrlResolver.KUBERNETES_API_URL = 'api/kubernetes/namespace';
61
+ ApiUrlResolver = ApiUrlResolver_1 = __decorate([
62
+ inversify_1.injectable(),
63
+ __param(0, inversify_1.inject(inversify_types_1.CLASSES.CheApiRequestHandler)),
64
+ __metadata("design:paramtypes", [CheApiRequestHandler_1.CheApiRequestHandler])
65
+ ], ApiUrlResolver);
66
+ exports.ApiUrlResolver = ApiUrlResolver;
67
+ //# sourceMappingURL=ApiUrlResolver.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ApiUrlResolver.js","sourceRoot":"","sources":["../../../utils/workspace/ApiUrlResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,yCAA+C;AAC/C,2DAAgD;AAChD,sCAAmC;AACnC,kFAA+E;AAG/E,IAAa,cAAc,sBAA3B,MAAa,cAAc;IAMvB,YAAmE,qBAA2C;QAA3C,0BAAqB,GAArB,qBAAqB,CAAsB;QAFtG,kBAAa,GAAW,EAAE,CAAC;IAE8E,CAAC;IAE3G,KAAK,CAAC,kBAAkB,CAAC,aAAqB;QACjD,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,IAAI,aAAa,EAAE,CAAC;IAClE,CAAC;IAEM,KAAK,CAAC,mBAAmB;QAC5B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACnD,OAAO,GAAG,gBAAc,CAAC,iBAAiB,IAAI,SAAS,gBAAgB,CAAC;IAC5E,CAAC;IAEM,mBAAmB;QACtB,OAAO,gBAAc,CAAC,kBAAkB,CAAC;IAC7C,CAAC;IAEO,KAAK,CAAC,mBAAmB;QAC7B,eAAM,CAAC,KAAK,CAAC,sCAAsC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QACzE,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YACjC,eAAM,CAAC,KAAK,CAAC,sFAAsF,CAAC,CAAC;YACrG,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,gBAAc,CAAC,kBAAkB,CAAC,CAAC;YACnG,IAAI,kBAAkB,CAAC,MAAM,KAAK,GAAG,EAAE;gBACnC,MAAM,IAAI,KAAK,CAAC,wDAAwD,kBAAkB,CAAC,MAAM,UAAU,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC;aACzI;YACD,IAAI,CAAC,aAAa,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACrD,eAAM,CAAC,KAAK,CAAC,uDAAuD,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;SAC7F;QACD,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;CACJ,CAAA;AAjC2B,gCAAiB,GAAW,yBAAyB,CAAC;AACtD,iCAAkB,GAAW,0BAA0B,CAAC;AAFvE,cAAc;IAD1B,sBAAU,EAAE;IAOI,WAAA,kBAAM,CAAC,yBAAO,CAAC,oBAAoB,CAAC,CAAA;qCAAyC,2CAAoB;GANrG,cAAc,CAkC1B;AAlCY,wCAAc"}
@@ -23,33 +23,33 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
23
23
  var __importDefault = (this && this.__importDefault) || function (mod) {
24
24
  return (mod && mod.__esModule) ? mod : { "default": mod };
25
25
  };
26
- var TestWorkspaceUtil_1;
27
26
  Object.defineProperty(exports, "__esModule", { value: true });
28
27
  exports.TestWorkspaceUtil = void 0;
28
+ require("reflect-metadata");
29
29
  const TestConstants_1 = require("../../TestConstants");
30
30
  const inversify_1 = require("inversify");
31
31
  const DriverHelper_1 = require("../DriverHelper");
32
- require("reflect-metadata");
33
32
  const WorkspaceStatus_1 = require("./WorkspaceStatus");
34
33
  const selenium_webdriver_1 = require("selenium-webdriver");
35
34
  const CheApiRequestHandler_1 = require("../requestHandlers/CheApiRequestHandler");
36
35
  const inversify_types_1 = require("../../inversify.types");
37
36
  const Logger_1 = require("../Logger");
38
37
  const axios_1 = __importDefault(require("axios"));
39
- let TestWorkspaceUtil = TestWorkspaceUtil_1 = class TestWorkspaceUtil {
40
- constructor(driverHelper, processRequestHandler) {
38
+ const ApiUrlResolver_1 = require("./ApiUrlResolver");
39
+ let TestWorkspaceUtil = class TestWorkspaceUtil {
40
+ constructor(driverHelper, processRequestHandler, apiUrlResolver) {
41
41
  this.driverHelper = driverHelper;
42
42
  this.processRequestHandler = processRequestHandler;
43
+ this.apiUrlResolver = apiUrlResolver;
43
44
  this.attempts = TestConstants_1.TestConstants.TS_SELENIUM_WORKSPACE_STATUS_ATTEMPTS;
44
45
  this.polling = TestConstants_1.TestConstants.TS_SELENIUM_WORKSPACE_STATUS_POLLING;
45
46
  }
46
- async waitWorkspaceStatus(namespace, workspaceName, expectedWorkspaceStatus) {
47
+ async waitWorkspaceStatus(workspaceName, expectedWorkspaceStatus) {
47
48
  Logger_1.Logger.debug('TestWorkspaceUtil.waitWorkspaceStatus');
48
- const workspaceStatusApiUrl = `${TestWorkspaceUtil_1.WORKSPACE_API_URL}/${namespace}-che/devworkspaces/${workspaceName}`;
49
49
  let workspaceStatus = '';
50
50
  let expectedStatus = false;
51
51
  for (let i = 0; i < this.attempts; i++) {
52
- const response = await this.processRequestHandler.get(workspaceStatusApiUrl);
52
+ const response = await this.processRequestHandler.get(await this.apiUrlResolver.getWorkspaceApiUrl(workspaceName));
53
53
  if (response.status !== 200) {
54
54
  throw new Error(`Can not get status of a workspace. Code: ${response.status} Data: ${response.data}`);
55
55
  }
@@ -65,9 +65,9 @@ let TestWorkspaceUtil = TestWorkspaceUtil_1 = class TestWorkspaceUtil {
65
65
  throw new selenium_webdriver_1.error.TimeoutError(`The workspace was not stopped in ${waitTime} ms. Currnet status is: ${workspaceStatus}`);
66
66
  }
67
67
  }
68
- async stopWorkspaceByName(namespace, workspaceName) {
68
+ async stopWorkspaceByName(workspaceName) {
69
69
  Logger_1.Logger.debug('TestWorkspaceUtil.stopWorkspaceByName');
70
- const stopWorkspaceApiUrl = `${TestWorkspaceUtil_1.WORKSPACE_API_URL}/${namespace}-che/devworkspaces/${workspaceName}`;
70
+ const stopWorkspaceApiUrl = await this.apiUrlResolver.getWorkspaceApiUrl(workspaceName);
71
71
  let stopWorkspaceResponse;
72
72
  try {
73
73
  stopWorkspaceResponse = await this.processRequestHandler.patch(stopWorkspaceApiUrl, [{ 'op': 'replace', 'path': '/spec/started', 'value': false }]);
@@ -79,13 +79,13 @@ let TestWorkspaceUtil = TestWorkspaceUtil_1 = class TestWorkspaceUtil {
79
79
  if (stopWorkspaceResponse.status !== 200) {
80
80
  throw new Error(`Cannot stop workspace. Code: ${stopWorkspaceResponse.status} Data: ${stopWorkspaceResponse.data}`);
81
81
  }
82
- await this.waitWorkspaceStatus(namespace, workspaceName, WorkspaceStatus_1.WorkspaceStatus.STOPPED);
82
+ await this.waitWorkspaceStatus(workspaceName, WorkspaceStatus_1.WorkspaceStatus.STOPPED);
83
83
  }
84
84
  // delete a worksapce without stopping phase (similar with force deleting)
85
- async deleteWorkspaceByName(namespace, workspaceName) {
85
+ async deleteWorkspaceByName(workspaceName) {
86
86
  var _a, _b;
87
- Logger_1.Logger.debug('TestWorkspaceUtil.deleteWorkspaceByName');
88
- const deleteWorkspaceApiUrl = `${TestWorkspaceUtil_1.WORKSPACE_API_URL}/${namespace}-che/devworkspaces/${workspaceName}`;
87
+ Logger_1.Logger.debug(`TestWorkspaceUtil.deleteWorkspaceByName ${workspaceName}`);
88
+ const deleteWorkspaceApiUrl = await this.apiUrlResolver.getWorkspaceApiUrl(workspaceName);
89
89
  let deleteWorkspaceResponse;
90
90
  let deleteWorkspaceStatus = false;
91
91
  try {
@@ -96,11 +96,11 @@ let TestWorkspaceUtil = TestWorkspaceUtil_1 = class TestWorkspaceUtil {
96
96
  Logger_1.Logger.error(`The workspace :${workspaceName} not found`);
97
97
  throw error;
98
98
  }
99
- Logger_1.Logger.error(`Stop workspace call failed. URL used: ${deleteWorkspaceStatus}`);
99
+ Logger_1.Logger.error(`Delete workspace call failed. URL used: ${deleteWorkspaceStatus}`);
100
100
  throw error;
101
101
  }
102
102
  if (deleteWorkspaceResponse.status !== 204) {
103
- throw new Error(`Can not stop workspace. Code: ${deleteWorkspaceResponse.status} Data: ${deleteWorkspaceResponse.data}`);
103
+ throw new Error(`Can not delete workspace. Code: ${deleteWorkspaceResponse.status} Data: ${deleteWorkspaceResponse.data}`);
104
104
  }
105
105
  for (let i = 0; i < this.attempts; i++) {
106
106
  try {
@@ -119,17 +119,46 @@ let TestWorkspaceUtil = TestWorkspaceUtil_1 = class TestWorkspaceUtil {
119
119
  }
120
120
  }
121
121
  // stop workspace before deleting with checking stopping phase
122
- async stopAndDeleteWorkspaceByName(namespace, workspaceName) {
122
+ async stopAndDeleteWorkspaceByName(workspaceName) {
123
123
  Logger_1.Logger.debug('TestWorkspaceUtil.stopAndDeleteWorkspaceByName');
124
- await this.stopWorkspaceByName(namespace, workspaceName);
125
- await this.deleteWorkspaceByName(namespace, workspaceName);
124
+ await this.stopWorkspaceByName(workspaceName);
125
+ await this.deleteWorkspaceByName(workspaceName);
126
+ }
127
+ // stop all run workspaces in the namespace
128
+ async stopAllRunningWorkspaces(namespace) {
129
+ Logger_1.Logger.debug('TestWorkspaceUtil.stopAllRunProjects');
130
+ let response = await this.processRequestHandler.get(await this.apiUrlResolver.getWorkspacesApiUrl());
131
+ for (let i = 0; i < response.data.items.length; i++) {
132
+ Logger_1.Logger.info('The project is being stopped: ' + response.data.items[i].metadata.name);
133
+ await this.stopWorkspaceByName(response.data.items[i].metadata.name);
134
+ }
135
+ }
136
+ // stop all run workspaces, check statused and remove the workspaces
137
+ async stopAndDeleteAllRunningWorkspaces(namespace) {
138
+ Logger_1.Logger.debug('TestWorkspaceUtil.stopAndDeleteAllRunProjects');
139
+ let response = await this.processRequestHandler.get(await this.apiUrlResolver.getWorkspacesApiUrl());
140
+ await this.stopAllRunningWorkspaces(namespace);
141
+ for (let i = 0; i < response.data.items.length; i++) {
142
+ Logger_1.Logger.info('The project is being deleted: ' + response.data.items[i].metadata.name);
143
+ await this.deleteWorkspaceByName(response.data.items[i].metadata.name);
144
+ }
145
+ }
146
+ // stop all run workspaces without stopping and waiting for of 'Stopped' phase
147
+ // similar with 'force' deleting
148
+ async deleteAllWorkspaces(namespace) {
149
+ Logger_1.Logger.debug('TestWorkspaceUtil.deleteAllRunProjects');
150
+ let response = await this.processRequestHandler.get(await this.apiUrlResolver.getWorkspacesApiUrl());
151
+ for (let i = 0; i < response.data.items.length; i++) {
152
+ Logger_1.Logger.info('The project is being deleted .......: ' + response.data.items[i].metadata.name);
153
+ await this.deleteWorkspaceByName(response.data.items[i].metadata.name);
154
+ }
126
155
  }
127
156
  /**
128
157
  * @deprecated Method deprecated. Works with CHE server only
129
158
  */
130
159
  async waitPluginAdding(namespace, workspaceName, pluginName) {
131
160
  Logger_1.Logger.debug('TestWorkspaceUtil.waitPluginAdding');
132
- const workspaceStatusApiUrl = `${TestWorkspaceUtil_1.WORKSPACE_API_URL}/${namespace}:${workspaceName}`;
161
+ const workspaceStatusApiUrl = `${await this.apiUrlResolver.getWorkspacesApiUrl()}/${namespace}:${workspaceName}`;
133
162
  const attempts = TestConstants_1.TestConstants.TS_SELENIUM_PLUGIN_PRECENCE_ATTEMPTS;
134
163
  const polling = TestConstants_1.TestConstants.TS_SELENIUM_DEFAULT_POLLING;
135
164
  for (let i = 0; i < attempts; i++) {
@@ -154,7 +183,7 @@ let TestWorkspaceUtil = TestWorkspaceUtil_1 = class TestWorkspaceUtil {
154
183
  */
155
184
  async getListOfWorkspaceId() {
156
185
  Logger_1.Logger.debug('TestWorkspaceUtil.getListOfWorkspaceId');
157
- const getAllWorkspacesResponse = await this.processRequestHandler.get(TestWorkspaceUtil_1.WORKSPACE_API_URL);
186
+ const getAllWorkspacesResponse = await this.processRequestHandler.get(await this.apiUrlResolver.getWorkspacesApiUrl());
158
187
  let stringified = JSON.stringify(getAllWorkspacesResponse.data);
159
188
  let arrayOfWorkspaces = JSON.parse(stringified);
160
189
  let wsList = [];
@@ -168,7 +197,7 @@ let TestWorkspaceUtil = TestWorkspaceUtil_1 = class TestWorkspaceUtil {
168
197
  */
169
198
  async getIdOfRunningWorkspace(wsName) {
170
199
  Logger_1.Logger.debug('TestWorkspaceUtil.getIdOfRunningWorkspace');
171
- const getWorkspacesByNameResponse = await this.processRequestHandler.get(`${TestWorkspaceUtil_1.WORKSPACE_API_URL}/:${wsName}`);
200
+ const getWorkspacesByNameResponse = await this.processRequestHandler.get(`${await this.apiUrlResolver.getWorkspacesApiUrl()}/:${wsName}`);
172
201
  return getWorkspacesByNameResponse.data.id;
173
202
  }
174
203
  /**
@@ -177,7 +206,7 @@ let TestWorkspaceUtil = TestWorkspaceUtil_1 = class TestWorkspaceUtil {
177
206
  async getIdOfRunningWorkspaces() {
178
207
  Logger_1.Logger.debug('TestWorkspaceUtil.getIdOfRunningWorkspaces');
179
208
  try {
180
- const getAllWorkspacesResponse = await this.processRequestHandler.get(TestWorkspaceUtil_1.WORKSPACE_API_URL);
209
+ const getAllWorkspacesResponse = await this.processRequestHandler.get(await this.apiUrlResolver.getWorkspacesApiUrl());
181
210
  let stringified = JSON.stringify(getAllWorkspacesResponse.data);
182
211
  let arrayOfWorkspaces = JSON.parse(stringified);
183
212
  let idOfRunningWorkspace = new Array();
@@ -189,7 +218,7 @@ let TestWorkspaceUtil = TestWorkspaceUtil_1 = class TestWorkspaceUtil {
189
218
  return idOfRunningWorkspace;
190
219
  }
191
220
  catch (err) {
192
- console.log(`Getting id of running workspaces failed. URL used: ${TestWorkspaceUtil_1.WORKSPACE_API_URL}`);
221
+ console.log(`Getting id of running workspaces failed. URL used: ${await this.apiUrlResolver.getWorkspacesApiUrl()}`);
193
222
  throw err;
194
223
  }
195
224
  }
@@ -198,7 +227,7 @@ let TestWorkspaceUtil = TestWorkspaceUtil_1 = class TestWorkspaceUtil {
198
227
  */
199
228
  async removeWorkspaceById(id) {
200
229
  Logger_1.Logger.debug('TestWorkspaceUtil.removeWorkspaceById');
201
- const workspaceIdUrl = `${TestWorkspaceUtil_1.WORKSPACE_API_URL}/${id}`;
230
+ const workspaceIdUrl = `${await this.apiUrlResolver.getWorkspacesApiUrl()}/${id}`;
202
231
  try {
203
232
  const deleteWorkspaceResponse = await this.processRequestHandler.delete(workspaceIdUrl);
204
233
  if (deleteWorkspaceResponse.status !== 204) {
@@ -215,7 +244,7 @@ let TestWorkspaceUtil = TestWorkspaceUtil_1 = class TestWorkspaceUtil {
215
244
  */
216
245
  async stopWorkspaceById(id) {
217
246
  Logger_1.Logger.debug('TestWorkspaceUtil.stopWorkspaceById');
218
- const stopWorkspaceApiUrl = `${TestWorkspaceUtil_1.WORKSPACE_API_URL}/${id}`;
247
+ const stopWorkspaceApiUrl = `${await this.apiUrlResolver.getWorkspacesApiUrl()}/${id}`;
219
248
  let stopWorkspaceResponse;
220
249
  try {
221
250
  stopWorkspaceResponse = await this.processRequestHandler.delete(`${stopWorkspaceApiUrl}`);
@@ -281,7 +310,7 @@ let TestWorkspaceUtil = TestWorkspaceUtil_1 = class TestWorkspaceUtil {
281
310
  async createWsFromDevFile(customTemplate) {
282
311
  Logger_1.Logger.debug('TestWorkspaceUtil.createWsFromDevFile');
283
312
  try {
284
- await this.processRequestHandler.post(TestWorkspaceUtil_1.WORKSPACE_API_URL + '/devfile', customTemplate);
313
+ await this.processRequestHandler.post(await this.apiUrlResolver.getWorkspacesApiUrl() + '/devfile', customTemplate);
285
314
  }
286
315
  catch (error) {
287
316
  console.error(error);
@@ -307,7 +336,7 @@ let TestWorkspaceUtil = TestWorkspaceUtil_1 = class TestWorkspaceUtil {
307
336
  async startWorkspace(workspaceId) {
308
337
  Logger_1.Logger.debug('TestWorkspaceUtil.startWorkspace');
309
338
  try {
310
- await this.processRequestHandler.post(`${TestWorkspaceUtil_1.WORKSPACE_API_URL}/${workspaceId}/runtime`);
339
+ await this.processRequestHandler.post(`${await this.apiUrlResolver.getWorkspacesApiUrl()}/${workspaceId}/runtime`);
311
340
  }
312
341
  catch (error) {
313
342
  console.error(error);
@@ -315,13 +344,14 @@ let TestWorkspaceUtil = TestWorkspaceUtil_1 = class TestWorkspaceUtil {
315
344
  }
316
345
  }
317
346
  };
318
- TestWorkspaceUtil.WORKSPACE_API_URL = 'dashboard/api/namespace';
319
- TestWorkspaceUtil = TestWorkspaceUtil_1 = __decorate([
347
+ TestWorkspaceUtil = __decorate([
320
348
  inversify_1.injectable(),
321
349
  __param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
322
350
  __param(1, inversify_1.inject(inversify_types_1.CLASSES.CheApiRequestHandler)),
351
+ __param(2, inversify_1.inject(inversify_types_1.CLASSES.ApiUrlResolver)),
323
352
  __metadata("design:paramtypes", [DriverHelper_1.DriverHelper,
324
- CheApiRequestHandler_1.CheApiRequestHandler])
353
+ CheApiRequestHandler_1.CheApiRequestHandler,
354
+ ApiUrlResolver_1.ApiUrlResolver])
325
355
  ], TestWorkspaceUtil);
326
356
  exports.TestWorkspaceUtil = TestWorkspaceUtil;
327
357
  //# sourceMappingURL=TestWorkspaceUtil.js.map