Skip to content

Commit

Permalink
Default to installing Rails 5 dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
cbeer committed Jul 1, 2016
1 parent 50a635c commit de0f797
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
6 changes: 3 additions & 3 deletions Gemfile
Expand Up @@ -34,11 +34,11 @@ else
end
end

if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4\.2/
if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^5\.0/ || ENV['RAILS_VERSION'] == 'edge'
gem 'rspec-rails', '>= 3.5.0.beta4', '~> 3.5'
elsif ENV['RAILS_VERSION'] =~ /^4\.2/
gem 'responders', "~> 2.0"
gem 'sass-rails', ">= 5.0"
elsif ENV['RAILS_VERSION'] =~ /^5\.0/ || ENV['RAILS_VERSION'] == 'edge'
# nop
else
gem 'bootstrap-sass', '< 3.3.5' # 3.3.5 requires sass 3.3, incompatible with sass-rails 4.x
gem 'sass-rails', "< 5.0"
Expand Down
12 changes: 2 additions & 10 deletions spec/test_app_templates/Gemfile.extra
@@ -1,12 +1,4 @@

if ENV['RAILS_VERSION'] =~ /^5\.0/ || ENV['RAILS_VERSION'] == 'edge'
gem 'rails-controller-testing', github: 'rails/rails-controller-testing'
gem 'rspec-mocks', github: 'rspec/rspec-mocks' # we need 3.5.0 to be released
gem 'rspec-expectations', github: 'rspec/rspec-expectations' # we need 3.5.0 to be released
gem 'rspec-support', github: 'rspec/rspec-support' # we need 3.5.0 to be released
gem 'rspec', github: 'rspec/rspec' # we need 3.5.0 to be released
gem 'rspec-core', github: 'rspec/rspec-core' # we need 3.5.0 to be released
gem 'rspec-rails', github: 'rspec/rspec-rails' # we need 3.5.0 to be released
gem 'kaminari', github: 'amatsuda/kaminari' # need > 0.16.3
if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^5\.0/ || ENV['RAILS_VERSION'] == 'edge'
gem 'rails-controller-testing'
gem 'deprecation', github: 'jcoyne/deprecation', branch: 'no_alias_method_chain'
end

0 comments on commit de0f797

Please sign in to comment.