Skip to content

Commit 8f45417

Browse files
author
Sam Phippen
committed
Fix gemfile capybara version
1 parent eb1c146 commit 8f45417

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Gemfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,12 @@ end
4040

4141

4242
# Capybara versions that support RSpec 3 only support RUBY_VERSION >= 1.9.3
43-
if RUBY_VERSION >= '1.9.3' && RAILS_VERSION < '5.1'
44-
gem 'capybara', '~> 2.2.0', :require => false
45-
else
46-
gem 'capybara', '~> 2.13', :require => false
43+
if RUBY_VERSION >= '1.9.3'
44+
if /5(\.|-)1/ === RAILS_VERSION || "master" == RAILS_VERSION
45+
gem 'capybara', '~> 2.13', :require => false
46+
else
47+
gem 'capybara', '~> 2.2.0', :require => false
48+
end
4749
end
4850

4951
# Rack::Cache 1.3.0 requires Ruby >= 2.0.0

Gemfile-rails-dependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ when nil, false, ""
3636
else
3737
gem "rails", version
3838

39-
if version >= '5.1'
39+
if version >= '5-1-stable'
4040
gem "puma"
4141
end
4242
end

0 commit comments

Comments
 (0)