ATO-1237: fix test

govuk-one-login · Jan 13, 2025 · 2de6d60 · 2de6d60
1 parent a4dd928
commit 2de6d60
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 53 deletions.
diff --git a/backend/api/src/handlers/types/client-config-request.ts b/backend/api/src/handlers/types/client-config-request.ts
@@ -1,11 +1,11 @@
 export type clientConfigRequest = {
-  client_name: string;
-  public_key: string;
-  redirect_uris: string[];
-  contacts: string[];
-  scopes: string[];
-  subject_type: string;
-  service_type: string;
-  sector_identifier_uri: string;
-  client_locs: string[];
-}
+    client_name: string;
+    public_key: string;
+    redirect_uris: string[];
+    contacts: string[];
+    scopes: string[];
+    subject_type: string;
+    service_type: string;
+    sector_identifier_uri: string;
+    client_locs: string[];
+};
diff --git a/backend/api/src/handlers/types/client-registry-response.ts b/backend/api/src/handlers/types/client-registry-response.ts
@@ -1,23 +1,23 @@
 export type clientRegistryResponse = {
-  client_name: string;
-  public_key: string;
-  public_key_source: null | string;
-  redirect_uris: string[];
-  contacts: string[];
-  scopes: string[];
-  subject_type: string;
-  service_type: string;
-  sector_identifier_uri: string;
-  client_id: string;
-  post_logout_redirect_uris: string[];
-  back_channel_logout_uri: null | string;
-  token_endpoint_auth_method: string;
-  response_type: string;
-  jar_validation_required: boolean;
-  claims: string[];
-  client_type: string;
-  id_token_signing_algorithm: "ES256" | "RS256";
-  jwks_uri: null | string;
-  channel: null | string;
-  max_age_enabled: boolean;
-};
+    client_name: string;
+    public_key: string;
+    public_key_source: null | string;
+    redirect_uris: string[];
+    contacts: string[];
+    scopes: string[];
+    subject_type: string;
+    service_type: string;
+    sector_identifier_uri: string;
+    client_id: string;
+    post_logout_redirect_uris: string[];
+    back_channel_logout_uri: null | string;
+    token_endpoint_auth_method: string;
+    response_type: string;
+    jar_validation_required: boolean;
+    claims: string[];
+    client_type: string;
+    id_token_signing_algorithm: "ES256" | "RS256";
+    jwks_uri: null | string;
+    channel: null | string;
+    max_age_enabled: boolean;
+};
diff --git a/backend/api/tests/contract-tests/tests/testClientRegistryContract.spec.ts b/backend/api/tests/contract-tests/tests/testClientRegistryContract.spec.ts
@@ -2,14 +2,14 @@
 
 import {MatchersV3, PactV3} from "@pact-foundation/pact";
 import * as path from "path";
-import {  public_key, registerClientHandler, RegisterClientPayload } from "../../../src/handlers/auth/register-client";
+import {public_key, registerClientHandler, RegisterClientPayload} from "../../../src/handlers/auth/register-client";
 import {clientConfigRequest} from "../../../src/handlers/types/client-config-request";
 import {clientRegistryResponse} from "../../../src/handlers/types/client-registry-response";
-import { mockLambdaContext } from "../../handlers/utils";
-import { updateClientInRegistryHandler, UpdateClientPayload } from "../../../src/handlers/auth/update-client";
+import {mockLambdaContext} from "../../handlers/utils";
+import {updateClientInRegistryHandler, UpdateClientPayload} from "../../../src/handlers/auth/update-client";
 
 beforeAll((): void => {
-    jest.setTimeout(200000);
+    jest.setTimeout(400000);
 });
 
 describe("ClientRegistryProvider", () => {
@@ -19,11 +19,14 @@ describe("ClientRegistryProvider", () => {
         dir: path.resolve(process.cwd(), "pacts"),
         logLevel: "debug",
         port: 8080,
+        host: "127.0.0.1",
         consumer: "SSEAdminAPIClient",
         provider: "ClientRegistryProvider"
     });
 
     describe("When a POST request is made to create a client", () => {
+        const contactEmail = "[email protected]";
+        const serviceName = "My test service";
         const postEvent: RegisterClientPayload = {
             contactEmail: "[email protected]",
             service: {
@@ -33,23 +36,23 @@ describe("ClientRegistryProvider", () => {
         };
 
         const client_config: clientConfigRequest = {
-            client_name: postEvent.service.serviceName,
+            client_name: serviceName,
             public_key: public_key,
             redirect_uris: ["http://localhost/"],
-            contacts: [postEvent.contactEmail],
+            contacts: [contactEmail],
             scopes: ["openid", "email", "phone"],
             subject_type: "pairwise",
             service_type: "MANDATORY",
             sector_identifier_uri: "http://gov.uk",
             client_locs: ["P2"]
         };
 
-        const expected_response: clientRegistryResponse  = createExpectedResponse();
-    
+        const expected_response: clientRegistryResponse = createExpectedResponse();
+
         expected_response.client_name = client_config.client_name;
         expected_response.public_key = client_config.public_key;
         expected_response.redirect_uris = client_config.redirect_uris;
-        expected_response.contacts  = client_config.contacts;
+        expected_response.contacts = client_config.contacts;
         expected_response.scopes = client_config.scopes;
         expected_response.subject_type = client_config.subject_type;
         expected_response.service_type = client_config.service_type;
@@ -83,15 +86,16 @@ describe("ClientRegistryProvider", () => {
                 process.env.AUTH_REGISTRATION_BASE_URL = mockProvider.url;
                 const results = await registerClientHandler(postEvent, mockLambdaContext);
                 expect(JSON.parse(results.body)).toMatchObject(expected_response);
+                return;
             });
         });
     });
 
     describe("When a PUT request is made to update a client", () => {
         const updatesForClient = {
-            contacts: ["new.eamil@digital.cabinet-office.gov.uk"],
+            contacts: ["new.email@digital.cabinet-office.gov.uk"],
             subject_type: "pairwise"
-        }
+        };
 
         const putEvent: UpdateClientPayload = {
             clientId: "testClientIdExampleText1234",
@@ -100,9 +104,9 @@ describe("ClientRegistryProvider", () => {
             updates: {
                 ...updatesForClient
             }
-        }
+        };
 
-        let expected_response: any  = createExpectedResponse();
+        const expected_response: clientRegistryResponse = createExpectedResponse();
 
         expected_response.contacts = updatesForClient.contacts;
         expected_response.subject_type = updatesForClient.subject_type;
@@ -113,10 +117,9 @@ describe("ClientRegistryProvider", () => {
                 .uponReceiving("configuration to update a client")
                 .withRequest({
                     method: "PUT",
-                    path: `/connect/register/${putEvent.clientId}`,
-                    contentType: "application/json",
+                    path: "/connect/register/testClientIdExampleText1234",
                     headers: {
-                        "Content-Type": "application/json;"
+                        "Content-Type": "application/json"
                     },
                     body: updatesForClient
                 })
@@ -129,10 +132,16 @@ describe("ClientRegistryProvider", () => {
                     }
                 });
 
+            console.log("Before test execution");
+
             await provider.executeTest(async mockProvider => {
                 process.env.AUTH_REGISTRATION_BASE_URL = mockProvider.url;
+                console.log("Before lambda");
                 const results = await updateClientInRegistryHandler(putEvent, mockLambdaContext);
+                console.log("After lambda");
                 expect(JSON.parse(results.body)).toMatchObject(expected_response);
+                console.log("After json parse")
+                return;
             });
         });
     });
@@ -155,12 +164,11 @@ describe("ClientRegistryProvider", () => {
             response_type: "code",
             jar_validation_required: false,
             claims: [],
-            client_type: "web", 
+            client_type: "web",
             id_token_signing_algorithm: "ES256",
             jwks_uri: null,
             channel: "WEB",
             max_age_enabled: false
-        }
-
+        };
     }
 });
diff --git a/package.json b/package.json
@@ -21,8 +21,8 @@
     "list": "infrastructure/dev/deploy.sh list",
     "open": "infrastructure/dev/deploy.sh open",
     "creds": "infrastructure/aws.sh",
-    "test": "jest --silent",
-    "test:cov": "jest --silent --coverage",
+    "test": "jest --runInBand --detectOpenHandles",
+    "test:cov": "jest --coverage",
     "lint": "prettier . --check ; eslint '*.ts' --quiet --fix",
     "lint:fix": "prettier . --write ; eslint . --fix",
     "pii-scan": "infrastructure/dev/pii_scan.sh -p *template*.yml -i infrastructure/config/pii_scan_ignore.txt -s infrastructure/config/pii_scan_skip.txt"