CCM-10483: fix linting

Author: harrim91

.eslintrc.json

@@ -68,7 +68,8 @@
           "jest.config.ts",
           "jest.setup.ts",
           "**/__tests__/**",
-          "**/*.dev.[jt]s?(x)"
+          "**/*.dev.[jt]s?(x)",
+          "**/*.test.[jt]s?(x)"
         ]
       }
     ],

.github/workflows/stage-2-test.yaml

@@ -153,59 +153,3 @@ jobs:
           sonar_organisation_key: "${{ vars.SONAR_ORGANISATION_KEY }}"
           sonar_project_key: "${{ vars.SONAR_PROJECT_KEY }}"
           sonar_token: "${{ secrets.SONAR_TOKEN }}"
-
-
-  consumer-contracts:
-    name: Consumer Contract Tests
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_ASSUME_ROLE_NAME }}
-          role-session-name: templates-ci-contract-tests
-          aws-region: ${{ env.AWS_REGION }}
-
-      - name: Run consumer contract tests
-        run: npm run test:contracts:consumers
-
-      - name: Upload consumer Pact files
-        run: |
-          export PACT_BUCKET="nhs-notify-${{ secrets.AWS_ACCOUNT_ID }}-${{ env.AWS_REGION }}-main-acct-artefacts"
-          npm run test:contracts:upload:consumer
-
-      - name: Upload Pact contracts as artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: consumer-pacts
-          path: tests/contracts/tests/*/consumer/pacts/*.json
-          if-no-files-found: warn
-
-
-  provider-contracts:
-    name: Provider Contract Tests
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_ASSUME_ROLE_NAME }}
-          role-session-name: templates-ci-contract-tests
-          aws-region: ${{ env.AWS_REGION }}
-
-      - name: Download consumer generated Pact files and run provider contract tests
-        run: |
-          export PACT_BUCKET="nhs-notify-${{ secrets.AWS_ACCOUNT_ID }}-${{ env.AWS_REGION }}-main-acct-artefacts"
-          npm run test:contracts:provider:ci

.github/workflows/stage-4-acceptance.yaml

@@ -254,3 +254,57 @@ jobs:
       - name: "Destroy Backend sandbox"
         run: |
           npm run destroy-backend-sandbox ${{ steps.normalize_branch_name.outputs.normalized_branch_name }}
+
+  consumer-contracts:
+    name: Consumer Contract Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_ASSUME_ROLE_NAME }}
+          role-session-name: templates-ci-contract-tests
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: Run consumer contract tests
+        run: npm run test:contracts:consumers
+
+      - name: Upload consumer Pact files
+        run: |
+          export PACT_BUCKET="nhs-notify-${{ secrets.AWS_ACCOUNT_ID }}-${{ env.AWS_REGION }}-main-acct-artefacts"
+          npm run test:contracts:upload:consumer
+
+      - name: Upload Pact contracts as artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: consumer-pacts
+          path: tests/contracts/tests/*/consumer/pacts/*.json
+          if-no-files-found: warn
+
+  provider-contracts:
+    name: Provider Contract Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_ASSUME_ROLE_NAME }}
+          role-session-name: templates-ci-contract-tests
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: Download consumer generated Pact files and run provider contract tests
+        run: |
+          export PACT_BUCKET="nhs-notify-${{ secrets.AWS_ACCOUNT_ID }}-${{ env.AWS_REGION }}-main-acct-artefacts"
+          npm run test:contracts:provider:ci

tests/contracts/package.json

@@ -10,12 +10,16 @@
   "name": "contract-tests",
   "private": true,
   "scripts": {
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "pact:clean": "./scripts/clean.sh",
     "pact:download:consumer": "./scripts/download-consumer-pacts.sh",
     "pact:upload:consumer": "./scripts/upload-consumer-pacts.sh",
     "test:consumers": "jest consumer.pact.test.ts",
     "test:provider": "jest provider.pact.test.ts",
-    "test:provider:ci": "./scripts/ci-verify-provider.sh"
+    "test:provider:ci": "./scripts/ci-verify-provider.sh",
+    "test:unit": "echo 'No unit tests required'",
+    "typecheck": "tsc --noEmit"
   },
   "version": "1.0.0"
 }

tests/contracts/tests/templates/provider/template-deleted.provider.pact.test.ts

@@ -3,7 +3,7 @@ import path from 'node:path';
 import { MessageProviderPact } from '@pact-foundation/pact';
 
 // This would be the actual function that produces the event payload in the producer source code
-function produceTemplateDeletedEvent(): any {
+function createTemplateDeletedEvent() {
   return {
     'detail-type': 'TemplateDeleted',
     source: 'uk.nhs.notify.templates',
@@ -26,7 +26,7 @@ describe('Pact Message Provider - TemplateDeleted Event', () => {
       .filter((f) => f.endsWith('.json'))
       .map((f) => path.join(pactDir, f)),
     messageProviders: {
-      TemplateDeleted: () => produceTemplateDeletedEvent(),
+      TemplateDeleted: () => createTemplateDeletedEvent(),
     },
     logLevel: 'error',
   });