diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-08-12 22:34:01 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-08-12 22:34:01 -0700 |
| commit | ad73d24235ef22f9012b30be9d9492b11b46ca58 (patch) | |
| tree | 973a5ac0dc071200ae8aad877674e8aea7c049f4 | |
| parent | 2901fc1390370a38944cd2c1ea88bf0fd3839a5a (diff) | |
| download | gitlab-ce-ad73d24235ef22f9012b30be9d9492b11b46ca58.tar.gz | |
Bump selenium-webdriver to 3.5.0 to make Capybara work properly
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | features/support/capybara.rb | 2 | ||||
| -rw-r--r-- | spec/support/capybara.rb | 2 |
4 files changed, 5 insertions, 7 deletions
@@ -333,7 +333,7 @@ group :development, :test do gem 'capybara', '~> 2.15' gem 'capybara-screenshot', '~> 1.0.0' - gem 'selenium-webdriver', '~> 2.53' + gem 'selenium-webdriver', '~> 3.5' gem 'spring', '~> 2.0.0' gem 'spring-commands-rspec', '~> 1.0.4' diff --git a/Gemfile.lock b/Gemfile.lock index b2a0b3e17f6..f8c648319a5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -778,10 +778,9 @@ GEM activesupport (>= 3.1) select2-rails (3.5.9.3) thor (~> 0.14) - selenium-webdriver (2.53.4) + selenium-webdriver (3.5.0) childprocess (~> 0.5) rubyzip (~> 1.0) - websocket (~> 1.0) sentry-raven (2.5.3) faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) @@ -903,7 +902,6 @@ GEM hashdiff webpack-rails (0.9.10) railties (>= 3.2.0) - websocket (1.2.4) wikicloth (0.8.1) builder expression_parser @@ -1100,7 +1098,7 @@ DEPENDENCIES scss_lint (~> 0.54.0) seed-fu (~> 2.3.5) select2-rails (~> 3.5.9) - selenium-webdriver (~> 2.53) + selenium-webdriver (~> 3.5) sentry-raven (~> 2.5.3) settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) diff --git a/features/support/capybara.rb b/features/support/capybara.rb index 20abb504dc6..8628a38eaac 100644 --- a/features/support/capybara.rb +++ b/features/support/capybara.rb @@ -6,7 +6,7 @@ timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 60 : 30 Capybara.javascript_driver = :chrome Capybara.register_driver :chrome do |app| capabilities = Selenium::WebDriver::Remote::Capabilities.chrome( - 'chromeOptions' => { + chromeOptions: { 'args' => %w[headless no-sandbox disable-gpu --window-size=1240,1400] } ) diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index 693de9a3118..b5b98f19694 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -10,7 +10,7 @@ timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 60 : 30 Capybara.javascript_driver = :chrome Capybara.register_driver :chrome do |app| capabilities = Selenium::WebDriver::Remote::Capabilities.chrome( - 'chromeOptions' => { + chromeOptions: { 'args' => %w[headless no-sandbox disable-gpu --window-size=1240,1400] } ) |