From 90cb70d3d924305318eb5f76132093a35597208b Mon Sep 17 00:00:00 2001
From: Elijah Aremu <45821029+elielijah321@users.noreply.github.com>
Date: Thu, 30 May 2024 10:40:58 +0100
Subject: [PATCH 1/2] change date of decision text

---
 .../Pages/TaskList/Decision/DecisionDate.cshtml               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DecisionDate.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DecisionDate.cshtml
index 0075fdfc2..dc849f05f 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DecisionDate.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DecisionDate.cshtml
@@ -2,7 +2,7 @@
 @using Dfe.PrepareConversions.TagHelpers
 @model Dfe.PrepareConversions.Pages.TaskList.Decision.DecisionDate
 @{
-   ViewData["Title"] = $"Date {Model.DecisionText}";
+    ViewData["Title"] = $"Date of decision";
 }
 
 @section BeforeMain
@@ -12,7 +12,7 @@
 }
 
 <span id="selection-span" class="govuk-caption-l">Record the decision</span>
-<h1 class="govuk-heading-l">Date conversion was @Model.DecisionText</h1>
+<h1 class="govuk-heading-l">Date of decision</h1>
 
 <form method="post">
    <div class="govuk-form-group @ModelState.GetErrorStyleClass()">

From 7186064529792b7324ca36c64a5f8985d0840e04 Mon Sep 17 00:00:00 2001
From: Elijah Aremu <45821029+elielijah321@users.noreply.github.com>
Date: Thu, 30 May 2024 11:10:25 +0100
Subject: [PATCH 2/2] fix failing tests

---
 .../TaskList/Decision/DecisionDateIntegrationTests.cs     | 8 ++++----
 .../TaskList/Decision/DeclineReasonIntegrationTests.cs    | 2 +-
 .../Pages/TaskList/Decision/SummaryIntegrationTests.cs    | 6 +++---
 .../TaskList/Decision/WhyDeferredIntegrationTests.cs      | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/DecisionDateIntegrationTests.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/DecisionDateIntegrationTests.cs
index 07b820469..7c07174dd 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/DecisionDateIntegrationTests.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/DecisionDateIntegrationTests.cs
@@ -110,7 +110,7 @@ public async Task Should_go_back_to_any_conditions_for_the_accepted_journey()
 
       await ProgressToDecisionDateStep(project);
 
-      PageHeading.Should().Be("Date conversion was approved");
+      PageHeading.Should().Be("Date of decision");
 
       await NavigateAsync("Back");
 
@@ -130,7 +130,7 @@ public async Task Should_go_back_to_declined_reasons_for_the_declined_journey()
       await wizard.SetDecisionMakerName("Tester");
       await wizard.SetDeclinedReasonsAndContinue(Tuple.Create(AdvisoryBoardDeclinedReasons.Finance, "Finance reasons"));
 
-      PageHeading.Should().Be("Date conversion was declined");
+      PageHeading.Should().Be("Date of decision");
 
       await NavigateAsync("Back");
 
@@ -154,7 +154,7 @@ public async Task Should_display_the_correct_journey_in_the_required_message_whe
       await wizard.SetDecisionMakerName("Tester");
       await wizard.SetDeclinedReasonsAndContinue(Tuple.Create(AdvisoryBoardDeclinedReasons.Performance, "performance reasons"));
 
-      PageHeading.Should().Be("Date conversion was declined");
+      PageHeading.Should().Be("Date of decision");
 
       DayPart.Value = default!;
       MonthPart.Value = default!;
@@ -162,7 +162,7 @@ public async Task Should_display_the_correct_journey_in_the_required_message_whe
 
       await wizard.ClickSubmitButton();
 
-      PageHeading.Should().Be("Date conversion was declined");
+      PageHeading.Should().Be("Date of decision");
 
       ErrorSummary.Should().NotBeNull();
       ErrorSummary.TextContent.Should().Contain("Enter the date when the conversion was declined");
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/DeclineReasonIntegrationTests.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/DeclineReasonIntegrationTests.cs
index 9bdfc76ac..ffc5e09b8 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/DeclineReasonIntegrationTests.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/DeclineReasonIntegrationTests.cs
@@ -70,7 +70,7 @@ public async Task Should_continue_to_the_decline_date_page_on_submit()
    {
       await _wizard.SetDeclinedReasonsAndContinue(Tuple.Create(AdvisoryBoardDeclinedReasons.Other, "other reasons"));
 
-      PageHeading.Should().Be("Date conversion was declined");
+      PageHeading.Should().Be("Date of decision");
    }
 
    [Fact]
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/SummaryIntegrationTests.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/SummaryIntegrationTests.cs
index 941b71625..d28aa76a5 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/SummaryIntegrationTests.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/SummaryIntegrationTests.cs
@@ -213,7 +213,7 @@ public async Task Should_not_display_conditions_details_for_declined_projects()
    [Theory]
    [InlineData(1, "Who made this decision?")]
    [InlineData(3, "Were any conditions set?")]
-   [InlineData(4, "Date conversion was approved")]
+   [InlineData(4, "Date of decision")]
    public async Task Should_go_back_to_choose_and_back_link_to_summary(int changeLinkIndex, string expectedTitle)
    {
       AdvisoryBoardDecision request = new()
@@ -243,8 +243,8 @@ public async Task Should_go_back_to_choose_and_back_link_to_summary(int changeLi
    [Theory]
    [InlineData(0, "Record the decision", "Who made this decision?")]
    [InlineData(1, "Who made this decision?", "Decision maker's name")]
-   [InlineData(3, "Were any conditions set?", "Date conversion was approved")]
-   [InlineData(4, "Date conversion was approved", "Check your answers before recording this decision")]
+   [InlineData(3, "Were any conditions set?", "Date of decision")]
+   [InlineData(4, "Date of decision", "Check your answers before recording this decision")]
    public async Task Should_go_back_to_choose_and_submit_back_to_summary(int changeLinkIndex, string changePageTitle, string nextPageTitle)
    {
       AdvisoryBoardDecision request = new()
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/WhyDeferredIntegrationTests.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/WhyDeferredIntegrationTests.cs
index 0b22baadf..b03ab3194 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/WhyDeferredIntegrationTests.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/WhyDeferredIntegrationTests.cs
@@ -70,7 +70,7 @@ public async Task Should_continue_to_the_deferred_date_page_on_submit()
       await _wizard.SetDeferredReasonsAndContinue(Tuple.Create(AdvisoryBoardDeferredReason.Other, "other reasons"));
 
       Document.QuerySelector<IHtmlElement>("h1")!.Text().Should()
-         .Be("Date conversion was deferred");
+         .Be("Date of decision");
    }
 
    [Fact]