@eclipse-che/che-e2e 7.74.0-dev-41d1364 → 7.74.0-dev-715064a

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 (159) hide show
  1. package/.eslintrc.js +15 -1
  2. package/CODE_STYLE.md +144 -0
  3. package/configs/inversify.config.ts +26 -5
  4. package/configs/inversify.types.ts +17 -3
  5. package/constants/CHROME_DRIVER_CONSTANTS.ts +1 -13
  6. package/dist/configs/inversify.config.js +22 -1
  7. package/dist/configs/inversify.config.js.map +1 -1
  8. package/dist/configs/inversify.types.js +17 -3
  9. package/dist/configs/inversify.types.js.map +1 -1
  10. package/dist/constants/CHROME_DRIVER_CONSTANTS.js +1 -9
  11. package/dist/constants/CHROME_DRIVER_CONSTANTS.js.map +1 -1
  12. package/dist/driver/ChromeDriver.js +1 -7
  13. package/dist/driver/ChromeDriver.js.map +1 -1
  14. package/dist/index.js +9 -3
  15. package/dist/index.js.map +1 -1
  16. package/dist/pageobjects/dashboard/CreateWorkspace.js +5 -5
  17. package/dist/pageobjects/dashboard/CreateWorkspace.js.map +1 -1
  18. package/dist/pageobjects/dashboard/Dashboard.js +5 -6
  19. package/dist/pageobjects/dashboard/Dashboard.js.map +1 -1
  20. package/dist/pageobjects/dashboard/Workspaces.js +34 -39
  21. package/dist/pageobjects/dashboard/Workspaces.js.map +1 -1
  22. package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js +27 -28
  23. package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js.map +1 -1
  24. package/dist/pageobjects/git-providers/OauthPage.js +2 -2
  25. package/dist/pageobjects/git-providers/OauthPage.js.map +1 -1
  26. package/dist/pageobjects/ide/CheCodeLocatorLoader.js +18 -4
  27. package/dist/pageobjects/ide/CheCodeLocatorLoader.js.map +1 -1
  28. package/dist/pageobjects/login/kubernetes/DexLoginPage.js +11 -11
  29. package/dist/pageobjects/login/kubernetes/DexLoginPage.js.map +1 -1
  30. package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js +2 -2
  31. package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js.map +1 -1
  32. package/dist/pageobjects/login/openshift/OcpLoginPage.js +20 -24
  33. package/dist/pageobjects/login/openshift/OcpLoginPage.js.map +1 -1
  34. package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js +10 -13
  35. package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js.map +1 -1
  36. package/dist/pageobjects/login/openshift/OcpUserLoginPage.js +3 -3
  37. package/dist/pageobjects/login/openshift/OcpUserLoginPage.js.map +1 -1
  38. package/dist/pageobjects/login/openshift/RedHatLoginPage.js +16 -20
  39. package/dist/pageobjects/login/openshift/RedHatLoginPage.js.map +1 -1
  40. package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js +16 -15
  41. package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js.map +1 -1
  42. package/dist/pageobjects/openshift/OcpApplicationPage.js +7 -7
  43. package/dist/pageobjects/openshift/OcpApplicationPage.js.map +1 -1
  44. package/dist/pageobjects/openshift/OcpImportFromGitPage.js +20 -20
  45. package/dist/pageobjects/openshift/OcpImportFromGitPage.js.map +1 -1
  46. package/dist/pageobjects/openshift/OcpMainPage.js +38 -25
  47. package/dist/pageobjects/openshift/OcpMainPage.js.map +1 -1
  48. package/dist/specs/MochaHooks.js +9 -6
  49. package/dist/specs/MochaHooks.js.map +1 -1
  50. package/dist/specs/SmokeTest.spec.js +6 -6
  51. package/dist/specs/SmokeTest.spec.js.map +1 -1
  52. package/dist/specs/api/ContainerOverridesAPI.spec.js +7 -14
  53. package/dist/specs/api/ContainerOverridesAPI.spec.js.map +1 -1
  54. package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js +11 -19
  55. package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js.map +1 -1
  56. package/dist/specs/api/EmptyWorkspaceAPI.spec.js +10 -16
  57. package/dist/specs/api/EmptyWorkspaceAPI.spec.js.map +1 -1
  58. package/dist/specs/api/PodOverridesAPI.spec.js +7 -14
  59. package/dist/specs/api/PodOverridesAPI.spec.js.map +1 -1
  60. package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js +5 -5
  61. package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js.map +1 -1
  62. package/dist/specs/dashboard-samples/Quarkus.spec.js +6 -6
  63. package/dist/specs/dashboard-samples/Quarkus.spec.js.map +1 -1
  64. package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js +11 -11
  65. package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js.map +1 -1
  66. package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js +11 -12
  67. package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js.map +1 -1
  68. package/dist/specs/factory/Factory.spec.js +13 -16
  69. package/dist/specs/factory/Factory.spec.js.map +1 -1
  70. package/dist/specs/factory/NoSetupRepoFactory.spec.js +17 -18
  71. package/dist/specs/factory/NoSetupRepoFactory.spec.js.map +1 -1
  72. package/dist/specs/factory/RefusedOAuthFactory.spec.js +17 -19
  73. package/dist/specs/factory/RefusedOAuthFactory.spec.js.map +1 -1
  74. package/dist/specs/miscellaneous/PredefinedNamespace.spec.js +35 -41
  75. package/dist/specs/miscellaneous/PredefinedNamespace.spec.js.map +1 -1
  76. package/dist/specs/web-terminal/WebTerminalTest.spec.js +23 -0
  77. package/dist/specs/web-terminal/WebTerminalTest.spec.js.map +1 -0
  78. package/dist/tests-library/LoginTests.js +8 -8
  79. package/dist/tests-library/LoginTests.js.map +1 -1
  80. package/dist/tests-library/ProjectAndFileTests.js +2 -2
  81. package/dist/tests-library/ProjectAndFileTests.js.map +1 -1
  82. package/dist/tests-library/WorkspaceHandlingTests.js +8 -8
  83. package/dist/tests-library/WorkspaceHandlingTests.js.map +1 -1
  84. package/dist/utils/BrowserTabsUtil.js +4 -9
  85. package/dist/utils/BrowserTabsUtil.js.map +1 -1
  86. package/dist/utils/CheReporter.js +49 -23
  87. package/dist/utils/CheReporter.js.map +1 -1
  88. package/dist/utils/DevWorkspaceConfigurationHelper.js +27 -17
  89. package/dist/utils/DevWorkspaceConfigurationHelper.js.map +1 -1
  90. package/dist/utils/DevfilesRegistryHelper.js +15 -5
  91. package/dist/utils/DevfilesRegistryHelper.js.map +1 -1
  92. package/dist/utils/DriverHelper.js +9 -2
  93. package/dist/utils/DriverHelper.js.map +1 -1
  94. package/dist/utils/IContextParams.js +12 -0
  95. package/dist/utils/IContextParams.js.map +1 -0
  96. package/dist/utils/IKubernetesCommandLineToolsExecutor.js +3 -0
  97. package/dist/utils/IKubernetesCommandLineToolsExecutor.js.map +1 -0
  98. package/dist/utils/KubernetesCommandLineToolsExecutor.js +133 -98
  99. package/dist/utils/KubernetesCommandLineToolsExecutor.js.map +1 -1
  100. package/dist/utils/ScreenCatcher.js +8 -4
  101. package/dist/utils/ScreenCatcher.js.map +1 -1
  102. package/dist/utils/ShellExecutor.js +20 -9
  103. package/dist/utils/ShellExecutor.js.map +1 -1
  104. package/dist/utils/StringUtil.js +4 -2
  105. package/dist/utils/StringUtil.js.map +1 -1
  106. package/dist/utils/request-handlers/CheApiRequestHandler.js +2 -2
  107. package/dist/utils/request-handlers/CheApiRequestHandler.js.map +1 -1
  108. package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js +2 -2
  109. package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js.map +1 -1
  110. package/dist/utils/workspace/ApiUrlResolver.js +2 -2
  111. package/dist/utils/workspace/ApiUrlResolver.js.map +1 -1
  112. package/dist/utils/workspace/TestWorkspaceUtil.js +4 -4
  113. package/dist/utils/workspace/TestWorkspaceUtil.js.map +1 -1
  114. package/driver/ChromeDriver.ts +0 -7
  115. package/index.ts +2 -0
  116. package/package.json +3 -3
  117. package/pageobjects/dashboard/CreateWorkspace.ts +5 -4
  118. package/pageobjects/dashboard/Dashboard.ts +3 -4
  119. package/pageobjects/dashboard/Workspaces.ts +40 -48
  120. package/pageobjects/dashboard/workspace-details/WorkspaceDetails.ts +23 -26
  121. package/pageobjects/ide/CheCodeLocatorLoader.ts +3 -1
  122. package/pageobjects/login/interfaces/ICheLoginPage.ts +1 -1
  123. package/pageobjects/login/interfaces/IOcpLoginPage.ts +1 -1
  124. package/pageobjects/login/kubernetes/DexLoginPage.ts +9 -9
  125. package/pageobjects/login/openshift/OcpLoginPage.ts +18 -30
  126. package/pageobjects/login/openshift/OcpRedHatLoginPage.ts +6 -11
  127. package/pageobjects/login/openshift/OcpUserLoginPage.ts +1 -1
  128. package/pageobjects/login/openshift/RedHatLoginPage.ts +17 -16
  129. package/pageobjects/login/openshift/RegularUserOcpCheLoginPage.ts +16 -11
  130. package/pageobjects/openshift/OcpApplicationPage.ts +5 -4
  131. package/pageobjects/openshift/OcpImportFromGitPage.ts +18 -20
  132. package/pageobjects/openshift/OcpMainPage.ts +42 -25
  133. package/specs/MochaHooks.ts +3 -5
  134. package/specs/SmokeTest.spec.ts +4 -5
  135. package/specs/api/ContainerOverridesAPI.spec.ts +8 -2
  136. package/specs/api/DevfileAcceptanceTestAPI.spec.ts +9 -7
  137. package/specs/api/EmptyWorkspaceAPI.spec.ts +8 -4
  138. package/specs/api/PodOverridesAPI.spec.ts +8 -3
  139. package/specs/dashboard-samples/EmptyWorkspace.spec.ts +5 -5
  140. package/specs/dashboard-samples/Quarkus.spec.ts +7 -6
  141. package/specs/dashboard-samples/RecommendedExtensions.spec.ts +8 -7
  142. package/specs/devconsole-intergration/DevConsoleIntegration.spec.ts +12 -11
  143. package/specs/factory/Factory.spec.ts +8 -12
  144. package/specs/factory/NoSetupRepoFactory.spec.ts +10 -11
  145. package/specs/factory/RefusedOAuthFactory.spec.ts +8 -10
  146. package/specs/miscellaneous/PredefinedNamespace.spec.ts +40 -44
  147. package/specs/web-terminal/WebTerminalTest.spec.ts +25 -0
  148. package/tests-library/LoginTests.ts +3 -3
  149. package/tests-library/WorkspaceHandlingTests.ts +2 -2
  150. package/utils/BrowserTabsUtil.ts +7 -9
  151. package/utils/CheReporter.ts +26 -20
  152. package/utils/DevWorkspaceConfigurationHelper.ts +9 -24
  153. package/utils/DevfilesRegistryHelper.ts +8 -3
  154. package/utils/DriverHelper.ts +14 -12
  155. package/utils/IContextParams.ts +26 -0
  156. package/utils/IKubernetesCommandLineToolsExecutor.ts +42 -0
  157. package/utils/KubernetesCommandLineToolsExecutor.ts +133 -101
  158. package/utils/ShellExecutor.ts +10 -7
  159. package/utils/StringUtil.ts +6 -1
@@ -120,8 +120,8 @@ let CheApiRequestHandler = class CheApiRequestHandler {
120
120
  }
121
121
  };
122
122
  CheApiRequestHandler = __decorate([
123
- inversify_1.injectable(),
124
- __param(0, inversify_1.inject(inversify_types_1.TYPES.IAuthorizationHeaderHandler)),
123
+ (0, inversify_1.injectable)(),
124
+ __param(0, (0, inversify_1.inject)(inversify_types_1.TYPES.IAuthorizationHeaderHandler)),
125
125
  __metadata("design:paramtypes", [Object])
126
126
  ], CheApiRequestHandler);
127
127
  exports.CheApiRequestHandler = CheApiRequestHandler;
@@ -1 +1 @@
1
- {"version":3,"file":"CheApiRequestHandler.js","sourceRoot":"","sources":["../../../utils/request-handlers/CheApiRequestHandler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CheApiRequestHandler.js","sourceRoot":"","sources":["../../../utils/request-handlers/CheApiRequestHandler.ts"],"names":[],"mappings":"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"}
@@ -47,8 +47,8 @@ let CheMultiuserAuthorizationHeaderHandler = class CheMultiuserAuthorizationHead
47
47
  }
48
48
  };
49
49
  CheMultiuserAuthorizationHeaderHandler = __decorate([
50
- inversify_1.injectable(),
51
- __param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
50
+ (0, inversify_1.injectable)(),
51
+ __param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
52
52
  __metadata("design:paramtypes", [DriverHelper_1.DriverHelper])
53
53
  ], CheMultiuserAuthorizationHeaderHandler);
54
54
  exports.CheMultiuserAuthorizationHeaderHandler = CheMultiuserAuthorizationHeaderHandler;
@@ -1 +1 @@
1
- {"version":3,"file":"CheMultiuserAuthorizationHeaderHandler.js","sourceRoot":"","sources":["../../../../utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAWA,yCAA+C;AAC/C,qDAAkD;AAClD,sEAA2D;AAC3D,yCAAsC;AAEtC,gFAAuF;AAGvF,IAAa,sCAAsC,GAAnD,MAAa,sCAAsC;IAIlD,YAEkB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;QALpC,uBAAkB,GAAW,EAAE,CAAC;QACvB,gBAAW,GAAW,yCAAmB,CAAC,WAAW,KAAK,8BAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,eAAe,CAAC;IAK9H,CAAC;IAEJ,KAAK,CAAC,GAAG;QACR,IAAI;YACH,MAAM,KAAK,GAAqB,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACzG,IAAI,IAAI,CAAC,kBAAkB,KAAK,KAAK,CAAC,KAAK,EAAE;gBAC5C,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC,KAAK,CAAC;aACtC;SACD;QAAC,OAAO,GAAG,EAAE;YACb,IAAI,IAAI,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE;gBACvC,eAAM,CAAC,IAAI,CACV,mHAAmH,CACnH,CAAC;aACF;iBAAM;gBACN,MAAM,IAAI,KAAK,CACd,wHAAwH,CACxH,CAAC;aACF;SACD;QAED,OAAO;YACN,OAAO,EAAE;gBACR,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,kBAAkB,EAAE;aACxD;SACD,CAAC;IACH,CAAC;CACD,CAAA;AAjCY,sCAAsC;IADlD,sBAAU,EAAE;IAMV,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCACE,2BAAY;GANhC,sCAAsC,CAiClD;AAjCY,wFAAsC"}
1
+ {"version":3,"file":"CheMultiuserAuthorizationHeaderHandler.js","sourceRoot":"","sources":["../../../../utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAWA,yCAA+C;AAC/C,qDAAkD;AAClD,sEAA2D;AAC3D,yCAAsC;AAEtC,gFAAuF;AAGhF,IAAM,sCAAsC,GAA5C,MAAM,sCAAsC;IAIlD,YAEkB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;QALpC,uBAAkB,GAAW,EAAE,CAAC;QACvB,gBAAW,GAAW,yCAAmB,CAAC,WAAW,KAAK,8BAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,eAAe,CAAC;IAK9H,CAAC;IAEJ,KAAK,CAAC,GAAG;QACR,IAAI;YACH,MAAM,KAAK,GAAqB,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACzG,IAAI,IAAI,CAAC,kBAAkB,KAAK,KAAK,CAAC,KAAK,EAAE;gBAC5C,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC,KAAK,CAAC;aACtC;SACD;QAAC,OAAO,GAAG,EAAE;YACb,IAAI,IAAI,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE;gBACvC,eAAM,CAAC,IAAI,CACV,mHAAmH,CACnH,CAAC;aACF;iBAAM;gBACN,MAAM,IAAI,KAAK,CACd,wHAAwH,CACxH,CAAC;aACF;SACD;QAED,OAAO;YACN,OAAO,EAAE;gBACR,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,kBAAkB,EAAE;aACxD;SACD,CAAC;IACH,CAAC;CACD,CAAA;AAjCY,sCAAsC;IADlD,IAAA,sBAAU,GAAE;IAMV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCACE,2BAAY;GANhC,sCAAsC,CAiClD;AAjCY,wFAAsC"}
@@ -56,8 +56,8 @@ let ApiUrlResolver = ApiUrlResolver_1 = class ApiUrlResolver {
56
56
  ApiUrlResolver.DASHBOARD_API_URL = 'dashboard/api/namespace';
57
57
  ApiUrlResolver.KUBERNETES_API_URL = 'api/kubernetes/namespace';
58
58
  ApiUrlResolver = ApiUrlResolver_1 = __decorate([
59
- inversify_1.injectable(),
60
- __param(0, inversify_1.inject(inversify_types_1.CLASSES.CheApiRequestHandler)),
59
+ (0, inversify_1.injectable)(),
60
+ __param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.CheApiRequestHandler)),
61
61
  __metadata("design:paramtypes", [CheApiRequestHandler_1.CheApiRequestHandler])
62
62
  ], ApiUrlResolver);
63
63
  exports.ApiUrlResolver = ApiUrlResolver;
@@ -1 +1 @@
1
- {"version":3,"file":"ApiUrlResolver.js","sourceRoot":"","sources":["../../../utils/workspace/ApiUrlResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,yCAA+C;AAC/C,mEAAwD;AACxD,sCAAmC;AACnC,mFAAgF;AAIhF,IAAa,cAAc,sBAA3B,MAAa,cAAc;IAM1B,YAEkB,qBAA2C;QAA3C,0BAAqB,GAArB,qBAAqB,CAAsB;QAJrD,kBAAa,GAAW,EAAE,CAAC;IAKhC,CAAC;IAEJ,KAAK,CAAC,kBAAkB,CAAC,aAAqB;QAC7C,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,IAAI,aAAa,EAAE,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,mBAAmB;QACxB,MAAM,SAAS,GAAW,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3D,OAAO,GAAG,gBAAc,CAAC,iBAAiB,IAAI,SAAS,gBAAgB,CAAC;IACzE,CAAC;IAEO,KAAK,CAAC,mBAAmB;QAChC,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QACtC,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YACpC,eAAM,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;YAClE,MAAM,kBAAkB,GAAkB,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,gBAAc,CAAC,kBAAkB,CAAC,CAAC;YAClH,IAAI,kBAAkB,CAAC,MAAM,KAAK,GAAG,EAAE;gBACtC,MAAM,IAAI,KAAK,CACd,wDAAwD,kBAAkB,CAAC,MAAM,UAAU,kBAAkB,CAAC,IAAI,EAAE,CACpH,CAAC;aACF;YACD,IAAI,CAAC,aAAa,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACrD,eAAM,CAAC,KAAK,CAAC,oBAAoB,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;SACvD;QACD,OAAO,IAAI,CAAC,aAAa,CAAC;IAC3B,CAAC;CACD,CAAA;AAlCwB,gCAAiB,GAAW,yBAAyB,CAAC;AACtD,iCAAkB,GAAW,0BAA0B,CAAC;AAFpE,cAAc;IAD1B,sBAAU,EAAE;IAQV,WAAA,kBAAM,CAAC,yBAAO,CAAC,oBAAoB,CAAC,CAAA;qCACG,2CAAoB;GARjD,cAAc,CAmC1B;AAnCY,wCAAc"}
1
+ {"version":3,"file":"ApiUrlResolver.js","sourceRoot":"","sources":["../../../utils/workspace/ApiUrlResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,yCAA+C;AAC/C,mEAAwD;AACxD,sCAAmC;AACnC,mFAAgF;AAIzE,IAAM,cAAc,sBAApB,MAAM,cAAc;IAM1B,YAEkB,qBAA2C;QAA3C,0BAAqB,GAArB,qBAAqB,CAAsB;QAJrD,kBAAa,GAAW,EAAE,CAAC;IAKhC,CAAC;IAEJ,KAAK,CAAC,kBAAkB,CAAC,aAAqB;QAC7C,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,IAAI,aAAa,EAAE,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,mBAAmB;QACxB,MAAM,SAAS,GAAW,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3D,OAAO,GAAG,gBAAc,CAAC,iBAAiB,IAAI,SAAS,gBAAgB,CAAC;IACzE,CAAC;IAEO,KAAK,CAAC,mBAAmB;QAChC,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QACtC,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YACpC,eAAM,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;YAClE,MAAM,kBAAkB,GAAkB,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,gBAAc,CAAC,kBAAkB,CAAC,CAAC;YAClH,IAAI,kBAAkB,CAAC,MAAM,KAAK,GAAG,EAAE;gBACtC,MAAM,IAAI,KAAK,CACd,wDAAwD,kBAAkB,CAAC,MAAM,UAAU,kBAAkB,CAAC,IAAI,EAAE,CACpH,CAAC;aACF;YACD,IAAI,CAAC,aAAa,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACrD,eAAM,CAAC,KAAK,CAAC,oBAAoB,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;SACvD;QACD,OAAO,IAAI,CAAC,aAAa,CAAC;IAC3B,CAAC;;AAjCuB,gCAAiB,GAAW,yBAAyB,CAAC;AACtD,iCAAkB,GAAW,0BAA0B,CAAC;AAFpE,cAAc;IAD1B,IAAA,sBAAU,GAAE;IAQV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,oBAAoB,CAAC,CAAA;qCACG,2CAAoB;GARjD,cAAc,CAmC1B;AAnCY,wCAAc"}
@@ -163,10 +163,10 @@ let TestWorkspaceUtil = class TestWorkspaceUtil {
163
163
  }
164
164
  };
165
165
  TestWorkspaceUtil = __decorate([
166
- inversify_1.injectable(),
167
- __param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
168
- __param(1, inversify_1.inject(inversify_types_1.CLASSES.CheApiRequestHandler)),
169
- __param(2, inversify_1.inject(inversify_types_1.CLASSES.ApiUrlResolver)),
166
+ (0, inversify_1.injectable)(),
167
+ __param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
168
+ __param(1, (0, inversify_1.inject)(inversify_types_1.CLASSES.CheApiRequestHandler)),
169
+ __param(2, (0, inversify_1.inject)(inversify_types_1.CLASSES.ApiUrlResolver)),
170
170
  __metadata("design:paramtypes", [DriverHelper_1.DriverHelper,
171
171
  CheApiRequestHandler_1.CheApiRequestHandler,
172
172
  ApiUrlResolver_1.ApiUrlResolver])
@@ -1 +1 @@
1
- {"version":3,"file":"TestWorkspaceUtil.js","sourceRoot":"","sources":["../../../utils/workspace/TestWorkspaceUtil.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,yCAA+C;AAC/C,kDAA+C;AAC/C,uDAAoD;AACpD,2DAA2C;AAC3C,mFAAgF;AAChF,mEAAwD;AACxD,sCAAmC;AACnC,kDAA6C;AAE7C,qDAAkD;AAClD,yEAAsE;AAGtE,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAI7B,YAEkB,YAA0B,EAE1B,qBAA2C,EAE3C,cAA8B;QAJ9B,iBAAY,GAAZ,YAAY,CAAc;QAE1B,0BAAqB,GAArB,qBAAqB,CAAsB;QAE3C,mBAAc,GAAd,cAAc,CAAgB;QATvC,YAAO,GAAW,qCAAiB,CAAC,2BAA2B,CAAC;QAChE,aAAQ,GAAW,qCAAiB,CAAC,mCAAmC,GAAG,IAAI,CAAC,OAAO,CAAC;IAS9F,CAAC;IAEJ,KAAK,CAAC,mBAAmB,CAAC,aAAqB,EAAE,uBAAwC;QACxF,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,IAAI,eAAe,GAAW,EAAE,CAAC;QACjC,IAAI,cAAc,GAAY,KAAK,CAAC;QACpC,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE;YAC/C,MAAM,QAAQ,GAAkB,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,CACnE,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAC3D,CAAC;YAEF,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;gBAC5B,MAAM,IAAI,KAAK,CAAC,4CAA4C,QAAQ,CAAC,MAAM,UAAU,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;aACtG;YAED,eAAe,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;YAEnD,IAAI,eAAe,KAAK,uBAAuB,EAAE;gBAChD,cAAc,GAAG,IAAI,CAAC;gBACtB,MAAM;aACN;YAED,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC3C;QAED,IAAI,CAAC,cAAc,EAAE;YACpB,MAAM,QAAQ,GAAW,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC;YACtD,MAAM,IAAI,0BAAK,CAAC,YAAY,CAAC,oCAAoC,QAAQ,2BAA2B,eAAe,EAAE,CAAC,CAAC;SACvH;IACF,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,aAAqB;QAC9C,eAAM,CAAC,KAAK,CAAC,GAAG,aAAa,EAAE,CAAC,CAAC;QAEjC,MAAM,mBAAmB,GAAW,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;QAChG,IAAI,qBAAoC,CAAC;QAEzC,IAAI;YACH,qBAAqB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,mBAAmB,EAAE;gBACnF;oBACC,EAAE,EAAE,SAAS;oBACb,IAAI,EAAE,eAAe;oBACrB,KAAK,EAAE,KAAK;iBACZ;aACD,CAAC,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACb,eAAM,CAAC,KAAK,CAAC,yCAAyC,mBAAmB,EAAE,CAAC,CAAC;YAC7E,MAAM,GAAG,CAAC;SACV;QAED,IAAI,qBAAqB,CAAC,MAAM,KAAK,GAAG,EAAE;YACzC,MAAM,IAAI,KAAK,CAAC,gCAAgC,qBAAqB,CAAC,MAAM,UAAU,qBAAqB,CAAC,IAAI,EAAE,CAAC,CAAC;SACpH;QAED,MAAM,IAAI,CAAC,mBAAmB,CAAC,aAAa,EAAE,iCAAe,CAAC,OAAO,CAAC,CAAC;QACvE,eAAM,CAAC,KAAK,CAAC,GAAG,aAAa,uBAAuB,CAAC,CAAC;IACvD,CAAC;IAED,0EAA0E;IAC1E,KAAK,CAAC,qBAAqB,CAAC,aAAqB;;QAChD,eAAM,CAAC,KAAK,CAAC,GAAG,aAAa,EAAE,CAAC,CAAC;QAEjC,MAAM,qBAAqB,GAAW,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;QAClG,IAAI,uBAAsC,CAAC;QAC3C,IAAI,qBAAqB,GAAY,KAAK,CAAC;QAC3C,IAAI;YACH,uBAAuB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;SACzF;QAAC,OAAO,KAAK,EAAE;YACf,IAAI,eAAK,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,OAAA,KAAK,CAAC,QAAQ,0CAAE,MAAM,MAAK,GAAG,EAAE;gBAChE,eAAM,CAAC,KAAK,CAAC,kBAAkB,aAAa,YAAY,CAAC,CAAC;gBAC1D,MAAM,KAAK,CAAC;aACZ;YACD,eAAM,CAAC,KAAK,CAAC,2CAA2C,qBAAqB,EAAE,CAAC,CAAC;YACjF,MAAM,KAAK,CAAC;SACZ;QAED,IAAI,uBAAuB,CAAC,MAAM,KAAK,GAAG,EAAE;YAC3C,MAAM,IAAI,KAAK,CAAC,mCAAmC,uBAAuB,CAAC,MAAM,UAAU,uBAAuB,CAAC,IAAI,EAAE,CAAC,CAAC;SAC3H;QAED,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE;YAC/C,IAAI;gBACH,uBAAuB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;aACtF;YAAC,OAAO,KAAK,EAAE;gBACf,IAAI,eAAK,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,OAAA,KAAK,CAAC,QAAQ,0CAAE,MAAM,MAAK,GAAG,EAAE;oBAChE,qBAAqB,GAAG,IAAI,CAAC;oBAC7B,eAAM,CAAC,KAAK,CAAC,GAAG,aAAa,uBAAuB,CAAC,CAAC;oBACtD,MAAM;iBACN;aACD;SACD;QAED,IAAI,CAAC,qBAAqB,EAAE;YAC3B,MAAM,QAAQ,GAAW,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC;YACtD,MAAM,IAAI,0BAAK,CAAC,YAAY,CAAC,oCAAoC,QAAQ,MAAM,CAAC,CAAC;SACjF;IACF,CAAC;IAED,8DAA8D;IAC9D,KAAK,CAAC,4BAA4B,CAAC,aAAqB;QACvD,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;QAC9C,MAAM,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC;IACjD,CAAC;IAED,2CAA2C;IAC3C,KAAK,CAAC,wBAAwB;QAC7B,eAAM,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,QAAQ,GAAkB,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC,CAAC;QACtH,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC5D,eAAM,CAAC,IAAI,CAAC,gCAAgC,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACrF,MAAM,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SACrE;IACF,CAAC;IAED,oEAAoE;IACpE,KAAK,CAAC,iCAAiC;QACtC,eAAM,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,QAAQ,GAAkB,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC,CAAC;QACtH,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACtC,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC5D,eAAM,CAAC,IAAI,CAAC,gCAAgC,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACrF,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SACvE;IACF,CAAC;IAED,8EAA8E;IAC9E,gCAAgC;IAChC,KAAK,CAAC,mBAAmB;QACxB,eAAM,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,QAAQ,GAAkB,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC,CAAC;QAEtH,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC5D,eAAM,CAAC,IAAI,CAAC,wCAAwC,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC7F,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SACvE;IACF,CAAC;CACD,CAAA;AAtJY,iBAAiB;IAD7B,sBAAU,EAAE;IAMV,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;IAE5B,WAAA,kBAAM,CAAC,yBAAO,CAAC,oBAAoB,CAAC,CAAA;IAEpC,WAAA,kBAAM,CAAC,yBAAO,CAAC,cAAc,CAAC,CAAA;qCAHA,2BAAY;QAEH,2CAAoB;QAE3B,+BAAc;GAVpC,iBAAiB,CAsJ7B;AAtJY,8CAAiB"}
1
+ {"version":3,"file":"TestWorkspaceUtil.js","sourceRoot":"","sources":["../../../utils/workspace/TestWorkspaceUtil.ts"],"names":[],"mappings":"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"}
@@ -30,13 +30,6 @@ export class ChromeDriver implements IDriver {
30
30
  return this.driver as ThenableWebDriver;
31
31
  }
32
32
 
33
- async setWindowSize(): Promise<void> {
34
- await (this.driver as ThenableWebDriver)
35
- .manage()
36
- .window()
37
- .setSize(CHROME_DRIVER_CONSTANTS.TS_SELENIUM_RESOLUTION_WIDTH, CHROME_DRIVER_CONSTANTS.TS_SELENIUM_RESOLUTION_HEIGHT);
38
- }
39
-
40
33
  private getDriverOptions(): Options {
41
34
  let options: Options = new Options()
42
35
  .addArguments('--no-sandbox')
package/index.ts CHANGED
@@ -8,6 +8,8 @@ export * from './utils/BrowserTabsUtil';
8
8
  export * from './utils/DevWorkspaceConfigurationHelper';
9
9
  export * from './utils/DevfilesRegistryHelper';
10
10
  export * from './utils/DriverHelper';
11
+ export * from './utils/IContextParams';
12
+ export * from './utils/IKubernetesCommandLineToolsExecutor';
11
13
  export * from './utils/KubernetesCommandLineToolsExecutor';
12
14
  export * from './utils/Logger';
13
15
  export * from './utils/ScreenCatcher';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eclipse-che/che-e2e",
3
- "version": "7.74.0-dev-41d1364",
3
+ "version": "7.74.0-dev-715064a",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
@@ -46,13 +46,13 @@
46
46
  "selenium-webdriver": "4.4.0",
47
47
  "shelljs": "^0.8.5",
48
48
  "ts-node": "^10.9.1",
49
- "typescript": "3.9.9",
49
+ "typescript": "4.9.4",
50
50
  "vscode-extension-tester-locators": "3.1.0",
51
51
  "yaml": "^2.2.2"
52
52
  },
53
53
  "dependencies": {
54
54
  "@eclipse-che/api": "latest",
55
- "inversify": "5.0.1",
55
+ "inversify": "6.0.1",
56
56
  "reflect-metadata": "0.1.13"
57
57
  },
58
58
  "resolutions": {
@@ -18,7 +18,7 @@ import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
18
18
 
19
19
  @injectable()
20
20
  export class CreateWorkspace {
21
- static readonly FACTORY_URL_LOCATOR: By = By.xpath('//input[@id="git-repo-url"]');
21
+ private static readonly FACTORY_URL: By = By.xpath('//input[@id="git-repo-url"]');
22
22
 
23
23
  constructor(
24
24
  @inject(CLASSES.DriverHelper)
@@ -64,11 +64,12 @@ export class CreateWorkspace {
64
64
 
65
65
  async importFromGitUsingUI(factoryUrl: string, timeout: number = TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT): Promise<void> {
66
66
  Logger.debug(`factoryUrl: "${factoryUrl}"`);
67
- await this.driverHelper.waitVisibility(CreateWorkspace.FACTORY_URL_LOCATOR, timeout);
68
- await this.driverHelper.type(CreateWorkspace.FACTORY_URL_LOCATOR, Key.chord(factoryUrl, Key.ENTER), timeout);
67
+
68
+ await this.driverHelper.waitVisibility(CreateWorkspace.FACTORY_URL, timeout);
69
+ await this.driverHelper.type(CreateWorkspace.FACTORY_URL, Key.chord(factoryUrl, Key.ENTER), timeout);
69
70
  }
70
71
 
71
- private async clickOnEditorsDropdownListButton(sampleName: string, timeout: number): Promise<void> {
72
+ async clickOnEditorsDropdownListButton(sampleName: string, timeout: number): Promise<void> {
72
73
  Logger.debug(`sampleName: "${sampleName}, editor ${BASE_TEST_CONSTANTS.TS_SELENIUM_EDITOR}"`);
73
74
 
74
75
  const editorDropdownListLocator: By = this.getEditorsDropdownListLocator(sampleName);
@@ -40,7 +40,6 @@ export class Dashboard {
40
40
  await this.workspaces.waitPage();
41
41
  await this.workspaces.waitWorkspaceListItem(workspaceName);
42
42
  await this.workspaces.waitWorkspaceWithRunningStatus(workspaceName);
43
-
44
43
  await this.workspaces.stopWorkspaceByActionsButton(workspaceName);
45
44
  await this.workspaces.waitWorkspaceWithStoppedStatus(workspaceName);
46
45
  }
@@ -60,13 +59,13 @@ export class Dashboard {
60
59
  Logger.debug(`"${workspaceName}"`);
61
60
 
62
61
  await this.stopWorkspaceByUI(workspaceName);
63
- await this.workspaces.deleteWorkspaceByActionsButton(workspaceName);
64
- await this.workspaces.waitWorkspaceListItemAbsence(workspaceName);
62
+ await this.deleteStoppedWorkspaceByUI(workspaceName);
65
63
  }
66
64
 
67
65
  async openDashboard(): Promise<void> {
68
66
  Logger.debug();
69
- await this.driverHelper.getDriver().navigate().to(BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL);
67
+
68
+ await this.driverHelper.navigateToUrl(BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL);
70
69
  await this.waitPage();
71
70
  }
72
71
 
@@ -22,8 +22,13 @@ export enum WorkspaceStatusUI {
22
22
 
23
23
  @injectable()
24
24
  export class Workspaces {
25
- private static readonly ADD_WORKSPACE_BUTTON_XPATH: string = '//button[text()="Add Workspace"]';
26
- private static readonly WORKSPACE_ITEM_TABLE_NAME_SECTION_XPATH: string = '//td[@data-label="Name"]/span/a';
25
+ private static readonly ADD_WORKSPACE_BUTTON: By = By.xpath('//button[text()="Add Workspace"]');
26
+ private static readonly WORKSPACE_ITEM_TABLE_NAME_SECTION: By = By.xpath('//td[@data-label="Name"]/span/a');
27
+ private static readonly DELETE_WORKSPACE_BUTTON_ENABLED: By = By.xpath(
28
+ '//button[@data-testid="delete-workspace-button" and not(@disabled)]'
29
+ );
30
+ private static readonly DELETE_CONFIRMATION_CHECKBOX: By = By.xpath('//input[@data-testid="confirmation-checkbox"]');
31
+ private static readonly CONFIRMATION_WINDOW: By = By.xpath('//div[@aria-label="Delete workspaces confirmation window"]');
27
32
 
28
33
  constructor(
29
34
  @inject(CLASSES.DriverHelper)
@@ -33,13 +38,13 @@ export class Workspaces {
33
38
  async waitPage(timeout: number = TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT): Promise<void> {
34
39
  Logger.debug();
35
40
 
36
- await this.driverHelper.waitVisibility(By.xpath(Workspaces.ADD_WORKSPACE_BUTTON_XPATH), timeout);
41
+ await this.driverHelper.waitVisibility(Workspaces.ADD_WORKSPACE_BUTTON, timeout);
37
42
  }
38
43
 
39
44
  async clickAddWorkspaceButton(timeout: number = TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT): Promise<void> {
40
45
  Logger.debug();
41
46
 
42
- await this.driverHelper.waitAndClick(By.xpath(Workspaces.ADD_WORKSPACE_BUTTON_XPATH), timeout);
47
+ await this.driverHelper.waitAndClick(Workspaces.ADD_WORKSPACE_BUTTON, timeout);
43
48
  }
44
49
 
45
50
  async clickOpenButton(workspaceName: string, timeout: number = TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT): Promise<void> {
@@ -54,9 +59,7 @@ export class Workspaces {
54
59
  ): Promise<void> {
55
60
  Logger.debug(`"${workspaceName}"`);
56
61
 
57
- const workspaceListItemLocator: By = By.xpath(this.getWorkspaceListItemLocator(workspaceName));
58
-
59
- await this.driverHelper.waitVisibility(workspaceListItemLocator, timeout);
62
+ await this.driverHelper.waitVisibility(this.getWorkspaceListItemLocator(workspaceName), timeout);
60
63
  }
61
64
 
62
65
  async waitWorkspaceWithRunningStatus(
@@ -65,9 +68,7 @@ export class Workspaces {
65
68
  ): Promise<void> {
66
69
  Logger.debug(`"${workspaceName}"`);
67
70
 
68
- const runningStatusLocator: By = this.getWorkspaceStatusLocator(workspaceName, WorkspaceStatusUI.Running);
69
-
70
- await this.driverHelper.waitVisibility(runningStatusLocator, timeout);
71
+ await this.driverHelper.waitVisibility(this.getWorkspaceStatusLocator(workspaceName, WorkspaceStatusUI.Running), timeout);
71
72
  }
72
73
 
73
74
  async waitWorkspaceWithStoppedStatus(
@@ -76,9 +77,7 @@ export class Workspaces {
76
77
  ): Promise<void> {
77
78
  Logger.debug(`"${workspaceName}"`);
78
79
 
79
- const stoppedStatusLocator: By = this.getWorkspaceStatusLocator(workspaceName, WorkspaceStatusUI.Stopped);
80
-
81
- await this.driverHelper.waitVisibility(stoppedStatusLocator, timeout);
80
+ await this.driverHelper.waitVisibility(this.getWorkspaceStatusLocator(workspaceName, WorkspaceStatusUI.Stopped), timeout);
82
81
  }
83
82
 
84
83
  async clickWorkspaceListItem(
@@ -87,9 +86,7 @@ export class Workspaces {
87
86
  ): Promise<void> {
88
87
  Logger.debug(`"${workspaceName}"`);
89
88
 
90
- const workspaceListItemLocator: By = By.xpath(this.getWorkspaceListItemLocator(workspaceName));
91
-
92
- await this.driverHelper.waitAndClick(workspaceListItemLocator, timeout);
89
+ await this.driverHelper.waitAndClick(this.getWorkspaceListItemLocator(workspaceName), timeout);
93
90
  }
94
91
 
95
92
  async clickActionsButton(workspaceName: string): Promise<void> {
@@ -106,6 +103,7 @@ export class Workspaces {
106
103
 
107
104
  async openActionsPopup(workspaceName: string, timeout: number = TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<void> {
108
105
  Logger.debug(`for the '${workspaceName}' list item`);
106
+
109
107
  await this.clickActionsButton(workspaceName);
110
108
  await this.waitActionsPopup(workspaceName, timeout);
111
109
  }
@@ -132,34 +130,28 @@ export class Workspaces {
132
130
  async waitDeleteWorkspaceConfirmationWindow(timeout: number = TIMEOUT_CONSTANTS.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT): Promise<void> {
133
131
  Logger.debug();
134
132
 
135
- const confirmationWindowLocator: By = By.xpath('//div[@aria-label="Delete workspaces confirmation window"]');
136
-
137
- await this.driverHelper.waitVisibility(confirmationWindowLocator, timeout);
133
+ await this.driverHelper.waitVisibility(Workspaces.CONFIRMATION_WINDOW, timeout);
138
134
  }
139
135
 
140
136
  async clickToDeleteConfirmationCheckbox(timeout: number = TIMEOUT_CONSTANTS.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT): Promise<void> {
141
- Logger.debug('Workspaces.clickToDeleteConfirmationCheckbox');
142
-
143
- const deleteConfirmationCheckboxLocator: By = By.xpath('//input[@data-testid="confirmation-checkbox"]');
137
+ Logger.debug();
144
138
 
145
- await this.driverHelper.waitAndClick(deleteConfirmationCheckboxLocator, timeout);
139
+ await this.driverHelper.waitAndClick(Workspaces.DELETE_CONFIRMATION_CHECKBOX, timeout);
146
140
  }
147
141
 
148
142
  async waitAndClickEnabledConfirmationWindowDeleteButton(
149
143
  timeout: number = TIMEOUT_CONSTANTS.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT
150
144
  ): Promise<void> {
151
- Logger.debug('Workspaces.waitEnabledConfirmationWindowDeleteButton');
152
-
153
- const enabledConfirmationWindowDeleteButton: By = By.xpath('//button[@data-testid="delete-workspace-button" and not(@disabled)]');
145
+ Logger.debug();
154
146
 
155
- await this.driverHelper.waitAndClick(enabledConfirmationWindowDeleteButton, timeout);
147
+ await this.driverHelper.waitAndClick(Workspaces.DELETE_WORKSPACE_BUTTON_ENABLED, timeout);
156
148
  }
157
149
 
158
150
  async deleteWorkspaceByActionsButton(
159
151
  workspaceName: string,
160
152
  timeout: number = TIMEOUT_CONSTANTS.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT
161
153
  ): Promise<void> {
162
- Logger.debug('Workspaces.deleteWorkspaceByActionsButton');
154
+ Logger.debug();
163
155
 
164
156
  await this.waitWorkspaceListItem(workspaceName, timeout);
165
157
  await this.openActionsPopup(workspaceName, timeout);
@@ -173,7 +165,7 @@ export class Workspaces {
173
165
  workspaceName: string,
174
166
  timeout: number = TIMEOUT_CONSTANTS.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT
175
167
  ): Promise<void> {
176
- Logger.debug('Workspaces.stopWorkspaceByActionsButton');
168
+ Logger.debug();
177
169
 
178
170
  await this.waitWorkspaceListItem(workspaceName, timeout);
179
171
  await this.openActionsPopup(workspaceName, timeout);
@@ -184,63 +176,63 @@ export class Workspaces {
184
176
  workspaceName: string,
185
177
  timeout: number = TIMEOUT_CONSTANTS.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT
186
178
  ): Promise<void> {
187
- Logger.debug(`Workspaces.waitWorkspaceListItemAbsence "${workspaceName}"`);
179
+ Logger.debug(`"${workspaceName}"`);
188
180
 
189
181
  const polling: number = TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING;
190
182
  const attempts: number = Math.ceil(timeout / polling);
191
183
 
192
- const workspaceListItemLocator: By = By.xpath(this.getWorkspaceListItemLocator(workspaceName));
193
-
194
- await this.driverHelper.waitDisappearance(workspaceListItemLocator, attempts, polling);
184
+ await this.driverHelper.waitDisappearance(this.getWorkspaceListItemLocator(workspaceName), attempts, polling);
195
185
  }
196
186
 
197
187
  async getAllCreatedWorkspacesNames(timeout: number = TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<string[]> {
198
- Logger.debug('Workspaces.getAllCreatedWorkspacesNames');
188
+ Logger.debug();
199
189
 
200
190
  const workspaceNames: string[] = [];
201
191
  try {
202
192
  const workspaceItems: WebElement[] = await this.driverHelper.waitAllPresence(
203
- By.xpath(Workspaces.WORKSPACE_ITEM_TABLE_NAME_SECTION_XPATH),
193
+ Workspaces.WORKSPACE_ITEM_TABLE_NAME_SECTION,
204
194
  timeout
205
195
  );
206
196
  for (const item of workspaceItems) {
207
- Logger.debug(`Workspaces.getAllCreatedWorkspacesNames - try to get ${workspaceItems.indexOf(item)} items name`);
197
+ Logger.debug(`try to get ${workspaceItems.indexOf(item)} items name`);
208
198
  workspaceNames.push(await item.getText());
209
- Logger.debug(`Workspaces.getAllCreatedWorkspacesNames - workspace name is "${workspaceNames[workspaceNames.length - 1]}"`);
199
+ Logger.debug(`workspace name is "${workspaceNames[workspaceNames.length - 1]}"`);
210
200
  }
211
201
  } catch (e) {
212
- Logger.debug(`Workspaces.getAllCreatedWorkspacesNames - ${e}`);
202
+ Logger.debug(`${e}`);
213
203
  }
214
204
 
215
- Logger.debug(`Workspaces.getAllCreatedWorkspacesNames - ${workspaceNames.length} workspaces have been created in DevSpaces`);
205
+ Logger.debug(`${workspaceNames.length} workspaces have been created in DevSpaces`);
216
206
  return workspaceNames;
217
207
  }
218
208
 
219
- private getWorkspaceListItemLocator(workspaceName: string): string {
220
- return `//tr[td/span/a[text()='${workspaceName}']]`;
209
+ private getWorkspaceListItemLocator(workspaceName: string): By {
210
+ return By.xpath(`//tr[td//a[text()='${workspaceName}']]`);
221
211
  }
222
212
 
223
213
  private getWorkspaceStatusLocator(workspaceName: string, workspaceStatus: WorkspaceStatusUI): By {
224
214
  return By.xpath(
225
- `${this.getWorkspaceListItemLocator(
226
- workspaceName
227
- )}//span[@data-testid='workspace-status-indicator']//*[local-name()='svg' and @fill='${workspaceStatus}']`
215
+ `${
216
+ this.getWorkspaceListItemLocator(workspaceName).value
217
+ }//span[@data-testid='workspace-status-indicator']//*[local-name()='svg' and @fill='${workspaceStatus}']`
228
218
  );
229
219
  }
230
220
 
231
221
  private getActionsLocator(workspaceName: string): By {
232
- return By.xpath(`${this.getWorkspaceListItemLocator(workspaceName)}/td/div/button[@aria-label='Actions']`);
222
+ return By.xpath(`${this.getWorkspaceListItemLocator(workspaceName).value}/td/div/button[@aria-label='Actions']`);
233
223
  }
234
224
 
235
225
  private getExpandedActionsLocator(workspaceName: string): By {
236
- return By.xpath(`${this.getWorkspaceListItemLocator(workspaceName)}//button[@aria-label='Actions' and @aria-expanded='true']`);
226
+ return By.xpath(
227
+ `${this.getWorkspaceListItemLocator(workspaceName).value}//button[@aria-label='Actions' and @aria-expanded='true']`
228
+ );
237
229
  }
238
230
 
239
231
  private getActionsPopupButtonLocator(workspaceName: string, buttonText: string): By {
240
- return By.xpath(`${this.getWorkspaceListItemLocator(workspaceName)}//li[@role='menuitem']//button[text()='${buttonText}']`);
232
+ return By.xpath(`${this.getWorkspaceListItemLocator(workspaceName).value}//li//button[text()='${buttonText}']`);
241
233
  }
242
234
 
243
235
  private getOpenButtonLocator(workspaceName: string): By {
244
- return By.xpath(`${this.getWorkspaceListItemLocator(workspaceName)}//td[@data-key=5]//a[text()='Open']`);
236
+ return By.xpath(`${this.getWorkspaceListItemLocator(workspaceName).value}//td[@data-key=5]//a[text()='Open']`);
245
237
  }
246
238
  }
@@ -20,11 +20,11 @@ import { ProjectAndFileTests } from '../../../tests-library/ProjectAndFileTests'
20
20
 
21
21
  @injectable()
22
22
  export class WorkspaceDetails {
23
- private static readonly RUN_BUTTON_CSS: string = '#run-workspace-button[che-button-title="Run"]';
24
- private static readonly OPEN_BUTTON_CSS: string = '#open-in-ide-button[che-button-title="Open"]';
25
- private static readonly SAVE_BUTTON_CSS: string = 'button[name="save-button"]';
26
- private static readonly ENABLED_SAVE_BUTTON_CSS: string = 'button[name="save-button"][aria-disabled="false"]';
27
- private static readonly WORKSPACE_DETAILS_LOADER_CSS: string = 'workspace-details-overview md-progress-linear';
23
+ private static readonly RUN_BUTTON: By = By.css('#run-workspace-button[che-button-title="Run"]');
24
+ private static readonly OPEN_BUTTON: By = By.css('#open-in-ide-button[che-button-title="Open"]');
25
+ private static readonly SAVE_BUTTON: By = By.css('button[name="save-button"]');
26
+ private static readonly ENABLED_SAVE_BUTTON: By = By.css('button[name="save-button"][aria-disabled="false"]');
27
+ private static readonly WORKSPACE_DETAILS_LOADER: By = By.css('workspace-details-overview md-progress-linear');
28
28
 
29
29
  constructor(
30
30
  @inject(CLASSES.DriverHelper)
@@ -41,7 +41,7 @@ export class WorkspaceDetails {
41
41
  ): Promise<void> {
42
42
  Logger.debug();
43
43
 
44
- await this.driverHelper.waitDisappearance(By.css(WorkspaceDetails.WORKSPACE_DETAILS_LOADER_CSS), attempts, polling);
44
+ await this.driverHelper.waitDisappearance(WorkspaceDetails.WORKSPACE_DETAILS_LOADER, attempts, polling);
45
45
  }
46
46
 
47
47
  async saveChanges(): Promise<void> {
@@ -65,7 +65,7 @@ export class WorkspaceDetails {
65
65
  async waitWorkspaceTitle(workspaceName: string, timeout: number = TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<void> {
66
66
  Logger.debug(`title: "${workspaceName}"`);
67
67
 
68
- const workspaceTitleLocator: By = By.css(this.getWorkspaceTitleCssLocator(workspaceName));
68
+ const workspaceTitleLocator: By = this.getWorkspaceTitleLocator(workspaceName);
69
69
 
70
70
  await this.driverHelper.waitVisibility(workspaceTitleLocator, timeout);
71
71
  }
@@ -73,19 +73,19 @@ export class WorkspaceDetails {
73
73
  async waitRunButton(timeout: number = TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<void> {
74
74
  Logger.debug();
75
75
 
76
- await this.driverHelper.waitVisibility(By.css(WorkspaceDetails.RUN_BUTTON_CSS), timeout);
76
+ await this.driverHelper.waitVisibility(WorkspaceDetails.RUN_BUTTON, timeout);
77
77
  }
78
78
 
79
79
  async clickOnRunButton(timeout: number = TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT): Promise<void> {
80
80
  Logger.debug();
81
81
 
82
- await this.driverHelper.waitAndClick(By.css(WorkspaceDetails.RUN_BUTTON_CSS), timeout);
82
+ await this.driverHelper.waitAndClick(WorkspaceDetails.RUN_BUTTON, timeout);
83
83
  }
84
84
 
85
85
  async waitOpenButton(timeout: number = TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<void> {
86
86
  Logger.debug();
87
87
 
88
- await this.driverHelper.waitVisibility(By.css(WorkspaceDetails.OPEN_BUTTON_CSS), timeout);
88
+ await this.driverHelper.waitVisibility(WorkspaceDetails.OPEN_BUTTON, timeout);
89
89
  }
90
90
 
91
91
  async openWorkspace(
@@ -97,7 +97,6 @@ export class WorkspaceDetails {
97
97
 
98
98
  await this.clickOnOpenButton(timeout);
99
99
  await this.testProjectAndFileCheCode.waitWorkspaceReadinessForCheCodeEditor();
100
- // await
101
100
  this.testWorkspaceUtil.waitWorkspaceStatus(namespace, workspaceName, WorkspaceStatus.STARTING);
102
101
  }
103
102
 
@@ -118,7 +117,7 @@ export class WorkspaceDetails {
118
117
  ];
119
118
 
120
119
  for (const tabTitle of workspaceDetailsTabs) {
121
- const workspaceDetailsTabLocator: By = By.xpath(this.getTabXpathLocator(tabTitle));
120
+ const workspaceDetailsTabLocator: By = this.getTabLocator(tabTitle);
122
121
 
123
122
  await this.driverHelper.waitVisibility(workspaceDetailsTabLocator, timeout);
124
123
  }
@@ -131,46 +130,44 @@ export class WorkspaceDetails {
131
130
  await this.waitTabSelected(tabTitle, timeout);
132
131
  }
133
132
 
134
- private getWorkspaceTitleCssLocator(workspaceName: string): string {
135
- return `che-row-toolbar[che-title='${workspaceName}']`;
133
+ private getWorkspaceTitleLocator(workspaceName: string): By {
134
+ return By.css(`che-row-toolbar[che-title='${workspaceName}']`);
136
135
  }
137
136
 
138
- private getTabXpathLocator(tabTitle: string): string {
139
- return `//md-tabs-canvas//md-tab-item//span[text()='${tabTitle}']`;
137
+ private getTabLocator(tabTitle: string): By {
138
+ return By.xpath(`//md-tabs-canvas//md-tab-item//span[text()='${tabTitle}']`);
140
139
  }
141
140
 
142
- private getSelectedTabXpathLocator(tabTitle: string): string {
143
- return `//md-tabs-canvas[@role='tablist']//md-tab-item[@aria-selected='true']//span[text()='${tabTitle}']`;
141
+ private getSelectedTabLocator(tabTitle: string): By {
142
+ return By.xpath(`//md-tabs-canvas[@role='tablist']//md-tab-item[@aria-selected='true']//span[text()='${tabTitle}']`);
144
143
  }
145
144
 
146
145
  private async waitSaveButton(timeout: number = TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<void> {
147
- await this.driverHelper.waitVisibility(By.css(WorkspaceDetails.ENABLED_SAVE_BUTTON_CSS), timeout);
146
+ await this.driverHelper.waitVisibility(WorkspaceDetails.ENABLED_SAVE_BUTTON, timeout);
148
147
  }
149
148
 
150
149
  private async waitSaveButtonDisappearance(
151
150
  attempts: number = TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_ATTEMPTS,
152
151
  polling: number = TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING
153
152
  ): Promise<void> {
154
- await this.driverHelper.waitDisappearance(By.css(WorkspaceDetails.SAVE_BUTTON_CSS), attempts, polling);
153
+ await this.driverHelper.waitDisappearance(WorkspaceDetails.SAVE_BUTTON, attempts, polling);
155
154
  }
156
155
 
157
156
  private async clickOnSaveButton(timeout: number = TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT): Promise<void> {
158
- await this.driverHelper.waitAndClick(By.css(WorkspaceDetails.ENABLED_SAVE_BUTTON_CSS), timeout);
157
+ await this.driverHelper.waitAndClick(WorkspaceDetails.ENABLED_SAVE_BUTTON, timeout);
159
158
  }
160
159
 
161
160
  private async clickOnOpenButton(timeout: number = TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT): Promise<void> {
162
- await this.driverHelper.waitAndClick(By.css(WorkspaceDetails.OPEN_BUTTON_CSS), timeout);
161
+ await this.driverHelper.waitAndClick(WorkspaceDetails.OPEN_BUTTON, timeout);
163
162
  }
164
163
 
165
164
  private async clickOnTab(tabTitle: string, timeout: number = TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT): Promise<void> {
166
- const workspaceDetailsTabLocator: By = By.xpath(this.getTabXpathLocator(tabTitle));
167
-
165
+ const workspaceDetailsTabLocator: By = this.getTabLocator(tabTitle);
168
166
  await this.driverHelper.waitAndClick(workspaceDetailsTabLocator, timeout);
169
167
  }
170
168
 
171
169
  private async waitTabSelected(tabTitle: string, timeout: number = TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<void> {
172
- const selectedTabLocator: By = By.xpath(this.getSelectedTabXpathLocator(tabTitle));
173
-
170
+ const selectedTabLocator: By = this.getSelectedTabLocator(tabTitle);
174
171
  await this.driverHelper.waitVisibility(selectedTabLocator, timeout);
175
172
  }
176
173
  }
@@ -13,6 +13,7 @@ import { LocatorDiff, Locators } from 'monaco-page-objects';
13
13
  import { By } from 'selenium-webdriver';
14
14
  import clone from 'clone-deep';
15
15
  import { MONACO_CONSTANTS } from '../../constants/MONACO_CONSTANTS';
16
+ import { injectable } from 'inversify';
16
17
 
17
18
  /**
18
19
  * this class allows us to change or add some specific locators base on "monaco-page-object" and "vscode-extension-tester-locators".
@@ -20,12 +21,13 @@ import { MONACO_CONSTANTS } from '../../constants/MONACO_CONSTANTS';
20
21
  * To see full locators list check "node_modules/vscode-extension-tester-locators/out/lib".
21
22
  */
22
23
 
24
+ @injectable()
23
25
  export class CheCodeLocatorLoader extends LocatorLoader {
24
26
  readonly webCheCodeLocators: Locators;
25
27
 
26
28
  constructor() {
27
29
  super(
28
- MONACO_CONSTANTS.TS_SELENIUM_MONACO_PAGE_OBJECTS_BASE_VERSION,
30
+ MONACO_CONSTANTS.TS_SELENIUM_MONACO_PAGE_OBJECTS_USE_VERSION,
29
31
  MONACO_CONSTANTS.TS_SELENIUM_MONACO_PAGE_OBJECTS_BASE_VERSION,
30
32
  getLocatorsPath()
31
33
  );
@@ -9,5 +9,5 @@
9
9
  **********************************************************************/
10
10
 
11
11
  export interface ICheLoginPage {
12
- login(): Promise<void>;
12
+ login(user?: string, password?: string): Promise<void>;
13
13
  }
@@ -9,5 +9,5 @@
9
9
  **********************************************************************/
10
10
 
11
11
  export interface IOcpLoginPage {
12
- login(): void;
12
+ login(): Promise<void>;
13
13
  }