From d21aa6de4f6d5a6a7249a43b7ba803ee45e42584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Silva?= Date: Fri, 28 May 2010 02:37:54 +0100 Subject: performance and integration tests inherit from AD, not AC Signed-off-by: wycats --- .../generators/test_unit/integration/templates/integration_test.rb | 2 +- .../generators/test_unit/performance/templates/performance_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/lib/rails') 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 '/' -- cgit v1.2.3