aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generators/app_generator_test.rb
diff options
context:
space:
mode:
authorMike Moore <mike@blowmage.com>2012-10-07 22:59:42 -0600
committerMike Moore <mike@blowmage.com>2012-10-09 17:53:56 -0600
commit2a68f68aead9fd65ecac8062ca8efc15f5bab418 (patch)
tree632bf64b5a6974c2e47d5300ff8d15a143133af5 /railties/test/generators/app_generator_test.rb
parent0787cea3bb5e6f2c216e71090732bc55ee03c7dc (diff)
downloadrails-2a68f68aead9fd65ecac8062ca8efc15f5bab418.tar.gz
rails-2a68f68aead9fd65ecac8062ca8efc15f5bab418.tar.bz2
rails-2a68f68aead9fd65ecac8062ca8efc15f5bab418.zip
Update test locations
Change the default test locations to avoid confusion around the common testing terms "unit" and "functional". Add new rake tasks for the new locations, while maintaining backwards compatibility with the old rake tasks. New testing locations are as follows: app/models -> test/models (was test/units) app/helpers -> test/helpers (was test/units/helpers) app/controllers -> test/controllers (was test/functional) app/mailers -> test/mailers (was test/functional)
Diffstat (limited to 'railties/test/generators/app_generator_test.rb')
-rw-r--r--railties/test/generators/app_generator_test.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 7a646626c6..91575a38b6 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -26,10 +26,12 @@ DEFAULT_APP_FILES = %w(
log
script/rails
test/fixtures
- test/functional
+ test/controllers
+ test/models
+ test/helpers
+ test/mailers
test/integration
test/performance
- test/unit
vendor
vendor/assets
tmp/cache