Merge pull request #1751 from companieshouse/origin/feature/roecct-761-add-tests-filter-dummy-ap

ROECCT-761: Add more tests - filter dummy associated party form CHS pages

Author: amalviyach

test/controllers/trusts.involved.controller.spec.ts

@@ -67,6 +67,8 @@ import {
   TRUST_INDIVIDUAL_BENEFICIAL_OWNER_PAGE,
   UPDATE_MANAGE_TRUSTS_TELL_US_ABOUT_THE_FORMER_BO_PAGE, LANDING_URL,
 } from '../../src/config';
+import { IndividualTrustee, TrustIndividual, TrustKey } from "../../src/model/trust.model";
+import { ApplicationData } from "../../src/model";
 
 mockCsrfProtectionMiddleware.mockClear();
 const mockIsActiveFeature = isActiveFeature as jest.Mock;
@@ -613,5 +615,56 @@ describe('Trust Involved controller', () => {
       expect(resp.text).toContain(ADD_TRUST_URL);
       expect(resp.text).not.toContain(PAGE_TITLE_ERROR);
     });
+
+    test(`filters out individuals without a forename or dummy associated parties`, async () => {
+
+      const individualTrustee1 = { surname: "dummySurname" } as IndividualTrustee;
+      const individualTrustee2 = { forename: "empty" } as IndividualTrustee;
+
+      const mockAppData: ApplicationData = {
+        [TrustKey]: [{
+          'INDIVIDUALS': [ individualTrustee1, individualTrustee2 ] as TrustIndividual[],
+        }]
+      } as ApplicationData;
+
+      (fetchApplicationData as jest.Mock).mockResolvedValue(mockAppData);
+      mockReq.body = {
+        noMoreToAdd: 'noMoreToAdd',
+      };
+      mockIsActiveFeature.mockReturnValue(false);
+      await post(mockReq, mockRes, mockNext);
+      await postTrustInvolvedPage(mockReq, mockRes, mockNext, true, true);
+
+      expect(mockAppData.trusts?.[0].INDIVIDUALS).toEqual([individualTrustee2]);
+
+      expect(mockRes.redirect).toBeCalledWith(`${TRUST_ENTRY_URL + ADD_TRUST_URL}`);
+    });
+
+    test(`keeps all valid individuals and ignore dummy associated parties`, async () => {
+
+      const individualTrustee1 = { forename: "TestOne" } as IndividualTrustee;
+      const individualTrustee2 = { forename: "TestTwo" } as IndividualTrustee;
+      const individualTrustee3 = { forename: "testThree", surname: "TestSurname" } as IndividualTrustee;
+      const individualTrustee4 = { surname: "OE001022A1" } as IndividualTrustee;
+
+      const mockAppData: ApplicationData = {
+        [TrustKey]: [{
+          'INDIVIDUALS': [ individualTrustee1, individualTrustee2, individualTrustee3, individualTrustee4 ] as TrustIndividual[],
+        }]
+      } as ApplicationData;
+
+      (fetchApplicationData as jest.Mock).mockResolvedValue(mockAppData);
+      mockReq.body = {
+        noMoreToAdd: 'noMoreToAdd',
+      };
+      mockIsActiveFeature.mockReturnValue(false);
+      await post(mockReq, mockRes, mockNext);
+      await postTrustInvolvedPage(mockReq, mockRes, mockNext, true, true);
+
+      expect(mockAppData.trusts?.[0].INDIVIDUALS).toEqual([individualTrustee1, individualTrustee2, individualTrustee3]);
+      expect(mockAppData.trusts?.[0].INDIVIDUALS).not.toEqual([individualTrustee4]);
+
+      expect(mockRes.redirect).toBeCalledWith(`${TRUST_ENTRY_URL + ADD_TRUST_URL}`);
+    });
   });
 });

test/utils/trust.spec.ts

@@ -471,7 +471,6 @@ describe('Trust Utils method tests', () => {
 
       const result = getIndividualTrustee(appData, test_trust_id, trusteeId);
       expect(result).toEqual(individualTrustee1);
-      // expect(result.id).toEqual(trusteeId);
     });
 
     test("test getIndividualTrusteeFromTrust with application data with no trusteeId", () => {