Skip to content

Commit

Permalink
Upgrade selenium
Browse files Browse the repository at this point in the history
  • Loading branch information
CloCkWeRX committed Jul 17, 2017
1 parent ed66c7f commit 8ea81ec
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -66,7 +66,7 @@ end

group :test do
gem 'capybara'
gem 'selenium-webdriver', '< 3.0.0'
gem 'selenium-webdriver'
gem 'database_cleaner'
gem "acts_as_fu"
gem 'zeus' unless ENV["CI"]
Expand Down
6 changes: 2 additions & 4 deletions Gemfile.lock
Expand Up @@ -339,10 +339,9 @@ GEM
ffi-compiler (>= 1.0, < 2.0)
select2-rails (4.0.3)
thor (~> 0.14)
selenium-webdriver (2.53.4)
selenium-webdriver (3.4.4)
childprocess (~> 0.5)
rubyzip (~> 1.0)
websocket (~> 1.0)
shellany (0.0.1)
simple_form (3.5.0)
actionpack (> 4, < 5.2)
Expand Down Expand Up @@ -383,7 +382,6 @@ GEM
unicorn (5.3.0)
kgio (~> 2.6)
raindrops (~> 0.7)
websocket (1.2.4)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
Expand Down Expand Up @@ -455,7 +453,7 @@ DEPENDENCIES
sass
sass-rails
select2-rails
selenium-webdriver (< 3.0.0)
selenium-webdriver
simple_form
sprockets-rails (>= 3.0.0)
therubyracer
Expand Down
4 changes: 4 additions & 0 deletions spec/features/support/browser.rb
Expand Up @@ -10,6 +10,10 @@
Capybara.register_driver :selenium do |app|
Capybara::Selenium::Driver.new(app, browser: :chrome)
end
else
Capybara.register_driver :selenium do |app|
Capybara::Selenium::Driver.new(app, browser: :firefox, desired_capabilities: Selenium::WebDriver::Remote::Capabilities.firefox(marionette: false))
end
end

#
Expand Down

0 comments on commit 8ea81ec

Please sign in to comment.