From ad73d24235ef22f9012b30be9d9492b11b46ca58 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sat, 12 Aug 2017 22:34:01 -0700
Subject: [PATCH] Bump selenium-webdriver to 3.5.0 to make Capybara work
properly
---
Gemfile | 2 +-
Gemfile.lock | 6 ++----
features/support/capybara.rb | 2 +-
spec/support/capybara.rb | 2 +-
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/Gemfile b/Gemfile
index 583d450ec3219..29325611fbac7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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 b2a0b3e17f6fb..f8c648319a509 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 20abb504dc63f..8628a38eaac09 100644
--- a/features/support/capybara.rb
+++ b/features/support/capybara.rb
@@ -6,7 +6,7 @@
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 693de9a31181d..b5b98f1969416 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -10,7 +10,7 @@
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]
}
)
--
GitLab