chore(4793): fix failing tests

bcgov · Feb 3, 2025 · 349f019 · 349f019
1 parent 2f353b7
commit 349f019
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 41 deletions.
diff --git a/.github/actions/setup-npm/action.yml b/.github/actions/setup-npm/action.yml
@@ -17,10 +17,10 @@ runs:
         ${{ runner.os }}-nextjs-${{ hashFiles('**/pnpm-lock.yaml') }}-
 
   - name: Install Root NPM packages
-    run: pnpm install
+    run: pnpm install --frozen-lockfile
     shell: bash
 
   - name: Install App NPM packages
-    run: pnpm install
+    run: pnpm install --frozen-lockfile
     shell: bash
     working-directory: app
diff --git a/.github/workflows/localdev-test.yml b/.github/workflows/localdev-test.yml
@@ -22,7 +22,7 @@ jobs:
       uses: ./.github/actions/setup-tools
 
     - name: Install Dependencies
-      run: pnpm install
+      run: pnpm install --frozen-lockfile
       working-directory: localdev/m365mock
 
     - name: Build the Application

diff --git a/app/app/api/public-cloud/emails.test.ts b/app/app/api/public-cloud/emails.test.ts
@@ -43,24 +43,24 @@ describe('Public Cloud Emails', () => {
     expect(sendEmail).toHaveBeenNthCalledWith(
       2,
       expect.objectContaining({
-        subject: 'Your provisioning request has been approved',
-        to: expect.arrayContaining([
-          decisionData.projectOwner.email,
-          decisionData.primaryTechnicalLead.email,
-          decisionData.secondaryTechnicalLead?.email,
-        ]),
+        subject: `You have been added as the Expense Authority for ${decisionData.name}`,
+        to: expect.arrayContaining([decisionData.expenseAuthority.email]),
         body: expect.compareEmailText(
-          `We are pleased to inform you that your request to create the product ${decisionData.name} has been approved on the Public Cloud Landing Zone ${decisionData.provider}.`,
+          `You are now the Expense Authority for the the product ${decisionData.name} on the Public Cloud.`,
         ),
       }),
     );
     expect(sendEmail).toHaveBeenNthCalledWith(
       3,
       expect.objectContaining({
-        subject: `You have been added as the Expense Authority for ${decisionData.name}`,
-        to: expect.arrayContaining([decisionData.expenseAuthority.email]),
+        subject: 'Your provisioning request has been approved',
+        to: expect.arrayContaining([
+          decisionData.projectOwner.email,
+          decisionData.primaryTechnicalLead.email,
+          decisionData.secondaryTechnicalLead?.email,
+        ]),
         body: expect.compareEmailText(
-          `You are now the Expense Authority for the the product ${decisionData.name} on the Public Cloud.`,
+          `We are pleased to inform you that your request to create the product ${decisionData.name} has been approved on the Public Cloud Landing Zone ${decisionData.provider}.`,
         ),
       }),
     );
@@ -89,24 +89,24 @@ describe('Public Cloud Emails', () => {
     expect(sendEmail).toHaveBeenNthCalledWith(
       2,
       expect.objectContaining({
-        subject: 'Your provisioning request has been approved',
-        to: expect.arrayContaining([
-          decisionData.projectOwner.email,
-          decisionData.primaryTechnicalLead.email,
-          decisionData.secondaryTechnicalLead?.email,
-        ]),
+        subject: `You have been added as the Expense Authority for ${decisionData.name}`,
+        to: expect.arrayContaining([decisionData.expenseAuthority.email]),
         body: expect.compareEmailText(
-          `We are pleased to inform you that your request to create the product ${decisionData.name} has been approved on the Public Cloud Landing Zone ${decisionData.provider}.`,
+          `You are now the Expense Authority for the the product ${decisionData.name} on the Public Cloud.`,
         ),
       }),
     );
     expect(sendEmail).toHaveBeenNthCalledWith(
       3,
       expect.objectContaining({
-        subject: `You have been added as the Expense Authority for ${decisionData.name}`,
-        to: expect.arrayContaining([decisionData.expenseAuthority.email]),
+        subject: 'Your provisioning request has been approved',
+        to: expect.arrayContaining([
+          decisionData.projectOwner.email,
+          decisionData.primaryTechnicalLead.email,
+          decisionData.secondaryTechnicalLead?.email,
+        ]),
         body: expect.compareEmailText(
-          `You are now the Expense Authority for the the product ${decisionData.name} on the Public Cloud.`,
+          `We are pleased to inform you that your request to create the product ${decisionData.name} has been approved on the Public Cloud Landing Zone ${decisionData.provider}.`,
         ),
       }),
     );
@@ -151,24 +151,24 @@ describe('Public Cloud Emails', () => {
     expect(sendEmail).toHaveBeenNthCalledWith(
       2,
       expect.objectContaining({
-        subject: 'Your provisioning request has been approved',
-        to: expect.arrayContaining([
-          decisionData.projectOwner.email,
-          decisionData.primaryTechnicalLead.email,
-          decisionData.secondaryTechnicalLead?.email,
-        ]),
+        subject: `You have been added as the Expense Authority for ${decisionData.name}`,
+        to: expect.arrayContaining([decisionData.expenseAuthority.email]),
         body: expect.compareEmailText(
-          `We are pleased to inform you that your request to create the product ${decisionData.name} has been approved on the Public Cloud Landing Zone ${decisionData.provider}.`,
+          `You are now the Expense Authority for the the product ${decisionData.name} on the Public Cloud.`,
         ),
       }),
     );
     expect(sendEmail).toHaveBeenNthCalledWith(
       3,
       expect.objectContaining({
-        subject: `You have been added as the Expense Authority for ${decisionData.name}`,
-        to: expect.arrayContaining([decisionData.expenseAuthority.email]),
+        subject: 'Your provisioning request has been approved',
+        to: expect.arrayContaining([
+          decisionData.projectOwner.email,
+          decisionData.primaryTechnicalLead.email,
+          decisionData.secondaryTechnicalLead?.email,
+        ]),
         body: expect.compareEmailText(
-          `You are now the Expense Authority for the the product ${decisionData.name} on the Public Cloud.`,
+          `We are pleased to inform you that your request to create the product ${decisionData.name} has been approved on the Public Cloud Landing Zone ${decisionData.provider}.`,
         ),
       }),
     );

diff --git a/app/utils/js/jest.ts b/app/utils/js/jest.ts
@@ -17,7 +17,8 @@ export function compareEmailText(html: string, targets: string | string[]) {
     target = normalizeText(target);
     if (!converted.includes(target)) {
       pass = false;
-      message = `expected ${target} in ${converted}`;
+      message = `expected <<${target}>> in <<${converted}>>`;
+      console.log(message);
       return false;
     }
   });

diff --git a/data-migrations/Dockerfile b/data-migrations/Dockerfile
@@ -6,7 +6,7 @@ COPY ["package.json", "pnpm-lock.yaml", "migrate-mongo-config.js", "./"]
 COPY migrations migrations
 
 RUN npm install -g turbo pnpm
-RUN pnpm install --ignore-scripts
+RUN pnpm install --frozen-lockfile --ignore-scripts
 
 USER node
 

diff --git a/localdev/ches-mock/Dockerfile b/localdev/ches-mock/Dockerfile
@@ -4,7 +4,7 @@ WORKDIR /opt
 COPY ches-mock ./context
 
 RUN npm install -g turbo pnpm
-RUN cd context && pnpm install --ignore-scripts && pnpm build
+RUN cd context && pnpm install --frozen-lockfile --ignore-scripts && pnpm build
 
 FROM node:22.12.0-alpine3.19
 WORKDIR /opt

diff --git a/localdev/keycloak-provision/Dockerfile b/localdev/keycloak-provision/Dockerfile
@@ -6,8 +6,8 @@ COPY keycloak-provision ./context
 COPY _packages ./_packages
 
 RUN npm install -g turbo pnpm
-RUN cd context && pnpm install --ignore-scripts
-RUN cd _packages/keycloak-admin && pnpm install --ignore-scripts && pnpm build
+RUN cd context && pnpm install --frozen-lockfile --ignore-scripts
+RUN cd _packages/keycloak-admin && pnpm install --frozen-lockfile --ignore-scripts && pnpm build
 RUN cd context && pnpm build
 
 FROM node:22.12.0-alpine3.19

diff --git a/localdev/m365mock/Dockerfile b/localdev/m365mock/Dockerfile
@@ -5,7 +5,7 @@ COPY ["mock-users.json", "types.ts", "./"]
 COPY m365mock ./context
 
 RUN npm install -g turbo pnpm
-RUN cd context && pnpm install --ignore-scripts && pnpm build
+RUN cd context && pnpm install --frozen-lockfile --ignore-scripts && pnpm build
 
 FROM node:22.12.0-alpine3.19
 WORKDIR /opt

diff --git a/localdev/nats-provision/Dockerfile b/localdev/nats-provision/Dockerfile
@@ -6,8 +6,8 @@ COPY nats-provision ./context
 COPY _packages ./_packages
 
 RUN npm install -g turbo pnpm
-RUN cd context && pnpm install --ignore-scripts
-RUN cd _packages/keycloak-admin && pnpm install --ignore-scripts && pnpm build
+RUN cd context && pnpm install --frozen-lockfile --ignore-scripts
+RUN cd _packages/keycloak-admin && pnpm install --frozen-lockfile --ignore-scripts && pnpm build
 RUN cd context && pnpm build
 
 FROM node:22.12.0-alpine3.19