aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2010-01-30 14:22:21 -0600
committerJoshua Peek <josh@joshpeek.com>2010-01-30 14:39:59 -0600
commite0d4e5f345306358d6aa7942e25bb805ff1d5bfa (patch)
tree64be60c3e5d6f631c3a51c3d591a118c6b5b8806 /railties/test
parentec057ada07a20d943904d55f0dc9690e8ee50826 (diff)
downloadrails-e0d4e5f345306358d6aa7942e25bb805ff1d5bfa.tar.gz
rails-e0d4e5f345306358d6aa7942e25bb805ff1d5bfa.tar.bz2
rails-e0d4e5f345306358d6aa7942e25bb805ff1d5bfa.zip
Revert "Drop JS scripts from core"
This reverts commit a06c47a52b90a5d812e64309488ad5926dc583ca.
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/generators/app_generator_test.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 02ca8a3375..f821f5caf3 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -86,13 +86,15 @@ class AppGeneratorTest < Rails::Generators::TestCase
assert_file "config/boot.rb", /# require "active_record\/railtie"/
end
- def test_test_unit_is_added_by_default
+ def test_prototype_and_test_unit_are_added_by_default
run_generator
+ assert_file "public/javascripts/prototype.js"
assert_file "test"
end
- def test_test_unit_is_skipped_if_required
- run_generator [destination_root, "--skip-testunit"]
+ def test_prototype_and_test_unit_are_skipped_if_required
+ run_generator [destination_root, "--skip-prototype", "--skip-testunit"]
+ assert_no_file "public/javascripts/prototype.js"
assert_no_file "test"
end