changes to account for special measure in the test

hmcts · Dec 6, 2024 · 8ae0b44 · 8ae0b44
1 parent 301534e
commit 8ae0b44
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 20 deletions.
diff --git a/UI.AutomationTests/Admin/AdminWebUITest.cs b/UI.AutomationTests/Admin/AdminWebUITest.cs
@@ -43,14 +43,12 @@ protected virtual void TearDown()
         var passed = TestContext.CurrentContext.Result.Outcome.Status == TestStatus.Skipped ||
                       TestContext.CurrentContext.Result.Outcome.Status == TestStatus.Passed;
 
-        UiTestReport?.AddScreenshotsToReport(VhDriver.GetDriver());
-        UiTestReport?.ProcessTest(VhDriver.GetDriver());
-        UiTestReport?.Flush();
-
+        BuildUiReport(VhDriver);
+
         VhDriver.PublishTestResult(passed);
         VhDriver.Terminate();
     }
-    
+
     /// <summary>
     /// Run ad-hoc clean up tasks for a test
     /// </summary>

diff --git a/UI.AutomationTests/Admin/Booking/BookHearingTests.cs b/UI.AutomationTests/Admin/Booking/BookHearingTests.cs
@@ -45,7 +45,10 @@ public void BookAHearing()
 
         var videoAccessPointsPage = addParticipantPage.GoToVideoAccessPointsPage();
         videoAccessPointsPage.AddVideoAccessPoints(_bookingDto.VideoAccessPoints);
-        var otherInformationPage = videoAccessPointsPage.GoToOtherInformationPage();
+
+        var otherInformationPage = FeatureToggle.Instance().SpecialMeasuresEnabled() ?
+            videoAccessPointsPage.GoToSpecialMeasuresPage().GoToOtherInformationPage() :
+            videoAccessPointsPage.GoToOtherInformationPage();
         otherInformationPage.TurnOffAudioRecording();
         otherInformationPage.EnterOtherInformation(_bookingDto.OtherInformation);
 

diff --git a/UI.AutomationTests/CommonUiTest.cs b/UI.AutomationTests/CommonUiTest.cs
@@ -102,6 +102,13 @@ protected void SetupUiTestReport()
         UiTestReport.SetupTest(testName, description, categories);
     }
 
+    protected void BuildUiReport(IVhDriver vhDriver)
+    {
+        UiTestReport?.AddScreenshotsToReport(vhDriver.GetDriver());
+        UiTestReport?.ProcessTest(vhDriver.GetDriver());
+        UiTestReport?.Flush();
+    }
+
     private async Task DeleteUsers()
     {
         foreach (var userPrincipleName in CreatedUsers)

diff --git a/UI.AutomationTests/Drivers/RemoteChromeVhDriver.cs b/UI.AutomationTests/Drivers/RemoteChromeVhDriver.cs
@@ -123,9 +123,4 @@ public void PublishTestResult(bool passed)
             TestContext.Out.WriteLine($"<{e.GetType().Name}> Failed to report test status to SauceLabs: {e.Message}");
         }
     }
-
-    public void CaptureScreenShot()
-    {
-        throw new NotImplementedException();
-    }
 }
diff --git a/UI.AutomationTests/Reporters/TestReporter.cs b/UI.AutomationTests/Reporters/TestReporter.cs
@@ -63,7 +63,11 @@ public void ProcessTest(IWebDriver driver)
         var logStatus = ConvertNUnitTestResultToExtentReportLogStatus();
         var test = _tests[TestContext.CurrentContext.Test.Name];
         var sb = new StringBuilder(TestContext.CurrentContext.Result.Message);
-        sb.AppendLine(TestContext.CurrentContext.Result.StackTrace);
+        if (logStatus != Status.Pass)
+        {
+            sb.AppendLine(TestContext.CurrentContext.Result.StackTrace);
+        }
+
         LogEntry(test, logStatus, sb.ToString(), driver.TakeScreenshotAsBase64());
         _extent.Flush();
     }

diff --git a/UI.AutomationTests/Video/VideoWebUiTest.cs b/UI.AutomationTests/Video/VideoWebUiTest.cs
@@ -39,6 +39,7 @@ protected virtual void Setup()
     {
         Environment.SetEnvironmentVariable(VhPage.VHTestNameKey, TestContext.CurrentContext.Test.Name);
         AdminWebDriver = CreateDriver("AdminWeb");
+        SetupUiTestReport();
     }
 
     [TearDown]
@@ -49,12 +50,14 @@ public void TearDown()
                      TestContext.CurrentContext.Result.Outcome.Status == TestStatus.Passed;
 
         AdminWebDriver.PublishTestResult(passed);
+        BuildUiReport(AdminWebDriver);
         AdminWebDriver.Terminate();
         AdminWebDriver = null;
 
         ParticipantDrivers.Values.ToList().ForEach(x =>
         {
             x.Driver.PublishTestResult(passed);
+            BuildUiReport(x.Driver);
             x.Driver.Terminate();
         });
         ParticipantDrivers.Clear();

diff --git a/UI.Common/UI.Common.csproj b/UI.Common/UI.Common.csproj
@@ -15,8 +15,4 @@
         <PackageReference Include="Microsoft.Identity.Client" Version="4.66.2" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Folder Include="Extensions\" />
-    </ItemGroup>
-
 </Project>
diff --git a/UI.PageModels/Pages/Admin/Booking/BookingDetailsPage.cs b/UI.PageModels/Pages/Admin/Booking/BookingDetailsPage.cs
@@ -92,8 +92,10 @@ public BookingConfirmationPage AddParticipantsToBooking(List<BookingParticipantD
         var participantsPage = new ParticipantsPage(Driver, DefaultWaitTime);
         participantsPage.AddParticipants(participantsToAdd);
         var videoAccessPointsPage = participantsPage.GoToVideoAccessPointsPage();
-        // use existing booking flow (i.e. next on vap goes to summary page)
-        var summaryPage = videoAccessPointsPage.GoToSummaryPage();
+        // use existing booking flow (i.e. next on vap goes screening (if enabled) and then to summary page)
+        var summaryPage = FeatureToggle.Instance().SpecialMeasuresEnabled() ?
+            videoAccessPointsPage.GoToSpecialMeasuresPage().GoToSummaryPage()
+            : videoAccessPointsPage.GoToSummaryPage();
         return summaryPage.ClickBookButton();
     }
 

diff --git a/UI.PageModels/Pages/Admin/Booking/HearingDetailsPage.cs b/UI.PageModels/Pages/Admin/Booking/HearingDetailsPage.cs
@@ -1,4 +1,6 @@
-namespace UI.PageModels.Pages.Admin.Booking;
+using UI.Common.Utilities;
+
+namespace UI.PageModels.Pages.Admin.Booking;
 
 public class HearingDetailsPage(IWebDriver driver, int defaultWaitTime) : VhAdminWebPage(driver, defaultWaitTime)
 {
@@ -59,7 +61,9 @@ public SummaryPage BookAHearingJourney(BookingDto bookingDto, bool isMultiDay =
 
         var videoAccessPointsPage = addParticipantPage.GoToVideoAccessPointsPage();
         videoAccessPointsPage.AddVideoAccessPoints(bookingDto.VideoAccessPoints);
-        var otherInformationPage = videoAccessPointsPage.GoToOtherInformationPage();
+        var otherInformationPage = FeatureToggle.Instance().SpecialMeasuresEnabled() ?
+            videoAccessPointsPage.GoToSpecialMeasuresPage().GoToOtherInformationPage() :
+            videoAccessPointsPage.GoToOtherInformationPage();
         otherInformationPage.TurnOffAudioRecording();
         otherInformationPage.EnterOtherInformation(bookingDto.OtherInformation);