diff options
| author | Gonçalo Silva <goncalossilva@gmail.com> | 2010-05-28 02:37:54 +0100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-06-03 23:32:09 +1000 |
| commit | 884716564c3f84f285b58ccc786684782cee8c5a (patch) | |
| tree | c9892c219d5a572fd8c73231cccd7fd536598dcd | |
| parent | 99f8c148f08c9c520b6c40c555da5a46d8669360 (diff) | |
| download | rails-884716564c3f84f285b58ccc786684782cee8c5a.tar.gz rails-884716564c3f84f285b58ccc786684782cee8c5a.tar.bz2 rails-884716564c3f84f285b58ccc786684782cee8c5a.zip | |
performance and integration tests inherit from AD, not AC
Signed-off-by: wycats <wycats@gmail.com>
| -rw-r--r-- | railties/lib/rails/generators/test_unit/integration/templates/integration_test.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/test_unit/integration/templates/integration_test.rb b/railties/lib/rails/generators/test_unit/integration/templates/integration_test.rb index 2c57158b1c..de0823749c 100644 --- a/railties/lib/rails/generators/test_unit/integration/templates/integration_test.rb +++ b/railties/lib/rails/generators/test_unit/integration/templates/integration_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class <%= class_name %>Test < ActionController::IntegrationTest +class <%= class_name %>Test < ActionDispatch::IntegrationTest fixtures :all # Replace this with your real tests. diff --git a/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb b/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb index 362e3dc09f..e827aa918f 100644 --- a/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb +++ b/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb @@ -1,7 +1,7 @@ require 'test_helper' require 'rails/performance_test_help' -class <%= class_name %>Test < ActionController::PerformanceTest +class <%= class_name %>Test < ActionDispatch::PerformanceTest # Replace this with your real tests. def test_homepage get '/' |