diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-10-09 17:41:00 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-10-09 17:41:00 -0700 |
commit | 1c534c6e429b6d5115153a8e83ae13e55d0ee1d3 (patch) | |
tree | 632bf64b5a6974c2e47d5300ff8d15a143133af5 /railties/test/generators/controller_generator_test.rb | |
parent | 0787cea3bb5e6f2c216e71090732bc55ee03c7dc (diff) | |
parent | 2a68f68aead9fd65ecac8062ca8efc15f5bab418 (diff) | |
download | rails-1c534c6e429b6d5115153a8e83ae13e55d0ee1d3.tar.gz rails-1c534c6e429b6d5115153a8e83ae13e55d0ee1d3.tar.bz2 rails-1c534c6e429b6d5115153a8e83ae13e55d0ee1d3.zip |
Merge pull request #7878 from blowmage/test_locations
Update test names and locations
Diffstat (limited to 'railties/test/generators/controller_generator_test.rb')
-rw-r--r-- | railties/test/generators/controller_generator_test.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/railties/test/generators/controller_generator_test.rb b/railties/test/generators/controller_generator_test.rb index c3fa9ebb03..5205deafd9 100644 --- a/railties/test/generators/controller_generator_test.rb +++ b/railties/test/generators/controller_generator_test.rb @@ -28,13 +28,13 @@ class ControllerGeneratorTest < Rails::Generators::TestCase def test_invokes_helper run_generator assert_file "app/helpers/account_helper.rb" - assert_file "test/unit/helpers/account_helper_test.rb" + assert_file "test/helpers/account_helper_test.rb" end def test_does_not_invoke_helper_if_required run_generator ["account", "--skip-helper"] assert_no_file "app/helpers/account_helper.rb" - assert_no_file "test/unit/helpers/account_helper_test.rb" + assert_no_file "test/helpers/account_helper_test.rb" end def test_invokes_assets @@ -45,12 +45,12 @@ class ControllerGeneratorTest < Rails::Generators::TestCase def test_invokes_default_test_framework run_generator - assert_file "test/functional/account_controller_test.rb" + assert_file "test/controllers/account_controller_test.rb" end def test_does_not_invoke_test_framework_if_required run_generator ["account", "--no-test-framework"] - assert_no_file "test/functional/account_controller_test.rb" + assert_no_file "test/controllers/account_controller_test.rb" end def test_invokes_default_template_engine |