summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-02-28 10:49:51 -0800
committerStan Hu <stanhu@gmail.com>2018-02-28 10:51:03 -0800
commit88f99ada707538570f8b1841cc0ad312bea7277e (patch)
tree7f7fd046d51123eaa9753da8f40cfc00459524d9
parente2638c3ff2714e5efd4bc54e64555fc564c84af1 (diff)
downloadgitlab-ce-sh-bump-capybara-and-selenium.tar.gz
Update capybara, selenium-webdriver, and capybara-screenshot gemssh-bump-capybara-and-selenium
This is in preparation for bumping Chrome from V63 to a higher version.
-rw-r--r--Gemfile6
-rw-r--r--Gemfile.lock26
2 files changed, 16 insertions, 16 deletions
diff --git a/Gemfile b/Gemfile
index 6838ddbf01a..3a3671323e1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -337,9 +337,9 @@ group :development, :test do
# Generate Fake data
gem 'ffaker', '~> 2.4'
- gem 'capybara', '~> 2.15'
- gem 'capybara-screenshot', '~> 1.0.0'
- gem 'selenium-webdriver', '~> 3.5'
+ gem 'capybara', '~> 2.18'
+ gem 'capybara-screenshot', '~> 1.0'
+ gem 'selenium-webdriver', '~> 3.9'
gem 'spring', '~> 2.0.0'
gem 'spring-commands-rspec', '~> 1.0.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index 89b86ae0259..6e1cc208b95 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -104,13 +104,13 @@ GEM
bundler (~> 1.2)
thor (~> 0.18)
byebug (9.0.6)
- capybara (2.15.1)
+ capybara (2.18.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
- xpath (~> 2.0)
+ xpath (>= 2.0, < 4.0)
capybara-screenshot (1.0.14)
capybara (>= 1.0, < 3)
launchy
@@ -120,7 +120,7 @@ GEM
mime-types (>= 1.16)
cause (0.1)
charlock_holmes (0.7.5)
- childprocess (0.7.0)
+ childprocess (0.8.0)
ffi (~> 1.0, >= 1.0.11)
chronic (0.10.2)
chronic_duration (0.10.6)
@@ -499,7 +499,7 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mimemagic (0.3.0)
- mini_mime (0.1.4)
+ mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.7.0)
mousetrap-rails (1.4.6)
@@ -646,9 +646,9 @@ GEM
pry (~> 0.10)
pry-rails (0.3.5)
pry (>= 0.9.10)
- public_suffix (3.0.0)
+ public_suffix (3.0.2)
pyu-ruby-sasl (0.0.3.3)
- rack (1.6.8)
+ rack (1.6.9)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (4.4.1)
@@ -837,9 +837,9 @@ GEM
activesupport (>= 3.1)
select2-rails (3.5.9.3)
thor (~> 0.14)
- selenium-webdriver (3.5.0)
+ selenium-webdriver (3.9.0)
childprocess (~> 0.5)
- rubyzip (~> 1.0)
+ rubyzip (~> 1.2)
sentry-raven (2.5.3)
faraday (>= 0.7.6, < 1.0)
settingslogic (2.0.9)
@@ -980,8 +980,8 @@ GEM
rinku
with_env (1.1.0)
xml-simple (1.1.5)
- xpath (2.1.0)
- nokogiri (~> 1.3)
+ xpath (3.0.0)
+ nokogiri (~> 1.8)
PLATFORMS
ruby
@@ -1013,8 +1013,8 @@ DEPENDENCIES
browser (~> 2.2)
bullet (~> 5.5.0)
bundler-audit (~> 0.5.0)
- capybara (~> 2.15)
- capybara-screenshot (~> 1.0.0)
+ capybara (~> 2.18)
+ capybara-screenshot (~> 1.0)
carrierwave (~> 1.2)
charlock_holmes (~> 0.7.5)
chronic (~> 0.10.2)
@@ -1176,7 +1176,7 @@ DEPENDENCIES
scss_lint (~> 0.56.0)
seed-fu (~> 2.3.7)
select2-rails (~> 3.5.9)
- selenium-webdriver (~> 3.5)
+ selenium-webdriver (~> 3.9)
sentry-raven (~> 2.5.3)
settingslogic (~> 2.0.9)
sham_rack (~> 1.3.6)