Merge pull request #174 from SkillsFundingAgency/develop

Develop
SkillsFundingAgency · Mar 3, 2023 · b4c9b8d · b4c9b8d
2 parents 81933ce + 44cf63b
commit b4c9b8d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/Sfa.Tl.ResultsAndCertification.Web/Content/Help/ServiceUnavailable.Designer.cs b/src/Sfa.Tl.ResultsAndCertification.Web/Content/Help/ServiceUnavailable.Designer.cs
diff --git a/src/Sfa.Tl.ResultsAndCertification.Web/Content/Help/ServiceUnavailable.resx b/src/Sfa.Tl.ResultsAndCertification.Web/Content/Help/ServiceUnavailable.resx
@@ -130,6 +130,6 @@
     <value>The Manage T Level results service is unavailable while we process and calculate overall T Level results.</value>
   </data>
   <data name="Para_Use_Service_From" xml:space="preserve">
-    <value>You will be able to use the service from 12:00{0}.</value>
+    <value>You will be able to use the service from {0}.</value>
   </data>
 </root>
diff --git a/src/Sfa.Tl.ResultsAndCertification.Web/Controllers/HelpController.cs b/src/Sfa.Tl.ResultsAndCertification.Web/Controllers/HelpController.cs
@@ -64,10 +64,10 @@ public IActionResult UserGuide()
         [Route("service-unavailable", Name = RouteConstants.ServiceUnavailable)]
         public IActionResult ServiceUnavailable()
         {
-            var serviceAvailableFrom = _configuration.FreezePeriodEndDate.AddDays(1);
+            var serviceAvailableFrom = _configuration.FreezePeriodEndDate.AddSeconds(1);
             var viewModel = new ServiceUnavailableViewModel
             {
-                ServiceAvailableFrom = $"{serviceAvailableFrom.ToString("tt").ToLower()} on {serviceAvailableFrom.DayOfWeek} {serviceAvailableFrom:dd MMMM yyyy}"
+                ServiceAvailableFrom = $"{serviceAvailableFrom.ToString("hh:mmtt").ToLower()} on {serviceAvailableFrom.DayOfWeek} {serviceAvailableFrom:dd MMMM yyyy}"
             };
             return View(viewModel);
         }

diff --git a/...rtification.Web.UnitTests/Controllers/HelpControllerTests/ServiceUnavailable/TestSetup.cs b/...rtification.Web.UnitTests/Controllers/HelpControllerTests/ServiceUnavailable/TestSetup.cs
@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
-using Sfa.Tl.ResultsAndCertification.Common.Extensions;
 using Sfa.Tl.ResultsAndCertification.Models.Configuration;
 using Sfa.Tl.ResultsAndCertification.Tests.Common.BaseTest;
 using Sfa.Tl.ResultsAndCertification.Web.Controllers;
+using System;
 using System.Threading.Tasks;
 
 namespace Sfa.Tl.ResultsAndCertification.Web.UnitTests.Controllers.HelpControllerTests.ServiceUnavailable
@@ -17,7 +17,7 @@ public override void Setup()
         {
             Configuration = new ResultsAndCertificationConfiguration
             {
-                FreezePeriodEndDate = "31/07/2022".ParseStringToDateTimeWithFormat()
+                FreezePeriodEndDate = new DateTime(2022, 07, 31, 23, 59, 59, DateTimeKind.Utc)
             };
 
             Controller = new HelpController(Configuration);

diff --git a/....Web.UnitTests/Controllers/HelpControllerTests/ServiceUnavailable/When_Action_IsCalled.cs b/....Web.UnitTests/Controllers/HelpControllerTests/ServiceUnavailable/When_Action_IsCalled.cs
@@ -11,7 +11,7 @@ public class When_Action_IsCalled : TestSetup
 
         public override void Given()
         {
-            _expectedValue = "am on Monday 01 August 2022";
+            _expectedValue = "12:00am on Monday 01 August 2022";
         }
 
         [Fact]
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ public class When_Action_IsCalled : TestSetup @@
             public override void Given()
             {
-                _expectedValue = "am on Monday 01 August 2022";
+                _expectedValue = "12:00am on Monday 01 August 2022";
             }
             [Fact]
@@ Expand Down @@