Finished tests

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

Hide file tree

Showing 4 changed files with 163 additions and 19 deletions.
diff --git a/...rdSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/CheckAnswers.cshtml.cs b/...rdSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/CheckAnswers.cshtml.cs
@@ -139,7 +139,7 @@ public override void OnPageHandlerExecuting(PageHandlerExecutingContext context)
         {
             context.Result = Redirect(linkGenerator.RequestTrnWorkEmail(JourneyInstance.InstanceId));
         }
-        else if (state.PersonalEmail is null) 
+        else if (state.PersonalEmail is null)
         {
             // personal email is required for either WorkingInSchoolOrEducationalSetting being true or false
             context.Result = Redirect(linkGenerator.RequestTrnPersonalEmail(JourneyInstance.InstanceId));

diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.EndToEndTests/HostFixture.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.EndToEndTests/HostFixture.cs
@@ -26,6 +26,8 @@ public sealed class HostFixture(IConfiguration configuration) : IAsyncDisposable
     private IPlaywright? _playwright;
     private IBrowser? _browser;
 
+    public IConfiguration Configuration => configuration;
+
     public IBrowser Browser
     {
         get

diff --git a/...gRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.EndToEndTests/RequestTrnTests.cs b/...gRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.EndToEndTests/RequestTrnTests.cs
@@ -4,51 +4,71 @@ namespace TeachingRecordSystem.AuthorizeAccess.EndToEndTests;
 
 public class RequestTrnTests(HostFixture hostFixture) : TestBase(hostFixture)
 {
-    [Theory(Skip = "Flaky on CI")]
+    [Theory]
     [InlineData(true, true)]
     [InlineData(true, false)]
     [InlineData(false, false)]
-    public async Task RequestTrn(bool isPlanningToTakeAnNpq, bool hasNationalInsuranceNumber)
+    public async Task RequestTrnWithApplicationId(bool isTakingNpq, bool hasNationalInsuranceNumber)
     {
         await using var context = await HostFixture.CreateBrowserContext();
         var page = await context.NewPageAsync();
-
-        await page.GotoAsync("/request-trn");
+        var accessToken = HostFixture.Configuration["RequestTrnAccessToken"];
+        await page.GotoAsync($"/request-trn?AccessToken={accessToken}");
         await page.ClickButtonAsync("Start now");
-        await page.WaitForUrlPathAsync("/request-trn/npq-check");
+        await page.WaitForUrlPathAsync("/request-trn/taking-npq");
 
-        if (isPlanningToTakeAnNpq)
+        //Is Taking NPQ
+        if (isTakingNpq)
         {
             await page.CheckAsync("text=Yes");
             await page.ClickButtonAsync("Continue");
 
-            await page.WaitForUrlPathAsync("/request-trn/email");
+            //npq check
+            await page.WaitForUrlPathAsync("/request-trn/npq-check");
+            await page.CheckAsync("text=Yes");
+            await page.ClickButtonAsync("Continue");
 
-            var email = Faker.Internet.Email();
-            await page.FillAsync("input[name=Email]", email);
+            //npq applicationid
+            await page.WaitForUrlPathAsync("/request-trn/npq-application");
+            await page.FillAsync("input[name=NpqApplicationId]", "SomeApplicationID");
             await page.ClickButtonAsync("Continue");
 
-            await page.WaitForUrlPathAsync("/request-trn/name");
+            //working in school or educational setting
+            await page.WaitForUrlPathAsync("/request-trn/school-or-educational-setting");
+            await page.CheckAsync("text=Yes");
+            await page.ClickButtonAsync("Continue");
 
+            //work email
+            await page.WaitForUrlPathAsync("/request-trn/work-email");
+            await page.FillAsync("input[name=WorkEmail]", Faker.Internet.Email());
+            await page.ClickButtonAsync("Continue");
+
+            //personal email
+            await page.WaitForUrlPathAsync("/request-trn/personal-email");
+            await page.FillAsync("input[name=PersonalEmail]", Faker.Internet.Email());
+            await page.ClickButtonAsync("Continue");
+
+            //name
+            await page.WaitForUrlPathAsync("/request-trn/name");
             var name = Faker.Name.FullName();
             var previousName = Faker.Name.FullName();
             await page.FillAsync("input[name=Name]", name);
             await page.ClickButtonAsync("Continue");
 
+            //previous name
             await page.WaitForUrlPathAsync("/request-trn/previous-name");
-
             await page.CheckAsync("text=Yes");
             await page.FillAsync("input[name=PreviousName]", previousName);
             await page.ClickButtonAsync("Continue");
 
+            //dob
             await page.WaitForUrlPathAsync("/request-trn/date-of-birth");
-
             var dateOfBirth = new DateOnly(1980, 10, 12);
             await page.FillDateInputAsync(dateOfBirth);
             await page.ClickButtonAsync("Continue");
 
+            //identity
             await page.WaitForUrlPathAsync("/request-trn/identity");
-
             await page
                     .GetByLabel("Upload file")
                     .SetInputFilesAsync(
@@ -60,6 +80,7 @@ await page
                         });
             await page.ClickButtonAsync("Continue");
 
+            //NI
             await page.WaitForUrlPathAsync("/request-trn/national-insurance-number");
 
             var nationalInsuranceNumber = Faker.Identification.UkNationalInsuranceNumber();
@@ -92,17 +113,137 @@ await page
 
                 await page.WaitForUrlPathAsync("/request-trn/check-answers");
             }
+        }
+        else
+        {
+            await page.CheckAsync("text=No");
+            await page.ClickButtonAsync("Continue");
 
-            await page.ClickButtonAsync("Submit request");
+            await page.WaitForUrlPathAsync("/request-trn/not-eligible");
+        }
+    }
 
-            await page.WaitForUrlPathAsync("/request-trn/submitted");
+    [Theory]
+    [InlineData(true, true)]
+    [InlineData(true, false)]
+    [InlineData(false, false)]
+    [InlineData(false, true)]
+    public async Task RequestTrnWithNpqNameAndNpqProvider(bool hasNationalInsuranceNumber, bool isWorkingInSchoolOrEducationalSetting)
+    {
+        await using var context = await HostFixture.CreateBrowserContext();
+        var page = await context.NewPageAsync();
+        var accessToken = HostFixture.Configuration["RequestTrnAccessToken"];
+        await page.GotoAsync($"/request-trn?AccessToken={accessToken}");
+        await page.ClickButtonAsync("Start now");
+        await page.WaitForUrlPathAsync("/request-trn/taking-npq");
+
+
+        await page.CheckAsync("text=Yes");
+        await page.ClickButtonAsync("Continue");
+
+        //npq check
+        await page.WaitForUrlPathAsync("/request-trn/npq-check");
+        await page.CheckAsync("text=no");
+        await page.ClickButtonAsync("Continue");
+
+        //npq name
+        await page.WaitForUrlPathAsync("/request-trn/npq-name");
+        await page.FillAsync("input[name=NpqName]", "SomeNPQName");
+        await page.ClickButtonAsync("Continue");
+
+        //npq provider
+        await page.WaitForUrlPathAsync("/request-trn/npq-provider");
+        await page.FillAsync("input[name=NpqTrainingProvider]", "SOME PROVIDER");
+        await page.ClickButtonAsync("Continue");
+
+        //working in school or educational setting
+        if (isWorkingInSchoolOrEducationalSetting)
+        {
+            await page.WaitForUrlPathAsync("/request-trn/school-or-educational-setting");
+            await page.CheckAsync("text=Yes");
+            await page.ClickButtonAsync("Continue");
+
+            //work email
+            await page.WaitForUrlPathAsync("/request-trn/work-email");
+            await page.FillAsync("input[name=WorkEmail]", Faker.Internet.Email());
+            await page.ClickButtonAsync("Continue");
         }
         else
         {
+            await page.WaitForUrlPathAsync("/request-trn/school-or-educational-setting");
             await page.CheckAsync("text=No");
             await page.ClickButtonAsync("Continue");
+        }
 
-            await page.WaitForUrlPathAsync("/request-trn/not-eligible");
+        //personal email
+        await page.WaitForUrlPathAsync("/request-trn/personal-email");
+        await page.FillAsync("input[name=PersonalEmail]", Faker.Internet.Email());
+        await page.ClickButtonAsync("Continue");
+
+        //name
+        await page.WaitForUrlPathAsync("/request-trn/name");
+        var name = Faker.Name.FullName();
+        var previousName = Faker.Name.FullName();
+        await page.FillAsync("input[name=Name]", name);
+        await page.ClickButtonAsync("Continue");
+
+        //previous name
+        await page.WaitForUrlPathAsync("/request-trn/previous-name");
+        await page.CheckAsync("text=Yes");
+        await page.FillAsync("input[name=PreviousName]", previousName);
+        await page.ClickButtonAsync("Continue");
+
+        //dob
+        await page.WaitForUrlPathAsync("/request-trn/date-of-birth");
+        var dateOfBirth = new DateOnly(1980, 10, 12);
+        await page.FillDateInputAsync(dateOfBirth);
+        await page.ClickButtonAsync("Continue");
+
+        //identity
+        await page.WaitForUrlPathAsync("/request-trn/identity");
+        await page
+                .GetByLabel("Upload file")
+                .SetInputFilesAsync(
+                    new FilePayload()
+                    {
+                        Name = "evidence.jpg",
+                        MimeType = "image/jpeg",
+                        Buffer = TestData.JpegImage
+                    });
+        await page.ClickButtonAsync("Continue");
+
+        //NI
+        await page.WaitForUrlPathAsync("/request-trn/national-insurance-number");
+
+        var nationalInsuranceNumber = Faker.Identification.UkNationalInsuranceNumber();
+        if (hasNationalInsuranceNumber)
+        {
+            await page.CheckAsync("text=Yes");
+            await page.FillAsync("input[name=NationalInsuranceNumber]", nationalInsuranceNumber);
+            await page.ClickButtonAsync("Continue");
+
+            await page.WaitForUrlPathAsync("/request-trn/check-answers");
+        }
+        else
+        {
+            await page.CheckAsync("text=No");
+            await page.ClickButtonAsync("Continue");
+            await page.WaitForUrlPathAsync("/request-trn/address");
+
+            var addressLine1 = Faker.Address.StreetAddress();
+            var addressLine2 = Faker.Address.SecondaryAddress();
+            var townOrCity = Faker.Address.City();
+            var postalCode = Faker.Address.ZipCode();
+            var country = Faker.Address.Country();
+
+            await page.FillAsync("input[name=AddressLine1]", addressLine1);
+            await page.FillAsync("input[name=AddressLine2]", addressLine2);
+            await page.FillAsync("input[name=TownOrCity]", townOrCity);
+            await page.FillAsync("input[name=PostalCode]", postalCode);
+            await page.FillAsync("input[name=Country]", country);
+            await page.ClickButtonAsync("Continue");
+
+            await page.WaitForUrlPathAsync("/request-trn/check-answers");
         }
     }
 }
diff --git a/...tests/TeachingRecordSystem.AuthorizeAccess.Tests/PageTests/RequestTrn/NotEligibleTests.cs b/...tests/TeachingRecordSystem.AuthorizeAccess.Tests/PageTests/RequestTrn/NotEligibleTests.cs
@@ -73,10 +73,11 @@ public async Task Post_HasPendingTrnRequestSetTrue_RedirectsToSubmitted()
     }
 
     [Fact]
-    public async Task Post_HasIsPlanningToTakeAnNpqMissingFromState_RedirectsToNpqCheck()
+    public async Task Post_IsTakingAnNpqMissingFromState_RedirectsToNpqCheck()
     {
         // Arrange
         var state = CreateNewState();
+        state.IsTakingNpq = null;
         var journeyInstance = await CreateJourneyInstance(state);
 
         var request = new HttpRequestMessage(HttpMethod.Post, $"/request-trn/not-eligible?{journeyInstance.GetUniqueIdQueryParameter()}");
@@ -86,6 +87,6 @@ public async Task Post_HasIsPlanningToTakeAnNpqMissingFromState_RedirectsToNpqCh
 
         // Assert
         Assert.Equal(StatusCodes.Status302Found, (int)response.StatusCode);
-        Assert.Equal($"/request-trn/npq-check?{journeyInstance.GetUniqueIdQueryParameter()}", response.Headers.Location?.OriginalString);
+        Assert.Equal($"/request-trn/taking-npq?{journeyInstance.GetUniqueIdQueryParameter()}", response.Headers.Location?.OriginalString);
     }
 }