Skip to content

Commit

Permalink
Merge pull request #28995 from jcoyne/update_capybara
Browse files Browse the repository at this point in the history
Allow capybara minor releases
  • Loading branch information
matthewd committed May 8, 2017
2 parents 3f4eeb6 + 673a564 commit 943efa3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -16,7 +16,7 @@ gem "rake", ">= 11.1"
# be loaded after loading the test library.
gem "mocha", "~> 0.14", require: false

gem "capybara", "~> 2.13.0"
gem "capybara", "~> 2.13"

gem "rack-cache", "~> 1.2"
gem "jquery-rails"
Expand Down
12 changes: 6 additions & 6 deletions Gemfile.lock
Expand Up @@ -91,7 +91,7 @@ PATH
GEM
remote: https://rubygems.org/
specs:
addressable (2.5.0)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
amq-protocol (2.1.0)
ast (2.3.0)
Expand Down Expand Up @@ -125,7 +125,7 @@ GEM
bunny (2.6.2)
amq-protocol (>= 2.0.1)
byebug (9.0.6)
capybara (2.13.0)
capybara (2.14.0)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
Expand Down Expand Up @@ -226,11 +226,11 @@ GEM
mysql2 (0.4.6-x64-mingw32)
mysql2 (0.4.6-x86-mingw32)
nio4r (2.0.0)
nokogiri (1.7.0.1)
nokogiri (1.7.1)
mini_portile2 (~> 2.1.0)
nokogiri (1.7.0.1-x64-mingw32)
nokogiri (1.7.1-x64-mingw32)
mini_portile2 (~> 2.1.0)
nokogiri (1.7.0.1-x86-mingw32)
nokogiri (1.7.1-x86-mingw32)
mini_portile2 (~> 2.1.0)
parser (2.4.0.0)
ast (~> 2.2)
Expand Down Expand Up @@ -383,7 +383,7 @@ DEPENDENCIES
blade
blade-sauce_labs_plugin
byebug
capybara (~> 2.13.0)
capybara (~> 2.13)
coffee-rails
dalli (>= 2.2.1)
delayed_job
Expand Down
2 changes: 1 addition & 1 deletion railties/lib/rails/generators/rails/app/templates/Gemfile
Expand Up @@ -34,7 +34,7 @@ group :development, :test do
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
<%- if depends_on_system_test? -%>
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '~> 2.13.0'
gem 'capybara', '~> 2.13'
gem 'selenium-webdriver'
<%- end -%>
end
Expand Down

0 comments on commit 943efa3

Please sign in to comment.