Browse files

Merge pull request #2620 from cesario/3-1-0

Fix CI and rename 1 misleading test case.
  • Loading branch information...
1 parent d7bef0a commit d81fe8d74ef138e2a72082e953f4cb020e556dd0 @spastorino spastorino committed Aug 21, 2011
Showing with 2 additions and 2 deletions.
  1. +1 −1 railties/lib/rails/generators/app_base.rb
  2. +1 −1 railties/test/generators/app_generator_test.rb
View
2 railties/lib/rails/generators/app_base.rb
@@ -131,7 +131,7 @@ def include_all_railties?
end
def comment_if(value)
- options[value] ? '#' : ''
+ options[value] ? '# ' : ''
end
def rails_gemfile_entry
View
2 railties/test/generators/app_generator_test.rb
@@ -174,7 +174,7 @@ def test_generator_if_skip_active_record_is_given
assert_file "test/performance/browsing_test.rb"
end
- 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\/railtie["']/, content)

0 comments on commit d81fe8d

Please sign in to comment.