diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects.CypressTests/cypress/e2e/tasks/Getting-ready-to-open/due-diligence-checks.cy.ts b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects.CypressTests/cypress/e2e/tasks/Getting-ready-to-open/due-diligence-checks.cy.ts index 72706fe97..0233fd8a1 100644 --- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects.CypressTests/cypress/e2e/tasks/Getting-ready-to-open/due-diligence-checks.cy.ts +++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects.CypressTests/cypress/e2e/tasks/Getting-ready-to-open/due-diligence-checks.cy.ts @@ -13,7 +13,7 @@ describe("Testing the due diligence checks task", () => { beforeEach(() => { cy.login(); - project = RequestBuilder.createProjectDetails(); + project = RequestBuilder.createProjectDetailsNonPresumption(); projectApi .post({ @@ -66,10 +66,10 @@ describe("Testing the due diligence checks task", () => { .inOrder() .summaryShows("Received Chair of Trustee's DBS countersigned certificate").HasValue("Yes").HasChangeLink() .summaryShows("Non-specialist checks done on all trust members and trustees in last 2 years").HasValue("Yes").HasChangeLink() - .summaryShows("Requested counter terrorism checks").HasValue("No").HasChangeLink() - .summaryShows("Date when all check were completed").HasValue("30 January 2050").HasChangeLink() + .summaryShows("Requested counter extremism checks").HasValue("No").HasChangeLink() + .summaryShows("Date when all checks were completed").HasValue("30 January 2050").HasChangeLink() .summaryShows("Saved the non-specialist checks spreadsheet in Workplaces folder").HasValue("Yes").HasChangeLink() - .summaryShows("Deleted copy of any Chair's DBS certificate").HasValue("Yes").HasChangeLink() + .summaryShows("Deleted any copies of Chair's DBS certificate").HasValue("Yes").HasChangeLink() .summaryShows("Deleted emails containing suitability and declaration forms").HasValue("Yes").HasChangeLink() .isNotMarkedAsComplete() .clickConfirmAndContinue(); @@ -104,10 +104,10 @@ function checkSummaryPageHasEmptyValuesAndNotComplete(schoolName: string) { .inOrder() .summaryShows("Received Chair of Trustee's DBS countersigned certificate").IsEmpty().HasChangeLink() .summaryShows("Non-specialist checks done on all trust members and trustees in last 2 years").IsEmpty().HasChangeLink() - .summaryShows("Requested counter terrorism checks").IsEmpty().HasChangeLink() - .summaryShows("Date when all check were completed").IsEmpty().HasChangeLink() + .summaryShows("Requested counter extremism checks").IsEmpty().HasChangeLink() + .summaryShows("Date when all checks were completed").IsEmpty().HasChangeLink() .summaryShows("Saved the non-specialist checks spreadsheet in Workplaces folder").IsEmpty().HasChangeLink() - .summaryShows("Deleted copy of any Chair's DBS certificate").IsEmpty().HasChangeLink() + .summaryShows("Deleted any copies of Chair's DBS certificate").IsEmpty().HasChangeLink() .summaryShows("Deleted emails containing suitability and declaration forms").IsEmpty().HasChangeLink() .isNotMarkedAsComplete(); } \ No newline at end of file diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/DueDiligenceChecks/EditDueDiligenceChecks.cshtml b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/DueDiligenceChecks/EditDueDiligenceChecks.cshtml index c112e9bf3..a9d64cc30 100644 --- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/DueDiligenceChecks/EditDueDiligenceChecks.cshtml +++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/DueDiligenceChecks/EditDueDiligenceChecks.cshtml @@ -44,7 +44,7 @@ name="requested-counter-extremism-checks" label="Requested counter extremism checks" asp-for="@Model.RequestedCounterExtremismChecks" - leading-paragraph="You only need to do this if the non-specialist checks have revealed any concerns." /> + leading-paragraph="You only need to do this if the non-specialist checks revealed any concerns." /> diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/DueDiligenceChecks/ViewDueDIligenceChecks.cshtml b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/DueDiligenceChecks/ViewDueDIligenceChecks.cshtml index 6749f6520..b18b97894 100644 --- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/DueDiligenceChecks/ViewDueDIligenceChecks.cshtml +++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/DueDiligenceChecks/ViewDueDIligenceChecks.cshtml @@ -8,7 +8,7 @@ var editLink = string.Format(RouteConstants.EditDueDiligenceChecks, Model.ProjectId); var dueDiligenceChecks = Model.Project.DueDiligenceChecks; - var requestedCounterTerrorismChecksVal = dueDiligenceChecks.RequestedCounterExtremismChecks switch + var requestedCounterExtremismChecksVal = dueDiligenceChecks.RequestedCounterExtremismChecks switch { null => null, true => "Yes", @@ -33,10 +33,10 @@ - - + + - +