@eclipse-che/che-e2e 7.73.0 → 7.74.0-dev-1d09cb7

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 (177) hide show
  1. package/configs/inversify.config.ts +6 -6
  2. package/configs/inversify.types.ts +27 -27
  3. package/configs/mocharc.ts +21 -21
  4. package/constants/APITestConstants.ts +39 -38
  5. package/constants/BaseTestConstants.ts +46 -43
  6. package/constants/ChromeDriverConstants.ts +29 -29
  7. package/constants/FactoryTestConstants.ts +30 -30
  8. package/constants/MonacoConstants.ts +10 -10
  9. package/constants/OAuthConstants.ts +46 -46
  10. package/constants/ReporterConstants.ts +28 -28
  11. package/constants/TimeoutConstants.ts +101 -101
  12. package/dist/configs/inversify.config.js.map +1 -1
  13. package/dist/configs/inversify.types.js.map +1 -1
  14. package/dist/configs/mocharc.js +1 -1
  15. package/dist/configs/mocharc.js.map +1 -1
  16. package/dist/constants/APITestConstants.js +2 -2
  17. package/dist/constants/APITestConstants.js.map +1 -1
  18. package/dist/constants/BaseTestConstants.js +2 -1
  19. package/dist/constants/BaseTestConstants.js.map +1 -1
  20. package/dist/constants/ChromeDriverConstants.js +1 -1
  21. package/dist/constants/ChromeDriverConstants.js.map +1 -1
  22. package/dist/constants/FactoryTestConstants.js +1 -1
  23. package/dist/constants/FactoryTestConstants.js.map +1 -1
  24. package/dist/constants/MonacoConstants.js +1 -1
  25. package/dist/constants/MonacoConstants.js.map +1 -1
  26. package/dist/constants/OAuthConstants.js +1 -1
  27. package/dist/constants/OAuthConstants.js.map +1 -1
  28. package/dist/constants/ReporterConstants.js +1 -1
  29. package/dist/constants/ReporterConstants.js.map +1 -1
  30. package/dist/constants/TimeoutConstants.js.map +1 -1
  31. package/dist/driver/ChromeDriver.js.map +1 -1
  32. package/dist/pageobjects/dashboard/CreateWorkspace.js +8 -8
  33. package/dist/pageobjects/dashboard/CreateWorkspace.js.map +1 -1
  34. package/dist/pageobjects/dashboard/Dashboard.js +11 -11
  35. package/dist/pageobjects/dashboard/Dashboard.js.map +1 -1
  36. package/dist/pageobjects/dashboard/Workspaces.js +14 -14
  37. package/dist/pageobjects/dashboard/Workspaces.js.map +1 -1
  38. package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js +8 -8
  39. package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js.map +1 -1
  40. package/dist/pageobjects/git-providers/OauthPage.js +17 -17
  41. package/dist/pageobjects/git-providers/OauthPage.js.map +1 -1
  42. package/dist/pageobjects/ide/CheCodeLocatorLoader.js +1 -1
  43. package/dist/pageobjects/ide/CheCodeLocatorLoader.js.map +1 -1
  44. package/dist/pageobjects/login/kubernetes/DexLoginPage.js +5 -5
  45. package/dist/pageobjects/login/kubernetes/DexLoginPage.js.map +1 -1
  46. package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js +1 -1
  47. package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js.map +1 -1
  48. package/dist/pageobjects/login/openshift/OcpLoginPage.js +10 -10
  49. package/dist/pageobjects/login/openshift/OcpLoginPage.js.map +1 -1
  50. package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js +2 -2
  51. package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js.map +1 -1
  52. package/dist/pageobjects/login/openshift/OcpUserLoginPage.js +1 -1
  53. package/dist/pageobjects/login/openshift/OcpUserLoginPage.js.map +1 -1
  54. package/dist/pageobjects/login/openshift/RedHatLoginPage.js +6 -6
  55. package/dist/pageobjects/login/openshift/RedHatLoginPage.js.map +1 -1
  56. package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js +2 -2
  57. package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js.map +1 -1
  58. package/dist/pageobjects/openshift/OcpApplicationPage.js +2 -2
  59. package/dist/pageobjects/openshift/OcpApplicationPage.js.map +1 -1
  60. package/dist/pageobjects/openshift/OcpImportFromGitPage.js +5 -5
  61. package/dist/pageobjects/openshift/OcpImportFromGitPage.js.map +1 -1
  62. package/dist/pageobjects/openshift/OcpMainPage.js +11 -11
  63. package/dist/pageobjects/openshift/OcpMainPage.js.map +1 -1
  64. package/dist/specs/MochaHooks.js +1 -1
  65. package/dist/specs/MochaHooks.js.map +1 -1
  66. package/dist/specs/SmokeTest.spec.js +7 -3
  67. package/dist/specs/SmokeTest.spec.js.map +1 -1
  68. package/dist/specs/api/ContainerOverridesAPI.spec.js.map +1 -1
  69. package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js +7 -5
  70. package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js.map +1 -1
  71. package/dist/specs/api/EmptyWorkspaceAPI.spec.js +1 -1
  72. package/dist/specs/api/EmptyWorkspaceAPI.spec.js.map +1 -1
  73. package/dist/specs/api/PodOverridesAPI.spec.js +2 -1
  74. package/dist/specs/api/PodOverridesAPI.spec.js.map +1 -1
  75. package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js +9 -5
  76. package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js.map +1 -1
  77. package/dist/specs/dashboard-samples/Quarkus.spec.js +7 -3
  78. package/dist/specs/dashboard-samples/Quarkus.spec.js.map +1 -1
  79. package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js +6 -2
  80. package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js.map +1 -1
  81. package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js +3 -1
  82. package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js.map +1 -1
  83. package/dist/specs/factory/Factory.spec.js +3 -1
  84. package/dist/specs/factory/Factory.spec.js.map +1 -1
  85. package/dist/specs/factory/NoSetupRepoFactory.spec.js +4 -2
  86. package/dist/specs/factory/NoSetupRepoFactory.spec.js.map +1 -1
  87. package/dist/specs/factory/RefusedOAuthFactory.spec.js +4 -2
  88. package/dist/specs/factory/RefusedOAuthFactory.spec.js.map +1 -1
  89. package/dist/specs/miscellaneous/PredefinedNamespace.spec.js +6 -2
  90. package/dist/specs/miscellaneous/PredefinedNamespace.spec.js.map +1 -1
  91. package/dist/tests-library/LoginTests.js.map +1 -1
  92. package/dist/tests-library/ProjectAndFileTests.js +3 -3
  93. package/dist/tests-library/ProjectAndFileTests.js.map +1 -1
  94. package/dist/tests-library/WorkspaceHandlingTests.js +54 -74
  95. package/dist/tests-library/WorkspaceHandlingTests.js.map +1 -1
  96. package/dist/utils/BrowserTabsUtil.js +10 -10
  97. package/dist/utils/BrowserTabsUtil.js.map +1 -1
  98. package/dist/utils/CheReporter.js.map +1 -1
  99. package/dist/utils/DevWorkspaceConfigurationHelper.js +2 -2
  100. package/dist/utils/DevWorkspaceConfigurationHelper.js.map +1 -1
  101. package/dist/utils/DevfilesRegistryHelper.js +7 -7
  102. package/dist/utils/DevfilesRegistryHelper.js.map +1 -1
  103. package/dist/utils/DriverHelper.js +81 -81
  104. package/dist/utils/DriverHelper.js.map +1 -1
  105. package/dist/utils/KubernetesCommandLineToolsExecutor.js +38 -35
  106. package/dist/utils/KubernetesCommandLineToolsExecutor.js.map +1 -1
  107. package/dist/utils/Logger.js +45 -21
  108. package/dist/utils/Logger.js.map +1 -1
  109. package/dist/utils/ScreenCatcher.js.map +1 -1
  110. package/dist/utils/ShellExecutor.js.map +1 -1
  111. package/dist/utils/StringUtil.js +2 -2
  112. package/dist/utils/StringUtil.js.map +1 -1
  113. package/dist/utils/request-handlers/CheApiRequestHandler.js +13 -11
  114. package/dist/utils/request-handlers/CheApiRequestHandler.js.map +1 -1
  115. package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js +1 -1
  116. package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js.map +1 -1
  117. package/dist/utils/workspace/ApiUrlResolver.js +3 -3
  118. package/dist/utils/workspace/ApiUrlResolver.js.map +1 -1
  119. package/dist/utils/workspace/TestWorkspaceUtil.js +20 -16
  120. package/dist/utils/workspace/TestWorkspaceUtil.js.map +1 -1
  121. package/dist/utils/workspace/WorkspaceStatus.js.map +1 -1
  122. package/driver/ChromeDriver.ts +44 -44
  123. package/driver/IDriver.ts +1 -1
  124. package/package.json +1 -1
  125. package/pageobjects/dashboard/CreateWorkspace.ts +52 -52
  126. package/pageobjects/dashboard/Dashboard.ts +72 -72
  127. package/pageobjects/dashboard/Workspaces.ts +138 -139
  128. package/pageobjects/dashboard/workspace-details/WorkspaceDetails.ts +92 -93
  129. package/pageobjects/git-providers/OauthPage.ts +136 -136
  130. package/pageobjects/ide/CheCodeLocatorLoader.ts +40 -40
  131. package/pageobjects/login/interfaces/ICheLoginPage.ts +1 -1
  132. package/pageobjects/login/interfaces/IOcpLoginPage.ts +1 -1
  133. package/pageobjects/login/kubernetes/DexLoginPage.ts +27 -27
  134. package/pageobjects/login/kubernetes/KubernetesLoginPage.ts +11 -11
  135. package/pageobjects/login/openshift/OcpLoginPage.ts +50 -50
  136. package/pageobjects/login/openshift/OcpRedHatLoginPage.ts +21 -21
  137. package/pageobjects/login/openshift/OcpUserLoginPage.ts +14 -14
  138. package/pageobjects/login/openshift/RedHatLoginPage.ts +44 -41
  139. package/pageobjects/login/openshift/RegularUserOcpCheLoginPage.ts +23 -23
  140. package/pageobjects/openshift/OcpApplicationPage.ts +16 -16
  141. package/pageobjects/openshift/OcpImportFromGitPage.ts +54 -54
  142. package/pageobjects/openshift/OcpMainPage.ts +64 -64
  143. package/resources/pod-overrides-airgap.yaml +37 -0
  144. package/specs/MochaHooks.ts +44 -44
  145. package/specs/SmokeTest.spec.ts +35 -31
  146. package/specs/api/ContainerOverridesAPI.spec.ts +23 -23
  147. package/specs/api/DevfileAcceptanceTestAPI.spec.ts +93 -91
  148. package/specs/api/EmptyWorkspaceAPI.spec.ts +50 -50
  149. package/specs/api/PodOverridesAPI.spec.ts +30 -29
  150. package/specs/dashboard-samples/EmptyWorkspace.spec.ts +29 -25
  151. package/specs/dashboard-samples/Quarkus.spec.ts +31 -27
  152. package/specs/dashboard-samples/RecommendedExtensions.spec.ts +156 -152
  153. package/specs/devconsole-intergration/DevConsoleIntegration.spec.ts +62 -64
  154. package/specs/factory/Factory.spec.ts +149 -147
  155. package/specs/factory/NoSetupRepoFactory.spec.ts +188 -186
  156. package/specs/factory/RefusedOAuthFactory.spec.ts +182 -180
  157. package/specs/miscellaneous/PredefinedNamespace.spec.ts +52 -48
  158. package/tests-library/LoginTests.ts +29 -29
  159. package/tests-library/ProjectAndFileTests.ts +13 -13
  160. package/tests-library/WorkspaceHandlingTests.ts +84 -103
  161. package/utils/BrowserTabsUtil.ts +69 -69
  162. package/utils/CheReporter.ts +4 -6
  163. package/utils/DevWorkspaceConfigurationHelper.ts +58 -58
  164. package/utils/DevfilesRegistryHelper.ts +51 -51
  165. package/utils/DriverHelper.ts +599 -600
  166. package/utils/KubernetesCommandLineToolsExecutor.ts +166 -158
  167. package/utils/Logger.ts +119 -67
  168. package/utils/ScreenCatcher.ts +42 -42
  169. package/utils/ShellExecutor.ts +10 -10
  170. package/utils/StringUtil.ts +29 -29
  171. package/utils/request-handlers/CheApiRequestHandler.ts +84 -82
  172. package/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.ts +18 -18
  173. package/utils/request-handlers/headers/IAuthorizationHeaderHandler.ts +1 -1
  174. package/utils/workspace/ApiUrlResolver.ts +23 -23
  175. package/utils/workspace/ITestWorkspaceUtil.ts +29 -29
  176. package/utils/workspace/TestWorkspaceUtil.ts +120 -116
  177. package/utils/workspace/WorkspaceStatus.ts +3 -3
@@ -8,7 +8,7 @@
8
8
  * SPDX-License-Identifier: EPL-2.0
9
9
  **********************************************************************/
10
10
  import 'reflect-metadata';
11
- import { injectable, inject } from 'inversify';
11
+ import { inject, injectable } from 'inversify';
12
12
  import { DriverHelper } from '../../../utils/DriverHelper';
13
13
  import { CLASSES } from '../../../configs/inversify.types';
14
14
  import { By } from 'selenium-webdriver';
@@ -19,74 +19,74 @@ import { OAuthConstants } from '../../../constants/OAuthConstants';
19
19
  @injectable()
20
20
  export class OcpLoginPage {
21
21
 
22
- private static readonly LOGIN_PAGE_OPENSHIFT_XPATH: string = '//*[contains(text(), \'Welcome\')]';
22
+ private static readonly LOGIN_PAGE_OPENSHIFT_XPATH: string = '//*[contains(text(), \'Welcome\')]';
23
23
 
24
- constructor(
25
- @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
24
+ constructor(
25
+ @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
26
26
 
27
- async waitOpenShiftLoginWelcomePage(): Promise<void> {
28
- Logger.debug('OcpLoginPage.waitOpenShiftLoginWelcomePage');
27
+ async waitOpenShiftLoginWelcomePage(): Promise<void> {
28
+ Logger.debug();
29
29
 
30
- await this.driverHelper.waitVisibility(By.xpath(OcpLoginPage.LOGIN_PAGE_OPENSHIFT_XPATH), TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
31
- }
30
+ await this.driverHelper.waitVisibility(By.xpath(OcpLoginPage.LOGIN_PAGE_OPENSHIFT_XPATH), TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
31
+ }
32
32
 
33
- async clickOnLoginProviderTitle(): Promise<void> {
34
- Logger.debug('OcpLoginPage.clickOnLoginProviderTitle');
33
+ async clickOnLoginProviderTitle(): Promise<void> {
34
+ Logger.debug();
35
35
 
36
- const loginProviderTitleLocator: By = By.xpath(`//a[text()=\'${OAuthConstants.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE}\']`);
37
- await this.driverHelper.waitAndClick(loginProviderTitleLocator, TimeoutConstants.TS_SELENIUM_WAIT_FOR_URL);
38
- }
36
+ const loginProviderTitleLocator: By = By.xpath(`//a[text()=\'${OAuthConstants.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE}\']`);
37
+ await this.driverHelper.waitAndClick(loginProviderTitleLocator, TimeoutConstants.TS_SELENIUM_WAIT_FOR_URL);
38
+ }
39
39
 
40
- async isIdentityProviderLinkVisible(): Promise<boolean> {
41
- Logger.debug('OcpLoginPage.isIdentityProviderLinkVisible');
40
+ async isIdentityProviderLinkVisible(): Promise<boolean> {
41
+ Logger.debug();
42
42
 
43
- const loginWithHtpaswdLocator: By = By.xpath(`//a[text()=\'${OAuthConstants.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE}\']`);
44
- return await this.driverHelper.waitVisibilityBoolean(loginWithHtpaswdLocator, 3, 5000);
45
- }
43
+ const loginWithHtpaswdLocator: By = By.xpath(`//a[text()=\'${OAuthConstants.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE}\']`);
44
+ return await this.driverHelper.waitVisibilityBoolean(loginWithHtpaswdLocator, 3, 5000);
45
+ }
46
46
 
47
- async isAuthorizeOpenShiftIdentityProviderPageVisible(): Promise<boolean> {
48
- Logger.debug('OcpLoginPage.isAuthorizeOpenShiftIdentityProviderPageVisible');
47
+ async isAuthorizeOpenShiftIdentityProviderPageVisible(): Promise<boolean> {
48
+ Logger.debug();
49
49
 
50
- const authorizeOpenshiftIdentityProviderPageLocator: By = By.xpath('//h1[text()=\'Authorize Access\']');
51
- return await this.driverHelper.isVisible(authorizeOpenshiftIdentityProviderPageLocator);
52
- }
50
+ const authorizeOpenshiftIdentityProviderPageLocator: By = By.xpath('//h1[text()=\'Authorize Access\']');
51
+ return await this.driverHelper.isVisible(authorizeOpenshiftIdentityProviderPageLocator);
52
+ }
53
53
 
54
- async waitAuthorizeOpenShiftIdentityProviderPage(): Promise<void> {
55
- Logger.debug('OcpLoginPage.waitAuthorizeOpenShiftIdentityProviderPage');
54
+ async waitAuthorizeOpenShiftIdentityProviderPage(): Promise<void> {
55
+ Logger.debug();
56
56
 
57
- const authorizeOpenshiftIdentityProviderPageLocator: By = By.xpath('//h1[text()=\'Authorize Access\']');
58
- await this.driverHelper.waitVisibility(authorizeOpenshiftIdentityProviderPageLocator, TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
59
- }
57
+ const authorizeOpenshiftIdentityProviderPageLocator: By = By.xpath('//h1[text()=\'Authorize Access\']');
58
+ await this.driverHelper.waitVisibility(authorizeOpenshiftIdentityProviderPageLocator, TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
59
+ }
60
60
 
61
- async clickOnApproveAuthorizeAccessButton(): Promise<void> {
62
- Logger.debug('OcpLoginPage.clickOnApproveAuthorizeAccessOpenshift');
61
+ async clickOnApproveAuthorizeAccessButton(): Promise<void> {
62
+ Logger.debug();
63
63
 
64
- const approveAuthorizeAccessOcpLocator: By = By.css('input[name=\'approve\']');
65
- await this.driverHelper.waitAndClick(approveAuthorizeAccessOcpLocator);
66
- }
64
+ const approveAuthorizeAccessOcpLocator: By = By.css('input[name=\'approve\']');
65
+ await this.driverHelper.waitAndClick(approveAuthorizeAccessOcpLocator);
66
+ }
67
67
 
68
- async enterUserNameOpenShift(userName: string): Promise<void> {
69
- Logger.debug(`OcpLoginPage.enterUserNameOpenShift "${userName}"`);
68
+ async enterUserNameOpenShift(userName: string): Promise<void> {
69
+ Logger.debug(`"${userName}"`);
70
70
 
71
- await this.driverHelper.enterValue(By.id('inputUsername'), userName);
72
- }
71
+ await this.driverHelper.enterValue(By.id('inputUsername'), userName);
72
+ }
73
73
 
74
- async enterPasswordOpenShift(passw: string): Promise<void> {
75
- Logger.debug(`OcpLoginPage.enterPasswordOpenShift"`);
74
+ async enterPasswordOpenShift(passw: string): Promise<void> {
75
+ Logger.debug();
76
76
 
77
- await this.driverHelper.enterValue(By.id('inputPassword'), passw);
78
- }
77
+ await this.driverHelper.enterValue(By.id('inputPassword'), passw);
78
+ }
79
79
 
80
- async clickOnLoginButton(): Promise<void> {
81
- Logger.debug('OcpLoginPage.clickOnLoginButton');
80
+ async clickOnLoginButton(): Promise<void> {
81
+ Logger.debug();
82
82
 
83
- const loginButtonLocator: By = By.css('button[type=submit]');
84
- await this.driverHelper.waitAndClick(loginButtonLocator);
85
- }
83
+ const loginButtonLocator: By = By.css('button[type=submit]');
84
+ await this.driverHelper.waitAndClick(loginButtonLocator);
85
+ }
86
86
 
87
- async waitDisappearanceOpenShiftLoginWelcomePage(): Promise<void> {
88
- Logger.debug('OcpLoginPage.waitDisappearanceOpenShiftLoginWelcomePage');
87
+ async waitDisappearanceOpenShiftLoginWelcomePage(): Promise<void> {
88
+ Logger.debug();
89
89
 
90
- await this.driverHelper.waitDisappearance(By.xpath(OcpLoginPage.LOGIN_PAGE_OPENSHIFT_XPATH));
91
- }
90
+ await this.driverHelper.waitDisappearance(By.xpath(OcpLoginPage.LOGIN_PAGE_OPENSHIFT_XPATH));
91
+ }
92
92
  }
@@ -8,7 +8,7 @@
8
8
  * SPDX-License-Identifier: EPL-2.0
9
9
  **********************************************************************/
10
10
  import 'reflect-metadata';
11
- import { injectable, inject } from 'inversify';
11
+ import { inject, injectable } from 'inversify';
12
12
  import { RedHatLoginPage } from './RedHatLoginPage';
13
13
  import { CLASSES } from '../../../configs/inversify.types';
14
14
  import { By } from 'selenium-webdriver';
@@ -21,29 +21,29 @@ import { Logger } from '../../../utils/Logger';
21
21
  @injectable()
22
22
  export class OcpRedHatLoginPage implements ICheLoginPage {
23
23
 
24
- private readonly OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR: string = `//div[@class='panel-login']`;
25
- private readonly OPEN_SHIFT_LOGIN_LANDING_PAGE_BUTTON_LOCATOR: string = `${this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR}/div[contains(@class, 'panel-content')]/form/button`;
24
+ private readonly OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR: string = `//div[@class='panel-login']`;
25
+ private readonly OPEN_SHIFT_LOGIN_LANDING_PAGE_BUTTON_LOCATOR: string = `${this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR}/div[contains(@class, 'panel-content')]/form/button`;
26
26
 
27
- constructor(
28
- @inject(CLASSES.OcpLoginPage) private readonly ocpLogin: OcpLoginPage,
29
- @inject(CLASSES.RedHatLoginPage) private readonly redHatLogin: RedHatLoginPage,
30
- @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
27
+ constructor(
28
+ @inject(CLASSES.OcpLoginPage) private readonly ocpLogin: OcpLoginPage,
29
+ @inject(CLASSES.RedHatLoginPage) private readonly redHatLogin: RedHatLoginPage,
30
+ @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
31
31
 
32
- async login(): Promise<void> {
33
- Logger.debug('OcpRedHatLoginPage.login');
32
+ async login(): Promise<void> {
33
+ Logger.debug();
34
34
 
35
- Logger.debug('OcpRedHatLoginPage.login wait for LogInWithOpenShift page and click button');
36
- await this.driverHelper.waitPresence(By.xpath(this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR), TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
37
- await this.driverHelper.waitAndClick(By.xpath(this.OPEN_SHIFT_LOGIN_LANDING_PAGE_BUTTON_LOCATOR));
35
+ Logger.debug('wait for LogInWithOpenShift page and click button');
36
+ await this.driverHelper.waitPresence(By.xpath(this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR), TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
37
+ await this.driverHelper.waitAndClick(By.xpath(this.OPEN_SHIFT_LOGIN_LANDING_PAGE_BUTTON_LOCATOR));
38
38
 
39
- await this.ocpLogin.isIdentityProviderLinkVisible();
40
- await this.ocpLogin.clickOnLoginProviderTitle();
39
+ await this.ocpLogin.isIdentityProviderLinkVisible();
40
+ await this.ocpLogin.clickOnLoginProviderTitle();
41
41
 
42
- await this.redHatLogin.waitRedHatLoginWelcomePage();
43
- await this.redHatLogin.enterUserNameRedHat();
44
- await this.redHatLogin.clickNextButton();
45
- await this.redHatLogin.enterPasswordRedHat();
46
- await this.redHatLogin.clickOnLoginButton();
47
- await this.redHatLogin.waitDisappearanceRedHatLoginWelcomePage();
48
- }
42
+ await this.redHatLogin.waitRedHatLoginWelcomePage();
43
+ await this.redHatLogin.enterUserNameRedHat();
44
+ await this.redHatLogin.clickNextButton();
45
+ await this.redHatLogin.enterPasswordRedHat();
46
+ await this.redHatLogin.clickOnLoginButton();
47
+ await this.redHatLogin.waitDisappearanceRedHatLoginWelcomePage();
48
+ }
49
49
  }
@@ -9,7 +9,7 @@
9
9
  **********************************************************************/
10
10
  import 'reflect-metadata';
11
11
  import { IOcpLoginPage } from '../interfaces/IOcpLoginPage';
12
- import { injectable, inject } from 'inversify';
12
+ import { inject, injectable } from 'inversify';
13
13
  import { OcpLoginPage } from './OcpLoginPage';
14
14
  import { CLASSES } from '../../../configs/inversify.types';
15
15
  import { Logger } from '../../../utils/Logger';
@@ -18,21 +18,21 @@ import { OAuthConstants } from '../../../constants/OAuthConstants';
18
18
  @injectable()
19
19
  export class OcpUserLoginPage implements IOcpLoginPage {
20
20
 
21
- constructor(
22
- @inject(CLASSES.OcpLoginPage) private readonly ocpLogin: OcpLoginPage) { }
21
+ constructor(
22
+ @inject(CLASSES.OcpLoginPage) private readonly ocpLogin: OcpLoginPage) { }
23
23
 
24
- async login(): Promise<void> {
25
- Logger.debug('OcpUserLoginPage.login');
24
+ async login(): Promise<void> {
25
+ Logger.debug();
26
26
 
27
- if (OAuthConstants.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE !== '') {
28
- await this.ocpLogin.clickOnLoginProviderTitle();
29
- }
30
-
31
- await this.ocpLogin.waitOpenShiftLoginWelcomePage();
32
- await this.ocpLogin.enterUserNameOpenShift(OAuthConstants.TS_SELENIUM_OCP_USERNAME);
33
- await this.ocpLogin.enterPasswordOpenShift(OAuthConstants.TS_SELENIUM_OCP_PASSWORD);
34
- await this.ocpLogin.clickOnLoginButton();
35
- await this.ocpLogin.waitDisappearanceOpenShiftLoginWelcomePage();
27
+ if (OAuthConstants.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE !== '') {
28
+ await this.ocpLogin.clickOnLoginProviderTitle();
36
29
  }
37
30
 
31
+ await this.ocpLogin.waitOpenShiftLoginWelcomePage();
32
+ await this.ocpLogin.enterUserNameOpenShift(OAuthConstants.TS_SELENIUM_OCP_USERNAME);
33
+ await this.ocpLogin.enterPasswordOpenShift(OAuthConstants.TS_SELENIUM_OCP_PASSWORD);
34
+ await this.ocpLogin.clickOnLoginButton();
35
+ await this.ocpLogin.waitDisappearanceOpenShiftLoginWelcomePage();
36
+ }
37
+
38
38
  }
@@ -8,7 +8,7 @@
8
8
  * SPDX-License-Identifier: EPL-2.0
9
9
  **********************************************************************/
10
10
  import 'reflect-metadata';
11
- import { injectable, inject } from 'inversify';
11
+ import { inject, injectable } from 'inversify';
12
12
  import { By } from 'selenium-webdriver';
13
13
  import { CLASSES } from '../../../configs/inversify.types';
14
14
  import { DriverHelper } from '../../../utils/DriverHelper';
@@ -17,44 +17,47 @@ import { OAuthConstants } from '../../../constants/OAuthConstants';
17
17
 
18
18
  @injectable()
19
19
  export class RedHatLoginPage {
20
- private readonly USERNAME_INPUT_ID: string = 'username-verification';
21
- private readonly PASSWORD_INPUT_ID: string = 'password';
22
- private readonly NEXT_BUTTON_ID: string = 'login-show-step2';
23
- private readonly LOGIN_BUTTON_ID: string = 'rh-password-verification-submit-button';
24
-
25
- constructor(
26
- @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
27
-
28
- async waitRedHatLoginWelcomePage(): Promise<void> {
29
- Logger.debug('RedHatLoginPage.waitRedHatLoginWelcomePage');
30
- await this.driverHelper.waitVisibility(By.id(this.USERNAME_INPUT_ID));
31
- }
32
-
33
- async enterPasswordRedHat(): Promise<void> {
34
- Logger.debug('RedHatLoginPage.enterPasswordRedHat');
35
- const passwordFieldLocator: By = By.id(this.PASSWORD_INPUT_ID);
36
- await this.driverHelper.waitVisibility(passwordFieldLocator, 3000);
37
- await this.driverHelper.enterValue(passwordFieldLocator, OAuthConstants.TS_SELENIUM_OCP_PASSWORD);
38
- }
39
- async clickOnLoginButton(): Promise<void> {
40
- Logger.debug('RedHatLoginPage.clickOnLoginButton');
41
- const loginButtonLocator: By = By.id(this.LOGIN_BUTTON_ID);
42
- await this.driverHelper.waitAndClick(loginButtonLocator);
43
- }
44
- async waitDisappearanceRedHatLoginWelcomePage(): Promise<void> {
45
- Logger.debug('RedHatLoginPage.waitDisappearanceRedHatLoginWelcomePage');
46
- await this.driverHelper.waitDisappearance(By.id(this.LOGIN_BUTTON_ID));
47
- }
48
- async enterUserNameRedHat(): Promise<void> {
49
- Logger.debug('RedHatLoginPage.enterUserNameRedHat');
50
- const usernameFieldLocator: By = By.id(this.USERNAME_INPUT_ID);
51
- await this.driverHelper.waitVisibility(usernameFieldLocator, 20000);
52
- await this.driverHelper.enterValue(usernameFieldLocator, OAuthConstants.TS_SELENIUM_OCP_USERNAME);
53
- }
54
-
55
- async clickNextButton(): Promise<void> {
56
- Logger.debug('RedHatLoginPage.clickNextButton');
57
- const nextButtonLocator: By = By.id(this.NEXT_BUTTON_ID);
58
- await this.driverHelper.waitAndClick(nextButtonLocator);
59
- }
20
+ private readonly USERNAME_INPUT_ID: string = 'username-verification';
21
+ private readonly PASSWORD_INPUT_ID: string = 'password';
22
+ private readonly NEXT_BUTTON_ID: string = 'login-show-step2';
23
+ private readonly LOGIN_BUTTON_ID: string = 'rh-password-verification-submit-button';
24
+
25
+ constructor(
26
+ @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
27
+
28
+ async waitRedHatLoginWelcomePage(): Promise<void> {
29
+ Logger.debug();
30
+ await this.driverHelper.waitVisibility(By.id(this.USERNAME_INPUT_ID));
31
+ }
32
+
33
+ async enterPasswordRedHat(): Promise<void> {
34
+ Logger.debug();
35
+ const passwordFieldLocator: By = By.id(this.PASSWORD_INPUT_ID);
36
+ await this.driverHelper.waitVisibility(passwordFieldLocator, 3000);
37
+ await this.driverHelper.enterValue(passwordFieldLocator, OAuthConstants.TS_SELENIUM_OCP_PASSWORD);
38
+ }
39
+
40
+ async clickOnLoginButton(): Promise<void> {
41
+ Logger.debug();
42
+ const loginButtonLocator: By = By.id(this.LOGIN_BUTTON_ID);
43
+ await this.driverHelper.waitAndClick(loginButtonLocator);
44
+ }
45
+
46
+ async waitDisappearanceRedHatLoginWelcomePage(): Promise<void> {
47
+ Logger.debug();
48
+ await this.driverHelper.waitDisappearance(By.id(this.LOGIN_BUTTON_ID));
49
+ }
50
+
51
+ async enterUserNameRedHat(): Promise<void> {
52
+ Logger.debug();
53
+ const usernameFieldLocator: By = By.id(this.USERNAME_INPUT_ID);
54
+ await this.driverHelper.waitVisibility(usernameFieldLocator, 20000);
55
+ await this.driverHelper.enterValue(usernameFieldLocator, OAuthConstants.TS_SELENIUM_OCP_USERNAME);
56
+ }
57
+
58
+ async clickNextButton(): Promise<void> {
59
+ Logger.debug();
60
+ const nextButtonLocator: By = By.id(this.NEXT_BUTTON_ID);
61
+ await this.driverHelper.waitAndClick(nextButtonLocator);
62
+ }
60
63
  }
@@ -10,7 +10,7 @@
10
10
  import 'reflect-metadata';
11
11
  import { ICheLoginPage } from '../interfaces/ICheLoginPage';
12
12
  import { OcpLoginPage } from './OcpLoginPage';
13
- import { injectable, inject } from 'inversify';
13
+ import { inject, injectable } from 'inversify';
14
14
  import { CLASSES } from '../../../configs/inversify.types';
15
15
  import { Logger } from '../../../utils/Logger';
16
16
  import { TimeoutConstants } from '../../../constants/TimeoutConstants';
@@ -21,33 +21,33 @@ import { OAuthConstants } from '../../../constants/OAuthConstants';
21
21
  @injectable()
22
22
  export class RegularUserOcpCheLoginPage implements ICheLoginPage {
23
23
 
24
- private readonly OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR: string = `//div[@class='panel-login']`;
25
- private readonly OPEN_SHIFT_LOGIN_LANDING_PAGE_BUTTON_LOCATOR: string = `${this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR}/div[contains(@class, 'panel-content')]/form/button`;
24
+ private readonly OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR: string = `//div[@class='panel-login']`;
25
+ private readonly OPEN_SHIFT_LOGIN_LANDING_PAGE_BUTTON_LOCATOR: string = `${this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR}/div[contains(@class, 'panel-content')]/form/button`;
26
26
 
27
- constructor(
28
- @inject(CLASSES.OcpLoginPage) private readonly ocpLogin: OcpLoginPage,
29
- @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
27
+ constructor(
28
+ @inject(CLASSES.OcpLoginPage) private readonly ocpLogin: OcpLoginPage,
29
+ @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
30
30
 
31
- async login(): Promise<void> {
32
- Logger.debug('RegularUserOcpCheLoginPage.login');
31
+ async login(): Promise<void> {
32
+ Logger.debug();
33
33
 
34
- Logger.debug('RegularUserOcpCheLoginPage.login wait for LogInWithOpenShift page and click button');
35
- await this.driverHelper.waitPresence(By.xpath(this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR), TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
36
- await this.driverHelper.waitAndClick(By.xpath(this.OPEN_SHIFT_LOGIN_LANDING_PAGE_BUTTON_LOCATOR));
34
+ Logger.debug('wait for LogInWithOpenShift page and click button');
35
+ await this.driverHelper.waitPresence(By.xpath(this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR), TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
36
+ await this.driverHelper.waitAndClick(By.xpath(this.OPEN_SHIFT_LOGIN_LANDING_PAGE_BUTTON_LOCATOR));
37
37
 
38
- if (await this.ocpLogin.isIdentityProviderLinkVisible()) {
39
- await this.ocpLogin.clickOnLoginProviderTitle();
40
- }
38
+ if (await this.ocpLogin.isIdentityProviderLinkVisible()) {
39
+ await this.ocpLogin.clickOnLoginProviderTitle();
40
+ }
41
41
 
42
- await this.ocpLogin.waitOpenShiftLoginWelcomePage();
43
- await this.ocpLogin.enterUserNameOpenShift(OAuthConstants.TS_SELENIUM_OCP_USERNAME);
44
- await this.ocpLogin.enterPasswordOpenShift(OAuthConstants.TS_SELENIUM_OCP_PASSWORD);
45
- await this.ocpLogin.clickOnLoginButton();
46
- await this.ocpLogin.waitDisappearanceOpenShiftLoginWelcomePage();
42
+ await this.ocpLogin.waitOpenShiftLoginWelcomePage();
43
+ await this.ocpLogin.enterUserNameOpenShift(OAuthConstants.TS_SELENIUM_OCP_USERNAME);
44
+ await this.ocpLogin.enterPasswordOpenShift(OAuthConstants.TS_SELENIUM_OCP_PASSWORD);
45
+ await this.ocpLogin.clickOnLoginButton();
46
+ await this.ocpLogin.waitDisappearanceOpenShiftLoginWelcomePage();
47
47
 
48
- if (await this.ocpLogin.isAuthorizeOpenShiftIdentityProviderPageVisible()) {
49
- await this.ocpLogin.waitAuthorizeOpenShiftIdentityProviderPage();
50
- await this.ocpLogin.clickOnApproveAuthorizeAccessButton();
51
- }
48
+ if (await this.ocpLogin.isAuthorizeOpenShiftIdentityProviderPageVisible()) {
49
+ await this.ocpLogin.waitAuthorizeOpenShiftIdentityProviderPage();
50
+ await this.ocpLogin.clickOnApproveAuthorizeAccessButton();
52
51
  }
52
+ }
53
53
  }
@@ -19,24 +19,24 @@ import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
19
19
  @injectable()
20
20
  export class OcpApplicationPage {
21
21
 
22
- private static readonly APPLICATION_ICON_LOCATOR: By = By.xpath('//*[@data-test-id="base-node-handler"]');
23
- private static readonly EDIT_SOURCE_CODE_ICON_LOCATOR: By = By.xpath('//*[@aria-label="Edit source code"]');
22
+ private static readonly APPLICATION_ICON_LOCATOR: By = By.xpath('//*[@data-test-id="base-node-handler"]');
23
+ private static readonly EDIT_SOURCE_CODE_ICON_LOCATOR: By = By.xpath('//*[@aria-label="Edit source code"]');
24
24
 
25
- constructor(
26
- @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper,
27
- @inject(CLASSES.BrowserTabsUtil) private readonly browserTabsUtil: BrowserTabsUtil) {
28
- }
25
+ constructor(
26
+ @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper,
27
+ @inject(CLASSES.BrowserTabsUtil) private readonly browserTabsUtil: BrowserTabsUtil) {
28
+ }
29
29
 
30
- async waitApplicationIcon(): Promise<void> {
31
- Logger.debug(`${this.constructor.name}.${this.waitApplicationIcon.name}`);
30
+ async waitApplicationIcon(): Promise<void> {
31
+ Logger.debug();
32
32
 
33
- await this.driverHelper.waitPresence(OcpApplicationPage.APPLICATION_ICON_LOCATOR, TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
34
- }
33
+ await this.driverHelper.waitPresence(OcpApplicationPage.APPLICATION_ICON_LOCATOR, TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
34
+ }
35
35
 
36
- async waitAndOpenEditSourceCodeIcon(): Promise<void> {
37
- Logger.debug(`${this.constructor.name}.${this.waitAndOpenEditSourceCodeIcon.name}`);
38
- const parentGUID: string = await this.browserTabsUtil.getCurrentWindowHandle();
39
- await this.driverHelper.waitAndClick(OcpApplicationPage.EDIT_SOURCE_CODE_ICON_LOCATOR);
40
- await this.browserTabsUtil.waitAndSwitchToAnotherWindow(parentGUID, TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
41
- }
36
+ async waitAndOpenEditSourceCodeIcon(): Promise<void> {
37
+ Logger.debug();
38
+ const parentGUID: string = await this.browserTabsUtil.getCurrentWindowHandle();
39
+ await this.driverHelper.waitAndClick(OcpApplicationPage.EDIT_SOURCE_CODE_ICON_LOCATOR);
40
+ await this.browserTabsUtil.waitAndSwitchToAnotherWindow(parentGUID, TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
41
+ }
42
42
  }
@@ -19,69 +19,69 @@ import { e2eContainer } from '../../configs/inversify.config';
19
19
  @injectable()
20
20
  export class OcpImportFromGitPage {
21
21
 
22
- private static readonly GIT_URL_INPUT_LOCATOR: By = By.id('form-input-git-url-field');
23
- private static readonly SHOW_ADVANCED_GIT_OPTIONS_LINK_LOCATOR: By = By.xpath('//*[text()="Show advanced Git options"]//ancestor::button');
24
- private static readonly HIDE_ADVANCED_GIT_OPTIONS_LOCATOR: By = By.xpath('//*[text()="Hide advanced Git options"]');
25
- private static readonly GIT_REFERENCE_INPUT_LOCATOR: By = By.id('form-input-git-ref-field');
26
- private static readonly EDIT_IMPORT_STRATEGY_LINK_LOCATOR: By = By.xpath('//*[text()="Edit Import Strategy"]//ancestor::button');
27
- private static readonly BUILDER_IMAGE_STRATEGY_ITEM_LOCATOR: By = By.xpath('//*[text()="Builder Image"]//parent::div//parent::div');
28
- private static readonly ADD_LABEL_LINK_LOCATOR: By = By.xpath('//button[text()="Labels"]');
29
- private static readonly ADD_LABEL_INPUT_LOCATOR: By = By.id('form-selector-labels-field');
30
- private static readonly SUBMIT_BUTTON_LOCATOR: By = By.xpath('//*[@data-test-id="submit-button"]');
31
-
32
- constructor(
33
- @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) {
34
- }
35
-
36
- async enterGitRepoUrl(gitRepoUrl: string): Promise<void> {
37
- Logger.debug(`${this.constructor.name}.${this.enterGitRepoUrl.name} "${gitRepoUrl}"`);
38
-
39
- await this.driverHelper.enterValue(OcpImportFromGitPage.GIT_URL_INPUT_LOCATOR, gitRepoUrl);
22
+ private static readonly GIT_URL_INPUT_LOCATOR: By = By.id('form-input-git-url-field');
23
+ private static readonly SHOW_ADVANCED_GIT_OPTIONS_LINK_LOCATOR: By = By.xpath('//*[text()="Show advanced Git options"]//ancestor::button');
24
+ private static readonly HIDE_ADVANCED_GIT_OPTIONS_LOCATOR: By = By.xpath('//*[text()="Hide advanced Git options"]');
25
+ private static readonly GIT_REFERENCE_INPUT_LOCATOR: By = By.id('form-input-git-ref-field');
26
+ private static readonly EDIT_IMPORT_STRATEGY_LINK_LOCATOR: By = By.xpath('//*[text()="Edit Import Strategy"]//ancestor::button');
27
+ private static readonly BUILDER_IMAGE_STRATEGY_ITEM_LOCATOR: By = By.xpath('//*[text()="Builder Image"]//parent::div//parent::div');
28
+ private static readonly ADD_LABEL_LINK_LOCATOR: By = By.xpath('//button[text()="Labels"]');
29
+ private static readonly ADD_LABEL_INPUT_LOCATOR: By = By.id('form-selector-labels-field');
30
+ private static readonly SUBMIT_BUTTON_LOCATOR: By = By.xpath('//*[@data-test-id="submit-button"]');
31
+
32
+ constructor(
33
+ @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) {
34
+ }
35
+
36
+ async enterGitRepoUrl(gitRepoUrl: string): Promise<void> {
37
+ Logger.debug();
38
+
39
+ await this.driverHelper.enterValue(OcpImportFromGitPage.GIT_URL_INPUT_LOCATOR, gitRepoUrl);
40
+ }
41
+
42
+ async clickOnAdvancedOptionsButton(): Promise<void> {
43
+ Logger.debug();
44
+
45
+ if (!(await this.driverHelper.isVisible(OcpImportFromGitPage.HIDE_ADVANCED_GIT_OPTIONS_LOCATOR))) {
46
+ await this.driverHelper.waitAndClick(OcpImportFromGitPage.SHOW_ADVANCED_GIT_OPTIONS_LINK_LOCATOR);
40
47
  }
48
+ }
41
49
 
42
- async clickOnAdvancedOptionsButton(): Promise<void> {
43
- Logger.debug(`${this.constructor.name}.${this.clickOnAdvancedOptionsButton.name}`);
50
+ async enterGitReference(gitReference: string): Promise<void> {
51
+ Logger.debug(`"${gitReference}"`);
44
52
 
45
- if (!(await this.driverHelper.isVisible(OcpImportFromGitPage.HIDE_ADVANCED_GIT_OPTIONS_LOCATOR))) {
46
- await this.driverHelper.waitAndClick(OcpImportFromGitPage.SHOW_ADVANCED_GIT_OPTIONS_LINK_LOCATOR);
47
- }
48
- }
49
-
50
- async enterGitReference(gitReference: string): Promise<void> {
51
- Logger.debug(`${this.constructor.name}.${this.enterGitReference.name} "${gitReference}"`);
52
-
53
- await this.driverHelper.enterValue(OcpImportFromGitPage.GIT_REFERENCE_INPUT_LOCATOR, gitReference);
54
- }
53
+ await this.driverHelper.enterValue(OcpImportFromGitPage.GIT_REFERENCE_INPUT_LOCATOR, gitReference);
54
+ }
55
55
 
56
- async selectBuilderImageImportStrategy(): Promise<void> {
57
- Logger.debug(`${this.constructor.name}.${this.selectBuilderImageImportStrategy.name}`);
56
+ async selectBuilderImageImportStrategy(): Promise<void> {
57
+ Logger.debug();
58
58
 
59
- await this.driverHelper.scrollToAndClick(OcpImportFromGitPage.EDIT_IMPORT_STRATEGY_LINK_LOCATOR);
60
- await this.driverHelper.scrollToAndClick(OcpImportFromGitPage.BUILDER_IMAGE_STRATEGY_ITEM_LOCATOR);
61
- }
59
+ await this.driverHelper.scrollToAndClick(OcpImportFromGitPage.EDIT_IMPORT_STRATEGY_LINK_LOCATOR);
60
+ await this.driverHelper.scrollToAndClick(OcpImportFromGitPage.BUILDER_IMAGE_STRATEGY_ITEM_LOCATOR);
61
+ }
62
62
 
63
- async addLabel(label: string): Promise<void> {
64
- Logger.debug(`${this.constructor.name}.${this.addLabel.name} "${label}"`);
63
+ async addLabel(label: string): Promise<void> {
64
+ Logger.debug(`"${label}"`);
65
65
 
66
- await this.driverHelper.scrollToAndClick(OcpImportFromGitPage.ADD_LABEL_LINK_LOCATOR);
67
- await this.driverHelper.scrollToAndEnterValue(OcpImportFromGitPage.ADD_LABEL_INPUT_LOCATOR, label);
68
- }
66
+ await this.driverHelper.scrollToAndClick(OcpImportFromGitPage.ADD_LABEL_LINK_LOCATOR);
67
+ await this.driverHelper.scrollToAndEnterValue(OcpImportFromGitPage.ADD_LABEL_INPUT_LOCATOR, label);
68
+ }
69
69
 
70
- async submitConfiguration(): Promise<OcpApplicationPage> {
71
- Logger.debug(`${this.constructor.name}.${this.submitConfiguration.name}`);
70
+ async submitConfiguration(): Promise<OcpApplicationPage> {
71
+ Logger.debug(`${this.constructor.name}.${this.submitConfiguration.name}`);
72
72
 
73
- await this.driverHelper.waitAndClick(OcpImportFromGitPage.SUBMIT_BUTTON_LOCATOR);
74
- return e2eContainer.get(CLASSES.OcpApplicationPage);
75
- }
73
+ await this.driverHelper.waitAndClick(OcpImportFromGitPage.SUBMIT_BUTTON_LOCATOR);
74
+ return e2eContainer.get(CLASSES.OcpApplicationPage);
75
+ }
76
76
 
77
- async fitAndSubmitConfiguration(gitRepoUrl: string, gitReference: string, label: string): Promise<OcpApplicationPage> {
78
- Logger.debug(`${this.constructor.name}.${this.fitAndSubmitConfiguration.name}`);
77
+ async fitAndSubmitConfiguration(gitRepoUrl: string, gitReference: string, label: string): Promise<OcpApplicationPage> {
78
+ Logger.debug(`${this.constructor.name}.${this.fitAndSubmitConfiguration.name}`);
79
79
 
80
- await this.enterGitRepoUrl(gitRepoUrl);
81
- await this.clickOnAdvancedOptionsButton();
82
- await this.enterGitReference(gitReference);
83
- await this.selectBuilderImageImportStrategy();
84
- await this.addLabel(label);
85
- return await this.submitConfiguration();
86
- }
80
+ await this.enterGitRepoUrl(gitRepoUrl);
81
+ await this.clickOnAdvancedOptionsButton();
82
+ await this.enterGitReference(gitReference);
83
+ await this.selectBuilderImageImportStrategy();
84
+ await this.addLabel(label);
85
+ return await this.submitConfiguration();
86
+ }
87
87
  }