Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Edge support #265

Merged
merged 2 commits into from
May 18, 2016
Merged

Edge support #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23def66
edge support that does not work but should
lefthandedgoat May 18, 2016
8cca83b
edge -> edgeBETA
lefthandedgoat May 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/canopy/canopy.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ let mutable searchedFor : (string * string) list = []
let firefox = Firefox
let aurora = FirefoxWithPath(@"C:\Program Files (x86)\Aurora\firefox.exe")
let ie = IE
let edgeBETA = EdgeBETA
let chrome = Chrome
let phantomJS = PhantomJS
let safari = Safari
Expand Down Expand Up @@ -689,6 +690,7 @@ let start b =
| IE -> new IE.InternetExplorerDriver(ieDir) :> IWebDriver
| IEWithOptions options -> new IE.InternetExplorerDriver(ieDir, options) :> IWebDriver
| IEWithOptionsAndTimeSpan(options, timeSpan) -> new IE.InternetExplorerDriver(ieDir, options, timeSpan) :> IWebDriver
| EdgeBETA -> new Edge.EdgeDriver(edgeDir) :> IWebDriver
| Chrome ->
let options = OpenQA.Selenium.Chrome.ChromeOptions()
options.AddArgument("test-type") //https://code.google.com/p/chromedriver/issues/detail?id=799
Expand Down
2 changes: 2 additions & 0 deletions src/canopy/configuration.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ let mutable chromeDir = folderByOSType
let mutable ieDir = folderByOSType
let mutable phantomJSDir = folderByOSType
let mutable safariDir = folderByOSType
let mutable edgeDir = @"C:\Program Files (x86)\Microsoft Web Driver\"

let mutable elementTimeout = 10.0
let mutable compareTimeout = 10.0
let mutable pageTimeout = 10.0
Expand Down
1 change: 1 addition & 0 deletions src/canopy/reporters.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ type LiveHtmlReporter(browser : BrowserStartMode, driverPath : string, ?pinBrows
| IE -> new OpenQA.Selenium.IE.InternetExplorerDriver(driverPath) :> IWebDriver
| IEWithOptions options ->new OpenQA.Selenium.IE.InternetExplorerDriver(driverPath, options) :> IWebDriver
| IEWithOptionsAndTimeSpan(options, timeSpan) -> new OpenQA.Selenium.IE.InternetExplorerDriver(driverPath, options, timeSpan) :> IWebDriver
| EdgeBETA -> new OpenQA.Selenium.Edge.EdgeDriver(driverPath) :> IWebDriver
| Chrome ->
let options = OpenQA.Selenium.Chrome.ChromeOptions()
options.AddArgument("test-type") //https://code.google.com/p/chromedriver/issues/detail?id=799
Expand Down
1 change: 1 addition & 0 deletions src/canopy/types.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ type BrowserStartMode =
| IE
| IEWithOptions of IE.InternetExplorerOptions
| IEWithOptionsAndTimeSpan of IE.InternetExplorerOptions * TimeSpan
| EdgeBETA
| Chrome
| ChromeWithOptions of Chrome.ChromeOptions
| ChromeWithOptionsAndTimeSpan of Chrome.ChromeOptions * TimeSpan
Expand Down
2 changes: 0 additions & 2 deletions tests/basictests/Program.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,8 +755,6 @@ let createTestSuite contextName n =

[1..n] |> Seq.iter createTest

start chrome

createTestSuite "Add test performance" 1000

run ()
Expand Down