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

Fix CI and rename 1 misleading test case.

railties/lib/rails/generators/app_base.rb

@@ -131,7 +131,7 @@ module Rails
       end
 
       def comment_if(value)
-        options[value] ? '#' : ''
+        options[value] ? '# ' : ''
       end
 
       def rails_gemfile_entry

railties/test/generators/app_generator_test.rb

@@ -174,7 +174,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     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)