TMI2-353|fix tests

cabinetoffice · Oct 13, 2023 · 44a3655 · 44a3655
1 parent bf4df2f
commit 44a3655
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 39 deletions.
diff --git a/packages/applicant/src/pages/api/redirect-from-find.page.tsx b/packages/applicant/src/pages/api/redirect-from-find.page.tsx
@@ -16,20 +16,20 @@ export default async function handler(
       grantSchemeId,
     } = await getAdvertBySlug(getJwtFromCookies(req), slug);
 
-    // if (version === 1) {
-    //   const redirectUrl = isInternal
-    //     ? `${process.env.HOST}${routes.applications}/${grantApplicationId}`
-    //     : externalSubmissionUrl;
-    //   res.redirect(redirectUrl);
-    // }
-    //
-    // if (version === 2) {
-    res.redirect(
-      `${process.env.HOST}${routes.mandatoryQuestions.startPage(
-        grantSchemeId.toString()
-      )}`
-    );
-    // }
+    if (version === 1) {
+      const redirectUrl = isInternal
+        ? `${process.env.HOST}${routes.applications}/${grantApplicationId}`
+        : externalSubmissionUrl;
+      res.redirect(redirectUrl);
+    }
+
+    if (version === 2) {
+      res.redirect(
+        `${process.env.HOST}${routes.mandatoryQuestions.startPage(
+          grantSchemeId.toString()
+        )}`
+      );
+    }
   } catch (e) {
     const serviceErrorProps = {
       errorInformation: 'There was an error in the service',

diff --git a/packages/applicant/src/pages/mandatory-questions/start.page.test.tsx b/packages/applicant/src/pages/mandatory-questions/start.page.test.tsx
@@ -4,6 +4,8 @@ import MandatoryQuestionsBeforeYouStart, {
   MandatoryQuestionsProps,
 } from './start.page';
 import { getProps } from 'gap-web-ui';
+import { RouterContext } from 'next/dist/shared/lib/router-context';
+import { createMockRouter } from '../../testUtils/createMockRouter';
 
 function getDefaultProps(): MandatoryQuestionsProps {
   return {
@@ -13,33 +15,37 @@ function getDefaultProps(): MandatoryQuestionsProps {
 
 describe('Mandatory Questions Start', () => {
   test('should render page', () => {
-    render(<MandatoryQuestionsBeforeYouStart {...getProps(getDefaultProps)} />);
+    render(
+      <RouterContext.Provider
+        value={createMockRouter({
+          pathname: `/applications`,
+        })}
+      >
+        <MandatoryQuestionsBeforeYouStart {...getProps(getDefaultProps)} />
+      </RouterContext.Provider>
+    );
 
     screen.getByRole('heading', {
-      name: 'Before you start',
-    });
-    screen.getByRole('paragraph', {
-      name: 'Before you start, we’d like to ask you a few questions.',
-    });
-    screen.getByRole('paragraph', {
-      name:
-        'These questions will be used by the grant’s administrators to prevent fraud ' +
-        'and help Find a grant understand the demand for this grant.',
-    });
-    screen.getByRole('paragraph', {
-      name: 'You will need:',
-    });
-    screen.getByRole('listitem', {
-      name: 'your organisation’s address',
-    });
-    screen.getByRole('listitem', {
-      name: 'your Companies House number (if you have one)',
-    });
-    screen.getByRole('listitem', {
-      name: 'your Charity Commission number (if you have one)',
-    });
+      name: /Before you start/i,
+    });
+    screen.getByRole(
+      (role, element) =>
+        role === 'listitem' &&
+        element.textContent === 'your organisation’s address'
+    );
+    screen.getByRole(
+      (role, element) =>
+        role === 'listitem' &&
+        element.textContent === 'your Companies House number (if you have one)'
+    );
+    screen.getByRole(
+      (role, element) =>
+        role === 'listitem' &&
+        element.textContent ===
+          'your Charity Commission number (if you have one)'
+    );
     screen.getByRole('button', {
-      name: 'Continue',
+      name: /Continue/i,
     });
   });
 });
diff --git a/packages/applicant/src/pages/mandatory-questions/start.page.tsx b/packages/applicant/src/pages/mandatory-questions/start.page.tsx
@@ -23,7 +23,7 @@ const MandatoryQuestionsBeforeYouStart: FC<MandatoryQuestionsProps> = ({
   return (
     <>
       <Meta title="Before you start" />
-      <Layout backBtnUrl={routes.organisation.index}>
+      <Layout>
         <h1 className="govuk-heading-l">Before you start</h1>
         <p className="govuk-body">
           Before you start, we’d like to ask you a few questions.