@eclipse-che/che-e2e 7.94.0-next-a925b56 → 7.94.0-next-51a833a
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.
|
@@ -60,6 +60,8 @@ let OauthPage = OauthPage_1 = class OauthPage {
|
|
|
60
60
|
OauthPage_1.SUBMIT_BUTTON = selenium_webdriver_1.By.id('login-submit');
|
|
61
61
|
OauthPage_1.APPROVE_BUTTON = selenium_webdriver_1.By.xpath('//button[@value="approve"]');
|
|
62
62
|
OauthPage_1.DENY_ACCESS_BUTTON = selenium_webdriver_1.By.xpath('//button[@value="deny"]');
|
|
63
|
+
OauthPage_1.ENABLE_TWO_STEP_VERIFICATION_FORM = selenium_webdriver_1.By.id('ProductHeading');
|
|
64
|
+
OauthPage_1.DENY_TWO_STEP_VERIFICATION = selenium_webdriver_1.By.id('mfa-promote-dismiss');
|
|
63
65
|
}
|
|
64
66
|
break;
|
|
65
67
|
case FACTORY_TEST_CONSTANTS_1.GitProviderType.GITLAB:
|
|
@@ -135,6 +137,18 @@ let OauthPage = OauthPage_1 = class OauthPage {
|
|
|
135
137
|
Logger_1.Logger.debug();
|
|
136
138
|
await this.driverHelper.waitDisappearance(OauthPage_1.APPROVE_BUTTON);
|
|
137
139
|
}
|
|
140
|
+
async waitVisibilityTwoStepVerificationForm() {
|
|
141
|
+
Logger_1.Logger.debug();
|
|
142
|
+
return this.driverHelper.waitVisibilityBoolean(OauthPage_1.ENABLE_TWO_STEP_VERIFICATION_FORM);
|
|
143
|
+
}
|
|
144
|
+
async clickOnDenyTwoStepVerification() {
|
|
145
|
+
Logger_1.Logger.debug();
|
|
146
|
+
await this.driverHelper.waitAndClick(OauthPage_1.DENY_TWO_STEP_VERIFICATION);
|
|
147
|
+
}
|
|
148
|
+
async waitDisappearanceTwoStepVerificationForm() {
|
|
149
|
+
Logger_1.Logger.debug();
|
|
150
|
+
await this.driverHelper.waitDisappearance(OauthPage_1.ENABLE_TWO_STEP_VERIFICATION_FORM);
|
|
151
|
+
}
|
|
138
152
|
async login() {
|
|
139
153
|
Logger_1.Logger.debug();
|
|
140
154
|
await this.waitLoginPage();
|
|
@@ -149,6 +163,12 @@ let OauthPage = OauthPage_1 = class OauthPage {
|
|
|
149
163
|
await this.clickOnNotRememberCredentialsButton();
|
|
150
164
|
}
|
|
151
165
|
await this.waitClosingLoginPage();
|
|
166
|
+
if (FACTORY_TEST_CONSTANTS_1.FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER === FACTORY_TEST_CONSTANTS_1.GitProviderType.BITBUCKET_CLOUD_OAUTH2) {
|
|
167
|
+
if (await this.waitVisibilityTwoStepVerificationForm()) {
|
|
168
|
+
await this.clickOnDenyTwoStepVerification();
|
|
169
|
+
await this.waitDisappearanceTwoStepVerificationForm();
|
|
170
|
+
}
|
|
171
|
+
}
|
|
152
172
|
}
|
|
153
173
|
async confirmAccess() {
|
|
154
174
|
Logger_1.Logger.debug();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OauthPage.js","sourceRoot":"","sources":["../../../pageobjects/git-providers/OauthPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,yCAA+C;AAC/C,2DAAwC;AACxC,mEAAwD;AACxD,2DAAwD;AACxD,+CAA4C;AAC5C,yEAAsE;AACtE,mFAAiG;AACjG,qEAAkE;AAG3D,IAAM,SAAS,iBAAf,MAAM,SAAS;
|
|
1
|
+
{"version":3,"file":"OauthPage.js","sourceRoot":"","sources":["../../../pageobjects/git-providers/OauthPage.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -24,6 +24,8 @@ export class OauthPage {
|
|
|
24
24
|
private static APPROVE_BUTTON: By;
|
|
25
25
|
private static DENY_ACCESS_BUTTON: By;
|
|
26
26
|
private static DENY_SAVE_CREDENTIALS_BUTTON: By;
|
|
27
|
+
private static ENABLE_TWO_STEP_VERIFICATION_FORM: By;
|
|
28
|
+
private static DENY_TWO_STEP_VERIFICATION: By;
|
|
27
29
|
|
|
28
30
|
constructor(
|
|
29
31
|
@inject(CLASSES.DriverHelper)
|
|
@@ -55,6 +57,8 @@ export class OauthPage {
|
|
|
55
57
|
OauthPage.SUBMIT_BUTTON = By.id('login-submit');
|
|
56
58
|
OauthPage.APPROVE_BUTTON = By.xpath('//button[@value="approve"]');
|
|
57
59
|
OauthPage.DENY_ACCESS_BUTTON = By.xpath('//button[@value="deny"]');
|
|
60
|
+
OauthPage.ENABLE_TWO_STEP_VERIFICATION_FORM = By.id('ProductHeading');
|
|
61
|
+
OauthPage.DENY_TWO_STEP_VERIFICATION = By.id('mfa-promote-dismiss');
|
|
58
62
|
}
|
|
59
63
|
break;
|
|
60
64
|
case GitProviderType.GITLAB:
|
|
@@ -153,6 +157,24 @@ export class OauthPage {
|
|
|
153
157
|
await this.driverHelper.waitDisappearance(OauthPage.APPROVE_BUTTON);
|
|
154
158
|
}
|
|
155
159
|
|
|
160
|
+
async waitVisibilityTwoStepVerificationForm(): Promise<boolean> {
|
|
161
|
+
Logger.debug();
|
|
162
|
+
|
|
163
|
+
return this.driverHelper.waitVisibilityBoolean(OauthPage.ENABLE_TWO_STEP_VERIFICATION_FORM);
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
async clickOnDenyTwoStepVerification(): Promise<void> {
|
|
167
|
+
Logger.debug();
|
|
168
|
+
|
|
169
|
+
await this.driverHelper.waitAndClick(OauthPage.DENY_TWO_STEP_VERIFICATION);
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
async waitDisappearanceTwoStepVerificationForm(): Promise<void> {
|
|
173
|
+
Logger.debug();
|
|
174
|
+
|
|
175
|
+
await this.driverHelper.waitDisappearance(OauthPage.ENABLE_TWO_STEP_VERIFICATION_FORM);
|
|
176
|
+
}
|
|
177
|
+
|
|
156
178
|
async login(): Promise<void> {
|
|
157
179
|
Logger.debug();
|
|
158
180
|
|
|
@@ -170,6 +192,13 @@ export class OauthPage {
|
|
|
170
192
|
await this.clickOnNotRememberCredentialsButton();
|
|
171
193
|
}
|
|
172
194
|
await this.waitClosingLoginPage();
|
|
195
|
+
|
|
196
|
+
if (FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER === GitProviderType.BITBUCKET_CLOUD_OAUTH2) {
|
|
197
|
+
if (await this.waitVisibilityTwoStepVerificationForm()) {
|
|
198
|
+
await this.clickOnDenyTwoStepVerification();
|
|
199
|
+
await this.waitDisappearanceTwoStepVerificationForm();
|
|
200
|
+
}
|
|
201
|
+
}
|
|
173
202
|
}
|
|
174
203
|
|
|
175
204
|
async confirmAccess(): Promise<void> {
|