aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generators/helper_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/helper_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/helper_generator_test.rb')
-rw-r--r--railties/test/generators/helper_generator_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb
index 8da3aa61a4..81d4fcb129 100644
--- a/railties/test/generators/helper_generator_test.rb
+++ b/railties/test/generators/helper_generator_test.rb
@@ -15,7 +15,7 @@ class HelperGeneratorTest < Rails::Generators::TestCase
def test_invokes_default_test_framework
run_generator
- assert_file "test/unit/helpers/admin_helper_test.rb", /class AdminHelperTest < ActionView::TestCase/
+ assert_file "test/helpers/admin_helper_test.rb", /class AdminHelperTest < ActionView::TestCase/
end
def test_logs_if_the_test_framework_cannot_be_found