From f104458342abeb4d5b93b3016b4fe2464e6d28ca Mon Sep 17 00:00:00 2001 From: abradat Date: Wed, 26 Jun 2024 13:36:41 -0700 Subject: [PATCH 1/3] Change ALCS login to use BCEID in E2E testing --- e2e/pages/alcs/alcs-login-page.ts | 2 +- e2e/tests/tur.spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/pages/alcs/alcs-login-page.ts b/e2e/pages/alcs/alcs-login-page.ts index 440e72eaf..cff0d3fbd 100644 --- a/e2e/pages/alcs/alcs-login-page.ts +++ b/e2e/pages/alcs/alcs-login-page.ts @@ -11,7 +11,7 @@ export class ALCSLoginPage { constructor(page: Page, baseUrl: string) { this.page = page; this.baseUrl = baseUrl; - this.idirLink = page.getByRole('link', { name: 'IDIR' }); + this.idirLink = page.getByRole('link', { name: 'Basic or Business BCeID' }); // There is an error with the username label on BCeID page this.userIdTextbox = page.getByRole('textbox').nth(0); this.passwordTextbox = page.getByLabel('Password'); diff --git a/e2e/tests/tur.spec.ts b/e2e/tests/tur.spec.ts index 27ac46662..da70f3ae8 100644 --- a/e2e/tests/tur.spec.ts +++ b/e2e/tests/tur.spec.ts @@ -193,7 +193,7 @@ test.describe.serial('Portal TUR submission and ALCS applicant info flow', () => test('submission data should appear in ALCS applicant info', async ({ page }) => { const alcsLoginPage = new ALCSLoginPage(page, process.env.ALCS_BASE_URL); await alcsLoginPage.goto(); - await alcsLoginPage.login(process.env.IDIR_USERNAME, process.env.IDIR_PASSWORD); + await alcsLoginPage.login(process.env.BCEID_BASIC_USERNAME, process.env.BCEID_BASIC_PASSWORD); const alcsMainNavidation = new ALCSMainNavigation(page); From 49c612e274908efe00f737324173fe1af217125b Mon Sep 17 00:00:00 2001 From: abradat Date: Wed, 26 Jun 2024 13:37:47 -0700 Subject: [PATCH 2/3] Add ALCS Base URL to E2E workflow --- .github/workflows/e2e-test.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index a5423f7bb..2ad122846 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -8,6 +8,12 @@ on: options: - https://alcs-dev-portal.apps.silver.devops.gov.bc.ca - https://alcs-test-portal.apps.silver.devops.gov.bc.ca + alcsBaseUrl: + type: choice + description: ALCS Base URL + options: + - https://alcs-dev.apps.silver.devops.gov.bc.ca + - https://alcs-test.apps.silver.devops.gov.bc.ca schedule: # 5:23 am daily - cron: "23 5 * * *" @@ -32,6 +38,7 @@ jobs: env: # Default to dev PORTAL_BASE_URL: ${{ inputs.portalBaseUrl || 'https://alcs-dev-portal.apps.silver.devops.gov.bc.ca' }} + ALCS_BASE_URL: ${{ inputs.alcsBaseUrl || 'https://alcs-dev.apps.silver.devops.gov.bc.ca' }} BCEID_BASIC_USERNAME: ${{ secrets.BCEID_BASIC_USERNAME }} BCEID_BASIC_PASSWORD: ${{ secrets.BCEID_BASIC_PASSWORD }} run: npx playwright test From 93427d319689634bdf487d1f97f207f7259285bf Mon Sep 17 00:00:00 2001 From: abradat Date: Wed, 26 Jun 2024 14:03:09 -0700 Subject: [PATCH 3/3] Add branch input to manual trigger --- .github/workflows/e2e-test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index 2ad122846..e6e316f24 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -14,6 +14,10 @@ on: options: - https://alcs-dev.apps.silver.devops.gov.bc.ca - https://alcs-test.apps.silver.devops.gov.bc.ca + branch: + type: string + description: 'Branch to checkout' + default: 'develop' schedule: # 5:23 am daily - cron: "23 5 * * *" @@ -25,7 +29,7 @@ jobs: - uses: actions/checkout@v4 with: # This does not need to align with URL - ref: develop + ref: ${{ inputs.branch || 'develop' }} - uses: actions/setup-node@v4 - name: Install dependencies working-directory: ./e2e