aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-12-16 11:37:11 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2010-12-16 11:37:11 -0200
commit81cf98d34268546532aa763b2837b3a4c87e60e1 (patch)
tree7ac67834e1b8f9b45af39be345121436499546f1
parent14b880fd035fcdf807051398674c9aa89bd3b4d3 (diff)
downloadrails-81cf98d34268546532aa763b2837b3a4c87e60e1.tar.gz
rails-81cf98d34268546532aa763b2837b3a4c87e60e1.tar.bz2
rails-81cf98d34268546532aa763b2837b3a4c87e60e1.zip
dragdrop was tested twice and effects.js was missing, added checks for controls.js, dragdrop.js and effects.js to another test
-rw-r--r--railties/test/generators/app_generator_test.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 02c49ab241..0fe5cdc4a8 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -137,7 +137,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
assert_file "public/javascripts/rails.js"
assert_file "public/javascripts/controls.js"
assert_file "public/javascripts/dragdrop.js"
- assert_file "public/javascripts/dragdrop.js"
+ assert_file "public/javascripts/effects.js"
assert_file "test"
end
@@ -154,6 +154,9 @@ class AppGeneratorTest < Rails::Generators::TestCase
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/controls.js"
+ assert_file "public/javascripts/dragdrop.js"
+ assert_file "public/javascripts/effects.js"
assert_file "public/javascripts/rails.js", /prototype/
end