Change repository and name of new firefox driver (wires > geckodriver)

rosolko · rosolko · commit 4e32a32fd103 · 2016-06-27T16:52:18.000+03:00
diff --git a/WebDriverManager/BrowserManagers/ChromeDriverManager.cs b/WebDriverManager/BrowserManagers/ChromeDriverManager.cs
@@ -81,8 +81,7 @@ public void Base()
             WebDriverManager.Unzip(config);
             WebDriverManager.Clean();
             WebDriverManager.AddEnvironmentVariable(config.pathVariable);
-            // Temporary disable this functionality because of wrong path override
-            //WebDriverManager.UpdatePath(config.pathVariable);
+            WebDriverManager.UpdatePath(config.pathVariable);
         }
     }
 }
diff --git a/WebDriverManager/BrowserManagers/EdgeDriverManager.cs b/WebDriverManager/BrowserManagers/EdgeDriverManager.cs
@@ -66,8 +66,7 @@ public void Base()
         {
             WebDriverManager.Download(config);
             WebDriverManager.AddEnvironmentVariable(config.pathVariable);
-            // Temporary disable this functionality because of wrong path override
-            //WebDriverManager.UpdatePath(config.pathVariable);
+            WebDriverManager.UpdatePath(config.pathVariable);
         }
     }
 }
diff --git a/WebDriverManager/BrowserManagers/InternetExplorerDriverManager.cs b/WebDriverManager/BrowserManagers/InternetExplorerDriverManager.cs
@@ -136,8 +136,7 @@ public void Base()
             WebDriverManager.Unzip(config);
             WebDriverManager.Clean();
             WebDriverManager.AddEnvironmentVariable(config.pathVariable);
-            // Temporary disable this functionality because of wrong path override
-            //WebDriverManager.UpdatePath(config.pathVariable);
+            WebDriverManager.UpdatePath(config.pathVariable);
         }
     }
 }
diff --git a/WebDriverManager/BrowserManagers/MarionetteDriverManager.cs b/WebDriverManager/BrowserManagers/MarionetteDriverManager.cs
@@ -15,8 +15,8 @@ public class MarionetteDriverManager : Logging, IBaseBrowserManager
         /// </summary>
         WebDriverManagerConfig config = new WebDriverManagerConfig
         {
-            binary = "wires-<version>-win.exe",
-            url = "https://github.com/jgraham/wires/releases/download/v<version>/wires-<version>-win.zip",
+            binary = "geckodriver.exe",
+            url = "https://github.com/mozilla/geckodriver/releases/download/v<version>/geckodriver-v<version>-win32.zip",
             pathVariable = "webdriver.gecko.driver",
             architecture = Architecture.x32.ToString()
         };
@@ -29,13 +29,12 @@ public string GetLatestVersion()
                 {
                     string version = null;
                     var doc = new HtmlDocument();
-                    var htmlCode = client.DownloadString("https://github.com/jgraham/wires/releases");
+                    var htmlCode = client.DownloadString("https://github.com/mozilla/geckodriver/releases");
                     doc.LoadHtml(htmlCode);
                     var itemList = doc.DocumentNode.SelectNodes("//*[@class='release-title']/a").Select(p => p.InnerText).ToList();
-                    version = itemList.FirstOrDefault();
+                    version = itemList.FirstOrDefault().Remove(0, 1);
                     if (version != null || version != string.Empty)
                     {
-                        SetBinary(version);
                         Log?.Info($"Latest marionette driver version is '{version}'");
                     }
                     else
@@ -50,12 +49,6 @@ public string GetLatestVersion()
             }
         }
 
-        private void SetBinary(string version)
-        {
-            config.binary = config.binary.Replace("<version>", version);
-            Log?.Trace($"Update binary name to: '{config.binary}' in accordance with marionette driver version: '{version}'");
-        }
-
         public MarionetteDriverManager()
             : base()
         {
@@ -67,7 +60,6 @@ public MarionetteDriverManager(string version)
         {
             config.version = version;
             Log?.Info($"Set marionette driver version to: '{version}'");
-            SetBinary(version);
         }
 
         public void Init()
@@ -89,8 +81,7 @@ public void Base()
             WebDriverManager.Unzip(config);
             WebDriverManager.Clean();
             WebDriverManager.AddEnvironmentVariable(config.pathVariable);
-            // Temporary disable this functionality because of wrong path override
-            //WebDriverManager.UpdatePath(config.pathVariable);
+            WebDriverManager.UpdatePath(config.pathVariable);
         }
     }
 }
diff --git a/WebDriverManager/BrowserManagers/OperaDriverManager.cs b/WebDriverManager/BrowserManagers/OperaDriverManager.cs
@@ -108,8 +108,7 @@ public void Base()
             WebDriverManager.Unzip(config);
             WebDriverManager.Clean();
             WebDriverManager.AddEnvironmentVariable(config.pathVariable);
-            // Temporary disable this functionality because of wrong path override
-            //WebDriverManager.UpdatePath(config.pathVariable);
+            WebDriverManager.UpdatePath(config.pathVariable);
         }
     }
 }
diff --git a/WebDriverManager/BrowserManagers/PhantomJsDriverManager.cs b/WebDriverManager/BrowserManagers/PhantomJsDriverManager.cs
@@ -78,8 +78,7 @@ public void Base()
             WebDriverManager.Unzip(config);
             WebDriverManager.Clean();
             WebDriverManager.AddEnvironmentVariable(config.pathVariable);
-            // Temporary disable this functionality because of wrong path override
-            //WebDriverManager.UpdatePath(config.pathVariable);
+            WebDriverManager.UpdatePath(config.pathVariable);
         }
     }
 }
diff --git a/WebDriverManager/Helpers/WebDriverManager.cs b/WebDriverManager/Helpers/WebDriverManager.cs
@@ -169,7 +169,9 @@ public static void AddEnvironmentVariable(string variable)
         {
             try
             {
-                Environment.SetEnvironmentVariable(variable, desticationFolder, EnvironmentVariableTarget.Machine);
+                var variableValue = Environment.GetEnvironmentVariable(variable);
+                if (variableValue == null || !variableValue.Equals(desticationFolder))
+                    Environment.SetEnvironmentVariable(variable, desticationFolder, EnvironmentVariableTarget.Machine);
             }
             catch (Exception ex)
             {
@@ -182,6 +184,7 @@ public static void AddEnvironmentVariable(string variable)
         /// Update browser driver environment variable if it's already exist and different from current
         /// </summary>
         /// <param name="variable">Environment variable</param>
+        /// NOTE: Temporary disable this functionality because of wrong path override
         public static void UpdatePath(string variable)
         {
             try
@@ -190,8 +193,8 @@ public static void UpdatePath(string variable)
                 string pathvar = Environment.GetEnvironmentVariable(name);
                 var path = pathvar + $@"%{variable}%";
 
-                if (!pathvar.Contains(desticationFolder))
-                    Environment.SetEnvironmentVariable(name, path, EnvironmentVariableTarget.Machine);
+                //if (!pathvar.Contains(desticationFolder))
+                    //Environment.SetEnvironmentVariable(name, path, EnvironmentVariableTarget.Machine);
             }
             catch (Exception ex)
             {
diff --git a/WebDriverManager/Properties/AssemblyInfo.cs b/WebDriverManager/Properties/AssemblyInfo.cs
@@ -34,5 +34,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 //[assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.2.0")]
-[assembly: AssemblyFileVersion("1.1.2.0")]
+[assembly: AssemblyVersion("1.1.3")]
+[assembly: AssemblyFileVersion("1.1.3")]

Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,7 @@ public void Base()`
`81`	`81`	`WebDriverManager.Unzip(config);`
`82`	`82`	`WebDriverManager.Clean();`
`83`	`83`	`WebDriverManager.AddEnvironmentVariable(config.pathVariable);`
`84`		`- // Temporary disable this functionality because of wrong path override`
`85`		`- //WebDriverManager.UpdatePath(config.pathVariable);`
	`84`	`+ WebDriverManager.UpdatePath(config.pathVariable);`
`86`	`85`	`}`
`87`	`86`	`}`
`88`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,7 @@ public void Base()`
`66`	`66`	`{`
`67`	`67`	`WebDriverManager.Download(config);`
`68`	`68`	`WebDriverManager.AddEnvironmentVariable(config.pathVariable);`
`69`		`- // Temporary disable this functionality because of wrong path override`
`70`		`- //WebDriverManager.UpdatePath(config.pathVariable);`
	`69`	`+ WebDriverManager.UpdatePath(config.pathVariable);`
`71`	`70`	`}`
`72`	`71`	`}`
`73`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,8 +136,7 @@ public void Base()`
`136`	`136`	`WebDriverManager.Unzip(config);`
`137`	`137`	`WebDriverManager.Clean();`
`138`	`138`	`WebDriverManager.AddEnvironmentVariable(config.pathVariable);`
`139`		`- // Temporary disable this functionality because of wrong path override`
`140`		`- //WebDriverManager.UpdatePath(config.pathVariable);`
	`139`	`+ WebDriverManager.UpdatePath(config.pathVariable);`
`141`	`140`	`}`
`142`	`141`	`}`
`143`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ public class MarionetteDriverManager : Logging, IBaseBrowserManager`
`15`	`15`	`/// </summary>`
`16`	`16`	`WebDriverManagerConfig config = new WebDriverManagerConfig`
`17`	`17`	`{`
`18`		`- binary = "wires-<version>-win.exe",`
`19`		`- url = "https://github.com/jgraham/wires/releases/download/v<version>/wires-<version>-win.zip",`
	`18`	`+ binary = "geckodriver.exe",`
	`19`	`+ url = "https://github.com/mozilla/geckodriver/releases/download/v<version>/geckodriver-v<version>-win32.zip",`
`20`	`20`	`pathVariable = "webdriver.gecko.driver",`
`21`	`21`	`architecture = Architecture.x32.ToString()`
`22`	`22`	`};`
`@@ -29,13 +29,12 @@ public string GetLatestVersion()`
`29`	`29`	`{`
`30`	`30`	`string version = null;`
`31`	`31`	`var doc = new HtmlDocument();`
`32`		`- var htmlCode = client.DownloadString("https://github.com/jgraham/wires/releases");`
	`32`	`+ var htmlCode = client.DownloadString("https://github.com/mozilla/geckodriver/releases");`
`33`	`33`	`doc.LoadHtml(htmlCode);`
`34`	`34`	`var itemList = doc.DocumentNode.SelectNodes("//*[@class='release-title']/a").Select(p => p.InnerText).ToList();`
`35`		`- version = itemList.FirstOrDefault();`
	`35`	`+ version = itemList.FirstOrDefault().Remove(0, 1);`
`36`	`36`	`if (version != null \|\| version != string.Empty)`
`37`	`37`	`{`
`38`		`- SetBinary(version);`
`39`	`38`	`Log?.Info($"Latest marionette driver version is '{version}'");`
`40`	`39`	`}`
`41`	`40`	`else`
`@@ -50,12 +49,6 @@ public string GetLatestVersion()`
`50`	`49`	`}`
`51`	`50`	`}`
`52`	`51`
`53`		`- private void SetBinary(string version)`
`54`		`- {`
`55`		`- config.binary = config.binary.Replace("<version>", version);`
`56`		`- Log?.Trace($"Update binary name to: '{config.binary}' in accordance with marionette driver version: '{version}'");`
`57`		`- }`
`58`		`-`
`59`	`52`	`public MarionetteDriverManager()`
`60`	`53`	`: base()`
`61`	`54`	`{`
`@@ -67,7 +60,6 @@ public MarionetteDriverManager(string version)`
`67`	`60`	`{`
`68`	`61`	`config.version = version;`
`69`	`62`	`Log?.Info($"Set marionette driver version to: '{version}'");`
`70`		`- SetBinary(version);`
`71`	`63`	`}`
`72`	`64`
`73`	`65`	`public void Init()`
`@@ -89,8 +81,7 @@ public void Base()`
`89`	`81`	`WebDriverManager.Unzip(config);`
`90`	`82`	`WebDriverManager.Clean();`
`91`	`83`	`WebDriverManager.AddEnvironmentVariable(config.pathVariable);`
`92`		`- // Temporary disable this functionality because of wrong path override`
`93`		`- //WebDriverManager.UpdatePath(config.pathVariable);`
	`84`	`+ WebDriverManager.UpdatePath(config.pathVariable);`
`94`	`85`	`}`
`95`	`86`	`}`
`96`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,8 +108,7 @@ public void Base()`
`108`	`108`	`WebDriverManager.Unzip(config);`
`109`	`109`	`WebDriverManager.Clean();`
`110`	`110`	`WebDriverManager.AddEnvironmentVariable(config.pathVariable);`
`111`		`- // Temporary disable this functionality because of wrong path override`
`112`		`- //WebDriverManager.UpdatePath(config.pathVariable);`
	`111`	`+ WebDriverManager.UpdatePath(config.pathVariable);`
`113`	`112`	`}`
`114`	`113`	`}`
`115`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,7 @@ public void Base()`
`78`	`78`	`WebDriverManager.Unzip(config);`
`79`	`79`	`WebDriverManager.Clean();`
`80`	`80`	`WebDriverManager.AddEnvironmentVariable(config.pathVariable);`
`81`		`- // Temporary disable this functionality because of wrong path override`
`82`		`- //WebDriverManager.UpdatePath(config.pathVariable);`
	`81`	`+ WebDriverManager.UpdatePath(config.pathVariable);`
`83`	`82`	`}`
`84`	`83`	`}`
`85`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,9 @@ public static void AddEnvironmentVariable(string variable)`
`169`	`169`	`{`
`170`	`170`	`try`
`171`	`171`	`{`
`172`		`- Environment.SetEnvironmentVariable(variable, desticationFolder, EnvironmentVariableTarget.Machine);`
	`172`	`+ var variableValue = Environment.GetEnvironmentVariable(variable);`
	`173`	`+ if (variableValue == null \|\| !variableValue.Equals(desticationFolder))`
	`174`	`+ Environment.SetEnvironmentVariable(variable, desticationFolder, EnvironmentVariableTarget.Machine);`
`173`	`175`	`}`
`174`	`176`	`catch (Exception ex)`
`175`	`177`	`{`
`@@ -182,6 +184,7 @@ public static void AddEnvironmentVariable(string variable)`
`182`	`184`	`/// Update browser driver environment variable if it's already exist and different from current`
`183`	`185`	`/// </summary>`
`184`	`186`	`/// <param name="variable">Environment variable</param>`
	`187`	`+ /// NOTE: Temporary disable this functionality because of wrong path override`
`185`	`188`	`public static void UpdatePath(string variable)`
`186`	`189`	`{`
`187`	`190`	`try`
`@@ -190,8 +193,8 @@ public static void UpdatePath(string variable)`
`190`	`193`	`string pathvar = Environment.GetEnvironmentVariable(name);`
`191`	`194`	`var path = pathvar + $@"%{variable}%";`
`192`	`195`
`193`		`- if (!pathvar.Contains(desticationFolder))`
`194`		`- Environment.SetEnvironmentVariable(name, path, EnvironmentVariableTarget.Machine);`
	`196`	`+ //if (!pathvar.Contains(desticationFolder))`
	`197`	`+ //Environment.SetEnvironmentVariable(name, path, EnvironmentVariableTarget.Machine);`
`195`	`198`	`}`
`196`	`199`	`catch (Exception ex)`
`197`	`200`	`{`