Permalink
Browse files

Fix the app_generator and plugin_new tests

  • Loading branch information...
rafaelfranca committed Oct 18, 2012
1 parent 55d153e commit 12fb9372bf75d73481b3323b2c84d1851f5d6304
Showing with 4 additions and 1 deletion.
  1. +3 −0 railties/lib/rails/generators/app_base.rb
  2. +1 −1 railties/test/generators/app_generator_test.rb
@@ -138,19 +138,22 @@ def comment_if(value)
end
def rails_gemfile_entry
+ # TODO remove sprockets-rails from this list when the version 2.0 is realease
if options.dev?
<<-GEMFILE.strip_heredoc
gem 'rails', path: '#{Rails::Generators::RAILS_DEV_PATH}'
gem 'journey', github: 'rails/journey'
gem 'arel', github: 'rails/arel'
gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_finders'
+ gem 'sprockets-rails', github: 'rails/sprockets-rails'
GEMFILE
elsif options.edge?
<<-GEMFILE.strip_heredoc
gem 'rails', github: 'rails/rails'
gem 'journey', github: 'rails/journey'
gem 'arel', github: 'rails/arel'
gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_finders'
+ gem 'sprockets-rails', github: 'rails/sprockets-rails'
GEMFILE
else
<<-GEMFILE.strip_heredoc
@@ -223,7 +223,7 @@ def test_generator_if_skip_active_record_is_given
def test_generator_if_skip_sprockets_is_given
run_generator [destination_root, "--skip-sprockets"]
assert_file "config/application.rb" do |content|
- assert_match(/#\s+require\s+["']sprockets\/rails\/railtie["']/, content)
+ assert_match(/#\s+require\s+["']sprockets\/railtie["']/, content)
assert_no_match(/config\.assets\.enabled = true/, content)
end
assert_file "Gemfile" do |content|

0 comments on commit 12fb937

Please sign in to comment.