Fixes for constructing IWebDriver
This commit is contained in:
parent
f028839b5d
commit
849a0843c9
|
|
@ -2,6 +2,7 @@
|
||||||
using OpenQA.Selenium.Edge;
|
using OpenQA.Selenium.Edge;
|
||||||
using OpenQA.Selenium.Firefox;
|
using OpenQA.Selenium.Firefox;
|
||||||
using System;
|
using System;
|
||||||
|
using System.IO;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
|
|
||||||
|
|
@ -20,11 +21,20 @@ namespace Templates.Test.Helpers
|
||||||
// Where possible, it's preferable to use Edge because it's
|
// Where possible, it's preferable to use Edge because it's
|
||||||
// far faster to automate than Chrome/Firefox. But on AppVeyor
|
// far faster to automate than Chrome/Firefox. But on AppVeyor
|
||||||
// only Firefox is available.
|
// only Firefox is available.
|
||||||
var result = IsAppVeyor ? new FirefoxDriver() : (IWebDriver)new EdgeDriver();
|
var result = IsAppVeyor ? CreateFirefoxDriver() : CreateEdgeDriver();
|
||||||
result.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(1);
|
result.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(1);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static IWebDriver CreateEdgeDriver()
|
||||||
|
=> new EdgeDriver(EdgeDriverService.CreateDefaultService(BinDir));
|
||||||
|
|
||||||
|
private static IWebDriver CreateFirefoxDriver()
|
||||||
|
=> new FirefoxDriver(FirefoxDriverService.CreateDefaultService(BinDir));
|
||||||
|
|
||||||
|
private static string BinDir
|
||||||
|
=> Path.GetDirectoryName(typeof(WebDriverFactory).Assembly.Location);
|
||||||
|
|
||||||
private static int GetWindowsVersion()
|
private static int GetWindowsVersion()
|
||||||
{
|
{
|
||||||
var osDescription = RuntimeInformation.OSDescription;
|
var osDescription = RuntimeInformation.OSDescription;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue