diff --git a/Gemfile b/Gemfile index 28b46afa..da9258eb 100644 --- a/Gemfile +++ b/Gemfile @@ -85,7 +85,8 @@ end group :test do gem "brakeman" - gem "capybara-webkit" + gem "capybara", "2.13.0" + gem "capybara-webkit", "1.14.0" gem "email_spec" gem "database_cleaner" gem "formulaic" diff --git a/Gemfile.lock b/Gemfile.lock index 6cd4062c..c2455e01 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -156,15 +156,15 @@ GEM capistrano-rails (1.4.0) capistrano (~> 3.1) capistrano-bundler (~> 1.1) - capybara (3.5.0) + capybara (2.13.0) addressable - mini_mime (>= 0.1.3) - nokogiri (~> 1.8) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - xpath (~> 3.1) - capybara-webkit (1.15.0) - capybara (>= 2.3, < 4.0) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + capybara-webkit (1.14.0) + capybara (>= 2.3.0, < 2.14.0) json case_transform (0.2) activesupport @@ -543,8 +543,8 @@ GEM will_paginate (3.1.6) will_paginate-bootstrap (1.0.1) will_paginate (>= 3.0.3) - xpath (3.1.0) - nokogiri (~> 1.8) + xpath (2.1.0) + nokogiri (~> 1.3) PLATFORMS ruby @@ -565,7 +565,8 @@ DEPENDENCIES capistrano-delayed_job capistrano-passenger capistrano-rails (~> 1.2) - capybara-webkit + capybara (= 2.13.0) + capybara-webkit (= 1.14.0) clockwork cocoon coffee-rails