From 4c3bbc473d299dcb7b97a8db1c20abbaffdfcf8e Mon Sep 17 00:00:00 2001 From: Thomas Walpole Date: Fri, 2 Aug 2019 09:42:14 -0700 Subject: [PATCH] Use EdgeChrome dev version --- gemfiles/Gemfile.chrome_edge | 2 +- spec/selenium_spec_edge.rb | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/gemfiles/Gemfile.chrome_edge b/gemfiles/Gemfile.chrome_edge index d4d93cbb..82e70640 100644 --- a/gemfiles/Gemfile.chrome_edge +++ b/gemfiles/Gemfile.chrome_edge @@ -6,7 +6,7 @@ gemspec path: '..' gem 'xpath', github: 'teamcapybara/xpath' gem 'selenium-webdriver', github: 'seleniumhq/selenium', glob: 'rb/*.gemspec' -gem 'webdrivers', github: 'titusfortner/webdrivers', branch: 'edge_chrome' +gem 'webdrivers', github: 'titusfortner/webdrivers' gem 'rack', github: 'rack/rack' gem 'sinatra', github: 'sinatra/sinatra', branch: 'master' diff --git a/spec/selenium_spec_edge.rb b/spec/selenium_spec_edge.rb index a8e9901f..3c1e12cc 100644 --- a/spec/selenium_spec_edge.rb +++ b/spec/selenium_spec_edge.rb @@ -6,16 +6,19 @@ require 'shared_selenium_session' require 'shared_selenium_node' require 'rspec/shared_spec_matchers' -unless ENV['CI'] - Selenium::WebDriver::Edge::Service.driver_path = '/usr/local/bin/msedgedriver' - Selenium::WebDriver::EdgeChrome.path = '/Applications/Microsoft Edge Canary.app/Contents/MacOS/Microsoft Edge Canary' -end +# unless ENV['CI'] + # Selenium::WebDriver::Edge::Service.driver_path = '/usr/local/bin/msedgedriver' +# end -Webdrivers::Edgedriver.required_version = '76.0.168' if ENV['CI'] +if ::Selenium::WebDriver::Platform.mac? + Selenium::WebDriver::EdgeChrome.path = '/Applications/Microsoft Edge Dev.app/Contents/MacOS/Microsoft Edge Dev' +end Capybara.register_driver :selenium_edge do |app| # ::Selenium::WebDriver.logger.level = "debug" - Capybara::Selenium::Driver.new(app, browser: :edge_chrome).tap do |driver| + # If we don't create an options object the path set above won't be used + browser_options = ::Selenium::WebDriver::EdgeChrome::Options.new + Capybara::Selenium::Driver.new(app, browser: :edge_chrome, options: browser_options).tap do |driver| driver.browser driver.download_path = Capybara.save_path end