Updated tests 2/n

DFE-Digital · Jan 23, 2025 · caf2004 · caf2004
1 parent fdf1acd
commit caf2004
Show file tree

Hide file tree

Showing 6 changed files with 490 additions and 48 deletions.
diff --git a/...rdSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/CheckAnswers.cshtml.cs b/...rdSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/CheckAnswers.cshtml.cs
@@ -131,12 +131,17 @@ public override void OnPageHandlerExecuting(PageHandlerExecutingContext context)
         {
             context.Result = Redirect(linkGenerator.RequestTrnSubmitted(JourneyInstance!.InstanceId));
         }
+        else if (state.HaveRegisteredForAnNpq is null && state.NpqApplicationId is null)
+        {
+            context.Result = Redirect(linkGenerator.RequestTrnNpqApplication(JourneyInstance.InstanceId));
+        }
         else if (state.WorkEmail is null && state.WorkingInSchoolOrEducationalSetting == true)
         {
             context.Result = Redirect(linkGenerator.RequestTrnWorkEmail(JourneyInstance.InstanceId));
         }
-        else if (state.PersonalEmail is null && state.WorkingInSchoolOrEducationalSetting == false)
+        else if (state.PersonalEmail is null) 
         {
+            // personal email is required for either WorkingInSchoolOrEducationalSetting being true or false
             context.Result = Redirect(linkGenerator.RequestTrnPersonalEmail(JourneyInstance.InstanceId));
         }
         else if (state.Name is null)

diff --git a/...hingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Name.cshtml.cs b/...hingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Name.cshtml.cs
@@ -49,13 +49,13 @@ public override void OnPageHandlerExecuting(PageHandlerExecutingContext context)
         {
             context.Result = Redirect(linkGenerator.RequestTrnSubmitted(JourneyInstance!.InstanceId));
         }
-        else if (state.WorkEmail is null && state.WorkingInSchoolOrEducationalSetting == true)
+        else if (state.PersonalEmail is null)
         {
-            context.Result = Redirect(linkGenerator.RequestTrnWorkEmail(JourneyInstance.InstanceId));
+            context.Result = Redirect(linkGenerator.RequestTrnPersonalEmail(JourneyInstance.InstanceId));
         }
-        else if (state.PersonalEmail is null && state.WorkingInSchoolOrEducationalSetting == false)
+        else if (state.WorkEmail is null && state.WorkingInSchoolOrEducationalSetting == true)
         {
-            context.Result = Redirect(linkGenerator.RequestTrnPersonalEmail(JourneyInstance.InstanceId));
+            context.Result = Redirect(linkGenerator.RequestTrnWorkEmail(JourneyInstance.InstanceId));
         }
     }
 }
diff --git a/...RecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/NotEligible.cshtml b/...RecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/NotEligible.cshtml
@@ -12,7 +12,7 @@
     <div class="govuk-grid-column-full-from-desktop">
         <h1 class="govuk-heading-l">@ViewBag.Title</h1>
 
-        <p class="govuk-body">You can only use this service if you need a TRN because you're taking an NPQ.</p>
+        <p class="govuk-body">You can only use this service if you need a TRN because you’re taking an NPQ.</p>
         <p class="govuk-body">
             Find out how to <a class="govuk-link" href="https://www.gov.uk/guidance/teacher-reference-number-trn#if-youre-a-mentor-for-a-trainee-or-early-career-teacher">get a TRN if you’re a mentor for a trainee or early career teacher</a>.
         </p>