Merge branch 'vitaliydavydiak-fix-edge-config'

Author: rosolko

WebDriverManager.Tests/ChromeConfigTests.cs

@@ -19,6 +19,7 @@ public void VersionTest()
         public void DriverDownloadTest()
         {
             new DriverManager().SetUpDriver(new ChromeConfig());
+            Assert.NotEmpty(WebDriverFinder.FindFile(GetBinaryName()));
         }
     }
 }

WebDriverManager.Tests/EdgeConfigTests.cs

@@ -19,6 +19,7 @@ public void VersionTest()
         public void DriverDownloadTest()
         {
             new DriverManager().SetUpDriver(new EdgeConfig());
+            Assert.NotEmpty(WebDriverFinder.FindFile(GetBinaryName()));
         }
     }
 }

WebDriverManager.Tests/FirefoxConfigTests.cs

@@ -19,6 +19,7 @@ public void VersionTest()
         public void DriverDownloadTest()
         {
             new DriverManager().SetUpDriver(new FirefoxConfig());
+            Assert.NotEmpty(WebDriverFinder.FindFile(GetBinaryName()));
         }
     }
 }

WebDriverManager.Tests/InternetExplorerConfigTests.cs

@@ -19,6 +19,7 @@ public void VersionTest()
         public void DriverDownloadTest()
         {
             new DriverManager().SetUpDriver(new InternetExplorerConfig());
+            Assert.NotEmpty(WebDriverFinder.FindFile(GetBinaryName()));
         }
     }
 }

WebDriverManager.Tests/OperaConfigTests.cs

@@ -19,6 +19,7 @@ public void VersionTest()
         public void DriverDownloadTest()
         {
             new DriverManager().SetUpDriver(new OperaConfig());
+            Assert.NotEmpty(WebDriverFinder.FindFile(GetBinaryName()));
         }
     }
 }

WebDriverManager.Tests/PhantomConfigTests.cs

@@ -19,6 +19,7 @@ public void VersionTest()
         public void DriverDownloadTest()
         {
             new DriverManager().SetUpDriver(new PhantomConfig());
+            Assert.NotEmpty(WebDriverFinder.FindFile(GetBinaryName()));
         }
     }
 }

WebDriverManager.Tests/WebDriverFinder.cs

@@ -0,0 +1,15 @@
+using System.Reflection;
+using OpenQA.Selenium;
+
+namespace WebDriverManager.Tests
+{
+    public static class WebDriverFinder
+    {
+        public static string FindFile(string fileName)
+        {
+            var type = typeof(IWebDriver).Assembly.GetType("OpenQA.Selenium.Internal.FileUtilities");
+            var bindings = BindingFlags.InvokeMethod | BindingFlags.Public | BindingFlags.Static;
+            return type.InvokeMember("FindFile", bindings, null, null, new object[] { fileName }).ToString();
+        }
+    }
+}

WebDriverManager.Tests/WebDriverManager.Tests.csproj

@@ -9,6 +9,7 @@
     <ItemGroup>
         <PackageReference Include="coverlet.msbuild" Version="2.6.3" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+        <PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
     </ItemGroup>

WebDriverManager/DriverConfigs/Impl/ChromeConfig.cs

@@ -2,7 +2,6 @@
 using System.IO;
 using System.Net;
 using System.Runtime.InteropServices;
-using WebDriverManager.DriverConfigs;
 
 namespace WebDriverManager.DriverConfigs.Impl
 {

WebDriverManager/DriverConfigs/Impl/EdgeConfig.cs

@@ -1,24 +1,29 @@
-using System.Linq;
+using System;
+using System.IO;
 using System.Net;
-using AngleSharp.Html.Parser;
+using System.Runtime.InteropServices;
 
 namespace WebDriverManager.DriverConfigs.Impl
 {
     public class EdgeConfig : IDriverConfig
     {
+        private const string BaseVersionPatternUrl = "https://msedgedriver.azureedge.net/<version>/";
+
         public virtual string GetName()
         {
             return "Edge";
         }
 
         public virtual string GetUrl32()
         {
-            return "https://az813057.vo.msecnd.net/webdriver/msedgedriver_x86/msedgedriver.exe";
+            return $"{BaseVersionPatternUrl}edgedriver_win32.zip";
         }
 
         public virtual string GetUrl64()
         {
-            return "https://az813057.vo.msecnd.net/webdriver/msedgedriver_x64/msedgedriver.exe";
+            return RuntimeInformation.IsOSPlatform(OSPlatform.OSX)
+                ? $"{BaseVersionPatternUrl}edgedriver_mac64.zip"
+                : $"{BaseVersionPatternUrl}edgedriver_win64.zip";
         }
 
         public virtual string GetBinaryName()
@@ -28,18 +33,19 @@ public virtual string GetBinaryName()
 
         public virtual string GetLatestVersion()
         {
-            using (var client = new WebClient())
+            var uri = new Uri("https://msedgedriver.azureedge.net/LATEST_BETA");
+            var webRequest = WebRequest.Create(uri);
+            using (var response = webRequest.GetResponse())
             {
-                var htmlCode =
-                    client.DownloadString("https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver");
-                var parser = new HtmlParser();
-                var document = parser.ParseDocument(htmlCode);
-                var version = document.QuerySelectorAll(".driver-download > a + p")
-                    .Select(element => element.TextContent)
-                    .FirstOrDefault()
-                    ?.Split(' ')[1]
-                    .Split(' ')[0];
-                return version;
+                using (var content = response.GetResponseStream())
+                {
+                    if (content == null) throw new ArgumentNullException($"Can't get content from URL: {uri}");
+                    using (var reader = new StreamReader(content))
+                    {
+                        var version = reader.ReadToEnd().Trim();
+                        return version;
+                    }
+                }
             }
         }
     }