Merge pull request #2738 from bcgov/develop

Deployment PR - 1713

Author: trslater

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        node: ["20"]
+        node: ["24"]
     name: ALCS Frontend Tests - ${{ matrix.node }}/${{ matrix.platform }}
     runs-on: ${{ matrix.platform }}
     steps:
@@ -30,7 +30,7 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        node: ["20"]
+        node: ["24"]
     name: Portal Frontend Tests - ${{ matrix.node }}/${{ matrix.platform }}
     runs-on: ${{ matrix.platform }}
     steps:
@@ -48,7 +48,7 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        node: ["20"]
+        node: ["24"]
     name: API Tests - ${{ matrix.node }}/${{ matrix.platform }}
     runs-on: ${{ matrix.platform }}
     steps:

.github/workflows/coverage.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        node: ["20"]
+        node: ["24"]
     name: Coverage Report ALCS Frontend - ${{ matrix.node }}/${{ matrix.platform }}
     runs-on: ${{ matrix.platform }}
     steps:
@@ -22,7 +22,7 @@ jobs:
       - run: npm install
       - run: npm run build
       - run: npm run test:cov
-      - if: matrix.node == '20'
+      - if: matrix.node == '24'
         uses: actions/upload-artifact@v4
         with:
           name: coverage-alcs-frontend
@@ -36,7 +36,7 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        node: ["20"]
+        node: ["24"]
     name: Coverage Report Portal Frontend - ${{ matrix.node }}/${{ matrix.platform }}
     runs-on: ${{ matrix.platform }}
     steps:
@@ -47,7 +47,7 @@ jobs:
       - run: npm install
       - run: npm run build
       - run: npm run test:cov
-      - if: matrix.node == '20'
+      - if: matrix.node == '24'
         uses: actions/upload-artifact@v4
         with:
           name: coverage-portal-frontend
@@ -61,7 +61,7 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        node: ["20"]
+        node: ["24"]
     name: Coverage Report API - ${{ matrix.node }}/${{ matrix.platform }}
     runs-on: ${{ matrix.platform }}
     steps:
@@ -72,7 +72,7 @@ jobs:
       - run: npm install
       - run: npm run build
       - run: npm run test:cov
-      - if: matrix.node == '20'
+      - if: matrix.node == '24'
         uses: actions/upload-artifact@v4
         with:
           name: coverage-api

.github/workflows/e2e-test.yml

@@ -24,6 +24,7 @@ on:
   pull_request:
     branches:
       - main
+      - develop
 jobs:
   test:
     name: Playwright Tests

.github/workflows/schemaspy.yml

@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 20
+          node-version: 24
       - run: |
           sudo apt-get install --yes --no-install-recommends postgresql-client
       - run: |

.github/workflows/sonarcloud.yml

@@ -42,7 +42,7 @@ jobs:
             npm ci
             npm run test:cov
           dir: services
-          node_version: "22"
+          node_version: "24"
           sonar_args: >
             -Dsonar.exclusions=**/coverage/**,**/node_modules/**,**/*spec.ts
             -Dsonar.organization=bcgov-sonarcloud
@@ -67,7 +67,7 @@ jobs:
             npm ci
             npm run test:cov
           dir: alcs-frontend
-          node_version: "22"
+          node_version: "24"
           sonar_args: >
             -Dsonar.exclusions=**/coverage/**,**/node_modules/**,**/*spec.ts
             -Dsonar.organization=bcgov-sonarcloud
@@ -92,7 +92,7 @@ jobs:
             npm ci
             npm run test:cov
           dir: portal-frontend
-          node_version: "22"
+          node_version: "24"
           sonar_args: >
             -Dsonar.exclusions=**/coverage/**,**/node_modules/**,**/*spec.ts
             -Dsonar.organization=bcgov-sonarcloud

e2e/pages/alcs/alcs-login-page.ts

@@ -12,8 +12,7 @@ export class ALCSLoginPage {
     this.page = page;
     this.baseUrl = baseUrl;
     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.userIdTextbox = page.locator('#user');
     this.passwordTextbox = page.getByLabel('Password');
     this.continueButton = page.getByRole('button', { name: 'Continue' });
   }
@@ -23,7 +22,16 @@ export class ALCSLoginPage {
   }
 
   async login(username: string, password: string) {
-    await this.idirLink.click();
+    // Click IDIR link and wait for navigation to external auth service
+    // Use domcontentloaded since external auth services can be slow
+    await Promise.all([
+      this.page.waitForURL('**/auth/**', { timeout: 30000, waitUntil: 'domcontentloaded' }),
+      this.idirLink.click(),
+    ]);
+
+    // Wait for login form to be ready
+    await this.userIdTextbox.waitFor({ state: 'visible', timeout: 30000 });
+
     await this.userIdTextbox.fill(username);
     await this.passwordTextbox.fill(password);
     await this.continueButton.click();

e2e/pages/portal/parcels-page.ts

@@ -168,7 +168,7 @@ export class ParcelsPage {
     await this.ownerSaveButton.click();
 
     // Wait for dialog to disappear
-    await expect(this.ownerAddDialog).toBeHidden();
+    await this.ownerAddDialog.waitFor({ state: 'hidden', timeout: 5000 });
   }
 
   // Actions

e2e/pages/portal/portal-login-page.ts

@@ -12,8 +12,7 @@ export class PortalLoginPage {
     this.page = page;
     this.baseUrl = baseUrl;
     this.loginButton = page.getByRole('button', { name: 'Portal Login' });
-    // There is an error with the username label on BCeID page
-    this.userIdTextbox = page.getByRole('textbox').nth(0);
+    this.userIdTextbox = page.locator('#user');
     this.passwordTextbox = page.getByLabel('Password');
     this.continueButton = page.getByRole('button', { name: 'Continue' });
   }
@@ -23,7 +22,16 @@ export class PortalLoginPage {
   }
 
   async logIn(username: string, password: string) {
-    await this.loginButton.click();
+    // Click login and wait for navigation to external auth service
+    // Use domcontentloaded since external auth services can be slow
+    await Promise.all([
+      this.page.waitForURL('**/auth/**', { timeout: 30000, waitUntil: 'domcontentloaded' }),
+      this.loginButton.click(),
+    ]);
+
+    // Wait for login form to be ready
+    await this.userIdTextbox.waitFor({ state: 'visible', timeout: 30000 });
+
     await this.userIdTextbox.fill(username);
     await this.passwordTextbox.fill(password);
     await this.continueButton.click();

e2e/playwright.config.ts

@@ -30,6 +30,10 @@ export default defineConfig({
 
     /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
     trace: 'on-first-retry',
+
+    /* Increase timeouts for external auth services which can be slow */
+    navigationTimeout: 30000,
+    actionTimeout: 30000,
   },
 
   /* Configure projects for major browsers */