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/application/rake_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/application/rake_test.rb')
-rw-r--r-- | railties/test/application/rake_test.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb index b05fe3aed5..2e7426150c 100644 --- a/railties/test/application/rake_test.rb +++ b/railties/test/application/rake_test.rb @@ -86,12 +86,12 @@ module ApplicationTests def test_rake_test_error_output Dir.chdir(app_path){ `rake db:migrate` } - app_file "test/unit/one_unit_test.rb", <<-RUBY - raise 'unit' + app_file "test/models/one_model_test.rb", <<-RUBY + raise 'models' RUBY - app_file "test/functional/one_functional_test.rb", <<-RUBY - raise 'functional' + app_file "test/controllers/one_controller_test.rb", <<-RUBY + raise 'controllers' RUBY app_file "test/integration/one_integration_test.rb", <<-RUBY @@ -100,8 +100,8 @@ module ApplicationTests silence_stderr do output = Dir.chdir(app_path) { `rake test 2>&1` } - assert_match 'unit', output - assert_match 'functional', output + assert_match 'models', output + assert_match 'controllers', output assert_match 'integration', output end end |