diff options
| author | Thomas Walpole <twalpole@gmail.com> | 2018-03-05 17:44:39 -0800 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2018-03-05 17:44:39 -0800 |
| commit | 207536c063d011ae6554fec3f50037eebf59387c (patch) | |
| tree | 6d0d22de7fb4c7be1774fe95eb359af8ecbd69b7 | |
| parent | 6c82b6c99d86f37e61f935fb342cccd725d6c7d4 (diff) | |
| download | rails-207536c063d011ae6554fec3f50037eebf59387c.tar.gz rails-207536c063d011ae6554fec3f50037eebf59387c.tar.bz2 rails-207536c063d011ae6554fec3f50037eebf59387c.zip | |
Allow Capybara 3.x (#32151)
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/system_test_case.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile.tt | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -13,7 +13,7 @@ gem "rake", ">= 11.1" # be loaded after loading the test library. gem "mocha", require: false -gem "capybara", "~> 2.15" +gem "capybara", ">= 2.15", "< 4.0" gem "rack-cache", "~> 1.2" gem "coffee-rails" diff --git a/actionpack/lib/action_dispatch/system_test_case.rb b/actionpack/lib/action_dispatch/system_test_case.rb index f85f816bb9..d06ff0c804 100644 --- a/actionpack/lib/action_dispatch/system_test_case.rb +++ b/actionpack/lib/action_dispatch/system_test_case.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -gem "capybara", "~> 2.15" +gem "capybara", ">= 2.15", "< 4.0" require "capybara/dsl" require "capybara/minitest" diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile.tt b/railties/lib/rails/generators/rails/app/templates/Gemfile.tt index 23bb89f4ce..89263070ef 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile.tt +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile.tt @@ -69,7 +69,7 @@ end <%- if depends_on_system_test? -%> group :test do # Adds support for Capybara system testing and selenium driver - gem 'capybara', '~> 2.15' + gem 'capybara', '>= 2.15', '< 4.0' gem 'selenium-webdriver' # Easy installation and use of chromedriver to run system tests with Chrome gem 'chromedriver-helper' |