From 1f4dc0697e5e5af4133f5cbee54142330aab39a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Tue, 15 Mar 2016 22:10:20 +0100 Subject: [PATCH] Bump capybara et al. --- Gemfile | 6 +++--- Gemfile.lock | 15 ++++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 1389fad63c9..f97148980f3 100644 --- a/Gemfile +++ b/Gemfile @@ -158,10 +158,10 @@ group :test do gem 'rspec-activemodel-mocks', '~> 1.0.3', git: 'https://github.com/rspec/rspec-activemodel-mocks' gem 'rspec-example_disabler', git: 'https://github.com/finnlabs/rspec-example_disabler.git' gem 'rspec-legacy_formatters', require: false - gem 'capybara', '~> 2.4.4' - gem 'capybara-screenshot', '~> 1.0.4' + gem 'capybara', '~> 2.6.2' + gem 'capybara-screenshot', '~> 1.0.11' gem 'capybara-select2', github: 'goodwill/capybara-select2' - gem 'capybara-ng', '~> 0.2.1' + gem 'capybara-ng', '~> 0.2.2' gem 'selenium-webdriver', '~> 2.52.0' gem 'poltergeist' gem 'timecop', '~> 0.7.1' diff --git a/Gemfile.lock b/Gemfile.lock index 9740c8ddcd0..14e9ac03d09 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -158,15 +158,16 @@ GEM thor (~> 0.19) builder (3.2.2) byebug (8.2.2) - capybara (2.4.4) + capybara (2.6.2) + addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-ng (0.2.1) + capybara-ng (0.2.2) awesome_print (>= 1.2.0) - capybara-screenshot (1.0.9) + capybara-screenshot (1.0.11) capybara (>= 1.0, < 3) launchy carrierwave (0.10.0) @@ -589,9 +590,9 @@ DEPENDENCIES autoprefixer-rails awesome_nested_set! bourbon (~> 4.2.0) - capybara (~> 2.4.4) - capybara-ng (~> 0.2.1) - capybara-screenshot (~> 1.0.4) + capybara (~> 2.6.2) + capybara-ng (~> 0.2.2) + capybara-screenshot (~> 1.0.11) capybara-select2! carrierwave (~> 0.10.0) cocaine @@ -620,7 +621,7 @@ DEPENDENCIES jruby-openssl json_spec launchy - letter_opener (~> 1.3.0) + letter_opener livingstyleguide (~> 2.0.0.pre.1) multi_json (~> 1.11.0) mysql2 (~> 0.3.20)