Skip to content

change microsoft to google social login (tests) #513

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

Merged
aehnh merged 8 commits into from
Feb 11, 2025
Merged

change microsoft to google social login (tests) #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e661f29
change microsoft to google social login (tests)
Feb 11, 2025
198e2c5
prettier
Feb 11, 2025
f06d2bd
update workflow env vars
Feb 11, 2025
22c4948
clean up microsoft social login related code/data
Feb 11, 2025
2b6f487
fix workflow file
Feb 11, 2025
05f345a
add workflow links to cloudwatch log
Feb 11, 2025
7b3dacc
increase total test timeout for social tests
Feb 11, 2025
400453c
prettier
Feb 11, 2025
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
11 changes: 5 additions & 6 deletions .github/workflows/deploy-playground-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,9 @@ jobs:
env:
PLAYWRIGHT_NUM_CORES: 4
PLAYWRIGHT_JWT_TOKEN: ${{ secrets.PLAYWRIGHT_JWT_TOKEN }}
PLAYWRIGHT_MICROSOFT_EMAIL: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL }}
PLAYWRIGHT_MICROSOFT_EMAIL_LINKED: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL_LINKED }}
PLAYWRIGHT_MICROSOFT_EMAIL_UNLINKED: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL_UNLINKED }}
PLAYWRIGHT_MICROSOFT_PASSWORD: ${{ secrets.PLAYWRIGHT_MICROSOFT_PASSWORD }}
PLAYWRIGHT_GOOGLE_EMAIL: ${{ secrets.PLAYWRIGHT_GOOGLE_EMAIL }}
PLAYWRIGHT_GOOGLE_PASSWORD: ${{ secrets.PLAYWRIGHT_GOOGLE_PASSWORD }}
PLAYWRIGHT_GOOGLE_TOTP_SECRET: ${{ secrets.PLAYWRIGHT_GOOGLE_TOTP_SECRET }}
GITHUB_RUN_ID: ${{ github.run_id }}
SLACK_BOT_USER_OAUTH_TOKEN: ${{ secrets.SLACK_BOT_USER_OAUTH_TOKEN }}
GITHUB_BRANCH_NAME: ${{ github.ref_name }}
Expand All @@ -211,7 +210,7 @@ jobs:
TIME=$(xmllint --xpath 'string(/testsuites/@time)' test-results/results.xml)
PASSED=$((TESTS - FAILURES - ERRORS - SKIPPED))
FAILED=$((FAILURES + ERRORS))
SUMMARY="[Test Result] application=complete platform=react run_type=commitly execution_time=$TIME passed=$PASSED failed=$FAILED"
SUMMARY="[Test Result] application=complete platform=react run_type=commitly execution_time=$TIME passed=$PASSED failed=$FAILED link=https://github.com/corbado/javascript/actions/runs/${GITHUB_RUN_ID}"
TIMESTAMP=$(date +%s000)
LOG_EVENT_JSON="[{\"timestamp\":$TIMESTAMP,\"message\":\"$SUMMARY\"}]"
aws logs put-log-events --log-group-name "test-results-board" --log-stream-name "$LOG_STREAM_NAME" --log-events "$LOG_EVENT_JSON"
Expand Down Expand Up @@ -257,7 +256,7 @@ jobs:
TIME=$(xmllint --xpath 'string(/testsuites/@time)' test-results/results.xml)
PASSED=$((TESTS - FAILURES - ERRORS - SKIPPED))
FAILED=$((FAILURES + ERRORS))
SUMMARY="[Test Result] application=connect platform=react run_type=commitly execution_time=$TIME passed=$PASSED failed=$FAILED"
SUMMARY="[Test Result] application=connect platform=react run_type=commitly execution_time=$TIME passed=$PASSED failed=$FAILED link=https://github.com/corbado/javascript/actions/runs/${GITHUB_RUN_ID}"
TIMESTAMP=$(date +%s000)
LOG_EVENT_JSON="[{\"timestamp\":$TIMESTAMP,\"message\":\"$SUMMARY\"}]"
aws logs put-log-events --log-group-name "test-results-board" --log-stream-name "$LOG_STREAM_NAME" --log-events "$LOG_EVENT_JSON"
Expand Down
29 changes: 13 additions & 16 deletions .github/workflows/test-all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,9 @@ jobs:
env:
PLAYWRIGHT_NUM_CORES: 4
PLAYWRIGHT_JWT_TOKEN: ${{ secrets.PLAYWRIGHT_JWT_TOKEN }}
PLAYWRIGHT_MICROSOFT_EMAIL: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL }}
PLAYWRIGHT_MICROSOFT_EMAIL_LINKED: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL_LINKED }}
PLAYWRIGHT_MICROSOFT_EMAIL_UNLINKED: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL_UNLINKED }}
PLAYWRIGHT_MICROSOFT_PASSWORD: ${{ secrets.PLAYWRIGHT_MICROSOFT_PASSWORD }}
PLAYWRIGHT_GOOGLE_EMAIL: ${{ secrets.PLAYWRIGHT_GOOGLE_EMAIL }}
PLAYWRIGHT_GOOGLE_PASSWORD: ${{ secrets.PLAYWRIGHT_GOOGLE_PASSWORD }}
PLAYWRIGHT_GOOGLE_TOTP_SECRET: ${{ secrets.PLAYWRIGHT_GOOGLE_TOTP_SECRET }}
GITHUB_RUN_ID: ${{ github.run_id }}
SLACK_BOT_USER_OAUTH_TOKEN: ${{ secrets.SLACK_BOT_USER_OAUTH_TOKEN }}
GITHUB_BRANCH_NAME: ${{ env.BRANCH_NAME_RAW }}
Expand All @@ -119,7 +118,7 @@ jobs:
TIME=$(xmllint --xpath 'string(/testsuites/@time)' test-results/results.xml)
PASSED=$((TESTS - FAILURES - ERRORS - SKIPPED))
FAILED=$((FAILURES + ERRORS))
SUMMARY="[Test Result] application=complete platform=react run_type=nightly execution_time=$TIME passed=$PASSED failed=$FAILED"
SUMMARY="[Test Result] application=complete platform=react run_type=nightly execution_time=$TIME passed=$PASSED failed=$FAILED link=https://github.com/corbado/javascript/actions/runs/${GITHUB_RUN_ID}"
TIMESTAMP=$(date +%s000)
LOG_EVENT_JSON="[{\"timestamp\":$TIMESTAMP,\"message\":\"$SUMMARY\"}]"
aws logs put-log-events --log-group-name "test-results-board" --log-stream-name "$LOG_STREAM_NAME" --log-events "$LOG_EVENT_JSON"
Expand All @@ -138,10 +137,9 @@ jobs:
env:
PLAYWRIGHT_NUM_CORES: 4
PLAYWRIGHT_JWT_TOKEN: ${{ secrets.PLAYWRIGHT_JWT_TOKEN }}
PLAYWRIGHT_MICROSOFT_EMAIL: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL }}
PLAYWRIGHT_MICROSOFT_EMAIL_LINKED: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL_LINKED }}
PLAYWRIGHT_MICROSOFT_EMAIL_UNLINKED: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL_UNLINKED }}
PLAYWRIGHT_MICROSOFT_PASSWORD: ${{ secrets.PLAYWRIGHT_MICROSOFT_PASSWORD }}
PLAYWRIGHT_GOOGLE_EMAIL: ${{ secrets.PLAYWRIGHT_GOOGLE_EMAIL }}
PLAYWRIGHT_GOOGLE_PASSWORD: ${{ secrets.PLAYWRIGHT_GOOGLE_PASSWORD }}
PLAYWRIGHT_GOOGLE_TOTP_SECRET: ${{ secrets.PLAYWRIGHT_GOOGLE_TOTP_SECRET }}
GITHUB_RUN_ID: ${{ github.run_id }}
SLACK_BOT_USER_OAUTH_TOKEN: ${{ secrets.SLACK_BOT_USER_OAUTH_TOKEN }}
GITHUB_BRANCH_NAME: ${{ env.BRANCH_NAME_RAW }}
Expand All @@ -167,7 +165,7 @@ jobs:
TIME=$(xmllint --xpath 'string(/testsuites/@time)' test-results/results.xml)
PASSED=$((TESTS - FAILURES - ERRORS - SKIPPED))
FAILED=$((FAILURES + ERRORS))
SUMMARY="[Test Result] application=complete platform=web-js run_type=nightly execution_time=$TIME passed=$PASSED failed=$FAILED"
SUMMARY="[Test Result] application=complete platform=web-js run_type=nightly execution_time=$TIME passed=$PASSED failed=$FAILED link=https://github.com/corbado/javascript/actions/runs/${GITHUB_RUN_ID}"
TIMESTAMP=$(date +%s000)
LOG_EVENT_JSON="[{\"timestamp\":$TIMESTAMP,\"message\":\"$SUMMARY\"}]"
aws logs put-log-events --log-group-name "test-results-board" --log-stream-name "$LOG_STREAM_NAME" --log-events "$LOG_EVENT_JSON"
Expand All @@ -186,10 +184,9 @@ jobs:
env:
PLAYWRIGHT_NUM_CORES: 4
PLAYWRIGHT_JWT_TOKEN: ${{ secrets.PLAYWRIGHT_JWT_TOKEN }}
PLAYWRIGHT_MICROSOFT_EMAIL: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL }}
PLAYWRIGHT_MICROSOFT_EMAIL_LINKED: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL_LINKED }}
PLAYWRIGHT_MICROSOFT_EMAIL_UNLINKED: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL_UNLINKED }}
PLAYWRIGHT_MICROSOFT_PASSWORD: ${{ secrets.PLAYWRIGHT_MICROSOFT_PASSWORD }}
PLAYWRIGHT_GOOGLE_EMAIL: ${{ secrets.PLAYWRIGHT_GOOGLE_EMAIL }}
PLAYWRIGHT_GOOGLE_PASSWORD: ${{ secrets.PLAYWRIGHT_GOOGLE_PASSWORD }}
PLAYWRIGHT_GOOGLE_TOTP_SECRET: ${{ secrets.PLAYWRIGHT_GOOGLE_TOTP_SECRET }}
GITHUB_RUN_ID: ${{ github.run_id }}
SLACK_BOT_USER_OAUTH_TOKEN: ${{ secrets.SLACK_BOT_USER_OAUTH_TOKEN }}
GITHUB_BRANCH_NAME: ${{ env.BRANCH_NAME_RAW }}
Expand All @@ -215,7 +212,7 @@ jobs:
TIME=$(xmllint --xpath 'string(/testsuites/@time)' test-results/results.xml)
PASSED=$((TESTS - FAILURES - ERRORS - SKIPPED))
FAILED=$((FAILURES + ERRORS))
SUMMARY="[Test Result] application=complete platform=web-js-script run_type=nightly execution_time=$TIME passed=$PASSED failed=$FAILED"
SUMMARY="[Test Result] application=complete platform=web-js-script run_type=nightly execution_time=$TIME passed=$PASSED failed=$FAILED link=https://github.com/corbado/javascript/actions/runs/${GITHUB_RUN_ID}"
TIMESTAMP=$(date +%s000)
LOG_EVENT_JSON="[{\"timestamp\":$TIMESTAMP,\"message\":\"$SUMMARY\"}]"
aws logs put-log-events --log-group-name "test-results-board" --log-stream-name "$LOG_STREAM_NAME" --log-events "$LOG_EVENT_JSON"
Expand Down Expand Up @@ -261,7 +258,7 @@ jobs:
TIME=$(xmllint --xpath 'string(/testsuites/@time)' test-results/results.xml)
PASSED=$((TESTS - FAILURES - ERRORS - SKIPPED))
FAILED=$((FAILURES + ERRORS))
SUMMARY="[Test Result] application=connect platform=react run_type=nightly execution_time=$TIME passed=$PASSED failed=$FAILED"
SUMMARY="[Test Result] application=connect platform=react run_type=nightly execution_time=$TIME passed=$PASSED failed=$FAILED link=https://github.com/corbado/javascript/actions/runs/${GITHUB_RUN_ID}"
TIMESTAMP=$(date +%s000)
LOG_EVENT_JSON="[{\"timestamp\":$TIMESTAMP,\"message\":\"$SUMMARY\"}]"
aws logs put-log-events --log-group-name "test-results-board" --log-stream-name "$LOG_STREAM_NAME" --log-events "$LOG_EVENT_JSON"
Expand Down
42 changes: 42 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/tests-e2e/.env.complete.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ PLAYWRIGHT_TEST_URL=http://localhost:3000
DEVELOPERPANEL_API_URL=https://console.cloud.corbado-staging.io
BACKEND_API_URL=https://backendapi.cloud.corbado-staging.io
FRONTEND_API_URL_SUFFIX=
PLAYWRIGHT_JWT_TOKEN=
PLAYWRIGHT_MICROSOFT_EMAIL=
PLAYWRIGHT_MICROSOFT_PASSWORD=
PLAYWRIGHT_GOOGLE_EMAIL=
PLAYWRIGHT_GOOGLE_PASSWORD=
PLAYWRIGHT_GOOGLE_TOTP_SECRET=
1 change: 1 addition & 0 deletions packages/tests-e2e/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"@playwright/test": "^1.47.0",
"@types/node": "^20.10.5",
"ngrok": "^5.0.0-beta.2",
"node-2fa": "^2.0.3",
"playwright-slack-report": "^1.1.72"
},
"dependencies": {
Expand Down
10 changes: 3 additions & 7 deletions packages/tests-e2e/src/complete/models/corbado-auth-blocks/LoginInitBlockModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { Page } from '@playwright/test';
import { expect } from '@playwright/test';

import type { SocialProviderType } from '../../utils/constants';
import { repeatSocialLogin, socialLogin } from './socialLogin';
import { socialLogin } from '../../utils/externalauth';

export class LoginInitBlockModel {
page: Page;
Expand Down Expand Up @@ -39,12 +39,8 @@ export class LoginInitBlockModel {
await this.page.getByRole('button', { name: 'Continue' }).click();
}

async submitSocialMicrosoft(email: string, password: string) {
await socialLogin(this.page, email, password);
}

async resubmitSocialMicrosoft() {
await repeatSocialLogin(this.page);
async submitSocialGoogle(email: string, password: string, secret: string) {
await socialLogin(this.page, email, password, secret);
}

submitPasskeyButton() {
Expand Down
11 changes: 11 additions & 0 deletions packages/tests-e2e/src/complete/models/corbado-auth-blocks/PasskeyAppendBlockModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,17 @@ export class PasskeyAppendBlockModel {
}
}

async startPasskeyOperation2(complete: boolean) {
const operationTrigger = () => this.page.getByRole('button', { name: 'Create passkey' }).click();
if (complete) {
await this.virtualAuthenticator.startAndCompletePasskeyOperation(operationTrigger);
} else {
await this.virtualAuthenticator.startAndCancelPasskeyOperation(operationTrigger, () =>
expectScreen(this.page, ScreenNames.PasskeyError),
);
}
}

async retryPasskeyOperation(complete: boolean) {
const operationTrigger = () => this.page.getByRole('button', { name: 'Try again' }).click();
if (complete) {
Expand Down
16 changes: 12 additions & 4 deletions packages/tests-e2e/src/complete/models/corbado-auth-blocks/SignupInitBlockModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import type { Page } from '@playwright/test';
import { expect } from '@playwright/test';

import type { SocialProviderType } from '../../utils/constants';
import { repeatSocialLogin, socialLogin } from '../../utils/externalauth';
import { getRandomIntegerN } from '../../utils/random';
import { repeatSocialLogin, socialLogin } from './socialLogin';

export class SignupInitBlockModel {
page: Page;
Expand Down Expand Up @@ -53,14 +53,22 @@ export class SignupInitBlockModel {
return this.page.getByRole('button', { name: 'Continue', exact: true }).click();
}

async submitSocialMicrosoft(email: string, password: string) {
await socialLogin(this.page, email, password);
async submitSocialGoogle(email: string, password: string, secret: string) {
await socialLogin(this.page, email, password, secret);
}

async resubmitSocialMicrosoft() {
async resubmitSocialGoogle() {
await repeatSocialLogin(this.page);
}

// async submitSocialMicrosoft(email: string, password: string) {
// await socialLoginDeprecated(this.page, email, password);
// }
//
// async resubmitSocialMicrosoft() {
// await repeatSocialLogin(this.page);
// }

expectErrorMissingUsername(): Promise<void> {
return this.#expectError('Please enter a username.');
}
Expand Down
30 changes: 0 additions & 30 deletions packages/tests-e2e/src/complete/models/corbado-auth-blocks/socialLogin.ts
View file
Open in desktop

This file was deleted.

Loading
Loading