aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-07-17 05:22:48 +0800
committerAaron Patterson <aaron.patterson@gmail.com>2010-07-17 05:53:18 +0800
commit38f1ea8fe267947f4baf832d3b15ee5b83f18f71 (patch)
tree95d128960d2067f27ba4388c54079cb8e444839c /railties/test
parent42be67e8d4470b0bdc6ba62fceaa6cdb1c21a097 (diff)
downloadrails-38f1ea8fe267947f4baf832d3b15ee5b83f18f71.tar.gz
rails-38f1ea8fe267947f4baf832d3b15ee5b83f18f71.tar.bz2
rails-38f1ea8fe267947f4baf832d3b15ee5b83f18f71.zip
Makes test use the new config.action_view.javascript_expansions[:defaults] initialization syntax
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/generators/app_generator_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 9d7a976afd..7018816af0 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -138,7 +138,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
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 "config/application.rb", /^\s+config\.action_view\.javascript_expansions\[:defaults\]\s+=\s+%w\(\)/
assert_file "public/javascripts/application.js"
assert_no_file "public/javascripts/prototype.js"
assert_no_file "public/javascripts/rails.js"