Merge pull request #228 from hmcts/testfix/Update_Nswag

Updated NSwag config for video api and upgraded NuGet
hmcts · Feb 18, 2020 · b205ef3 · b205ef3
2 parents 1f298cc + af0685b
commit b205ef3
Show file tree

Hide file tree

Showing 6 changed files with 288 additions and 51 deletions.
diff --git a/AdminWebsite/AdminWebsite.AcceptanceTests/AdminWebsite.AcceptanceTests.csproj b/AdminWebsite/AdminWebsite.AcceptanceTests/AdminWebsite.AcceptanceTests.csproj
@@ -28,13 +28,13 @@
     <PackageReference Include="Selenium.Firefox.WebDriver" Version="0.26.0" />
     <PackageReference Include="Selenium.Support" Version="3.141.0" />
     <PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
-    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="80.0.3987.1600" />
+    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="80.0.3987.10600" />
     <PackageReference Include="Selenium.WebDriver.IEDriver" Version="3.150.1" />
     <PackageReference Include="Selenium.WebDriver.MicrosoftDriver" Version="17.17134.0" />
     <PackageReference Include="SpecFlow" Version="3.1.82" />
     <PackageReference Include="SpecFlow.NUnit" Version="3.1.82" />
     <PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.1.82" />
-    <PackageReference Include="VH.AcceptanceTests.Common" Version="1.0.66" />
+    <PackageReference Include="VH.AcceptanceTests.Common" Version="1.0.67" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/AdminWebsite/AdminWebsite.AcceptanceTests/Data/DateFormats.cs b/AdminWebsite/AdminWebsite.AcceptanceTests/Data/DateFormats.cs
@@ -1,32 +1,10 @@
-using AcceptanceTests.Common.Driver.Support;
+using System.Globalization;
 
 namespace AdminWebsite.AcceptanceTests.Data
 {
     public static class DateFormats
     {
-        private static string _chromeHearingDateFormat = System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern;
-        private const string FirefoxHearingDateFormat = "yyyy-MM-dd";
+        public static string LocalDateFormat = CultureInfo.CurrentUICulture.DateTimeFormat.ShortDatePattern;
         public static string HearingSummaryDate = "dddd dd MMMM yyyy, h:mmtt";
-
-        public static string FormatDateToLocalDateFormat(TargetBrowser browser)
-        {
-            if (browser != TargetBrowser.Chrome)
-                return browser == TargetBrowser.Firefox ? FirefoxHearingDateFormat : _chromeHearingDateFormat;
-            AddZerosToShortDateFormat();
-            return _chromeHearingDateFormat;
-        }
-
-        private static void AddZerosToShortDateFormat()
-        {
-            var splitDate = _chromeHearingDateFormat.Split("/");
-            foreach (var portion in splitDate)
-            {
-                if (portion.Equals("d"))
-                    _chromeHearingDateFormat = _chromeHearingDateFormat.Replace("d", "dd");
-
-                if (portion.Equals("M"))
-                    _chromeHearingDateFormat = _chromeHearingDateFormat.Replace("M", "MM");
-            }
-        }
     }
 }
diff --git a/AdminWebsite/AdminWebsite.AcceptanceTests/Steps/HearingScheduleSteps.cs b/AdminWebsite/AdminWebsite.AcceptanceTests/Steps/HearingScheduleSteps.cs
@@ -37,7 +37,7 @@ public void ProgressToNextPage()
 
         public void AddHearingDate()
         {
-            var date = _c.Test.HearingSchedule.ScheduledDate.Date.ToString(DateFormats.FormatDateToLocalDateFormat(_c.AdminWebConfig.TestConfig.TargetBrowser));
+            var date = _c.Test.HearingSchedule.ScheduledDate.Date.ToString(DateFormats.LocalDateFormat);
             _browsers[_c.CurrentUser.Key].Clear(HearingSchedulePage.HearingDateTextfield);
             _browsers[_c.CurrentUser.Key].Driver.WaitUntilVisible(HearingSchedulePage.HearingDateTextfield).SendKeys(date);
         }

diff --git a/AdminWebsite/AdminWebsite.Services.Generator/video-api-csharp.nswag b/AdminWebsite/AdminWebsite.Services.Generator/video-api-csharp.nswag
@@ -3,7 +3,7 @@
   "defaultVariables": null,
   "documentGenerator": {
     "fromDocument": {
-      "url": "https://vh-video-api-dev.hearings.reform.hmcts.net/swagger/v1/swagger.json",
+      "url": "https://vh-video-api-dev.azurewebsites.net/swagger/v1/swagger.json",
       "output": null
     }
   },

diff --git a/AdminWebsite/AdminWebsite/ClientApp/package-lock.json b/AdminWebsite/AdminWebsite/ClientApp/package-lock.json