Adds application.js when app is generated with -J and clear javascript_expansions[:defaults]

1 files changed, 6 insertions, 1 deletions

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 6a3b5de9de..9d7a976afd 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -129,14 +129,19 @@ class AppGeneratorTest < Rails::Generators::TestCase
 
   def test_prototype_and_test_unit_are_added_by_default
     run_generator
+    assert_file "config/application.rb", /#\s+config\.action_view\.javascript_expansions\[:defaults\]\s+=\s+%w\(jquery rails\)/
+    assert_file "public/javascripts/application.js"
     assert_file "public/javascripts/prototype.js"
+    assert_file "public/javascripts/rails.js"
     assert_file "test"
   end
 
   def test_prototype_and_test_unit_are_skipped_if_required
     run_generator [destination_root, "--skip-prototype", "--skip-testunit"]
+    assert_file "config/application.rb", /^\s+config\.action_view\.javascript_expansions\[:defaults\]\s+=\s+\[\]/
+    assert_file "public/javascripts/application.js"
     assert_no_file "public/javascripts/prototype.js"
-    assert_file "public/javascripts"
+    assert_no_file "public/javascripts/rails.js"
     assert_no_file "test"
   end