Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add handling 'two-step-verification' in E2E tests when Bitbucket.org OAuth setup #23223

Merged
merged 5 commits into from
Oct 31, 2024
Merged

Add handling 'two-step-verification' in E2E tests when Bitbucket.org OAuth setup #23223

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b4d901a
Add handling 'two-step-verification' of bitbucket provider
artaleks9 Oct 29, 2024
30342c8
Do formatting
artaleks9 Oct 29, 2024
8368d02
Update method
artaleks9 Oct 29, 2024
d569f89
Fix up
artaleks9 Oct 29, 2024
f2d88aa
Merge changes main branch
artaleks9 Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions tests/e2e/pageobjects/git-providers/OauthPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ export class OauthPage {
private static APPROVE_BUTTON: By;
private static DENY_ACCESS_BUTTON: By;
private static DENY_SAVE_CREDENTIALS_BUTTON: By;
private static ENABLE_TWO_STEP_VERIFICATION_FORM: By;
private static DENY_TWO_STEP_VERIFICATION: By;

constructor(
@inject(CLASSES.DriverHelper)
Expand Down Expand Up @@ -55,6 +57,8 @@ export class OauthPage {
OauthPage.SUBMIT_BUTTON = By.id('login-submit');
OauthPage.APPROVE_BUTTON = By.xpath('//button[@value="approve"]');
OauthPage.DENY_ACCESS_BUTTON = By.xpath('//button[@value="deny"]');
OauthPage.ENABLE_TWO_STEP_VERIFICATION_FORM = By.id('ProductHeading');
OauthPage.DENY_TWO_STEP_VERIFICATION = By.id('mfa-promote-dismiss');
}
break;
case GitProviderType.GITLAB:
Expand Down Expand Up @@ -153,6 +157,24 @@ export class OauthPage {
await this.driverHelper.waitDisappearance(OauthPage.APPROVE_BUTTON);
}

async waitVisibilityTwoStepVerificationForm(): Promise<boolean> {
Logger.debug();

return this.driverHelper.waitVisibilityBoolean(OauthPage.ENABLE_TWO_STEP_VERIFICATION_FORM);
}

async clickOnDenyTwoStepVerification(): Promise<void> {
Logger.debug();

await this.driverHelper.waitAndClick(OauthPage.DENY_TWO_STEP_VERIFICATION);
}

async waitDisappearanceTwoStepVerificationForm(): Promise<void> {
Logger.debug();

await this.driverHelper.waitDisappearance(OauthPage.ENABLE_TWO_STEP_VERIFICATION_FORM);
}

async login(): Promise<void> {
Logger.debug();

Expand All @@ -170,6 +192,13 @@ export class OauthPage {
await this.clickOnNotRememberCredentialsButton();
}
await this.waitClosingLoginPage();

if (FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER === GitProviderType.BITBUCKET_CLOUD_OAUTH2) {
if (await this.waitVisibilityTwoStepVerificationForm()) {
await this.clickOnDenyTwoStepVerification();
await this.waitDisappearanceTwoStepVerificationForm();
}
}
}

async confirmAccess(): Promise<void> {
Expand Down
Loading