diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-10-17 22:58:37 +0200 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-10-17 22:58:37 +0200 |
| commit | 5384ba3081745ea44481750e6471e4dcaa8d1a93 (patch) | |
| tree | 93cc21507e666e5b8c6717a4b54a45603fea664f /railties | |
| parent | 47be090d37e803af502dc4cf97930184007c660d (diff) | |
| download | rails-5384ba3081745ea44481750e6471e4dcaa8d1a93.tar.gz rails-5384ba3081745ea44481750e6471e4dcaa8d1a93.tar.bz2 rails-5384ba3081745ea44481750e6471e4dcaa8d1a93.zip | |
Don't create test/performance/test_helper.rb. Just require the needed files from test directly. [#1135 state:resolved]
Diffstat (limited to 'railties')
4 files changed, 4 insertions, 5 deletions
diff --git a/railties/helpers/performance_test.rb b/railties/helpers/performance_test.rb index 7c89816570..4b60558b43 100644 --- a/railties/helpers/performance_test.rb +++ b/railties/helpers/performance_test.rb @@ -1,4 +1,5 @@ -require 'performance/test_helper' +require 'test_helper' +require 'performance_test_help' # Profiling results for each test method are written to tmp/performance. class BrowsingTest < ActionController::PerformanceTest diff --git a/railties/helpers/performance_test_helper.rb b/railties/helpers/performance_test_helper.rb deleted file mode 100644 index 1aafc7f7e5..0000000000 --- a/railties/helpers/performance_test_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'test_helper' -require 'performance_test_help' diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb index acd3dc8c8c..32c320385d 100644 --- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb +++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb @@ -50,7 +50,6 @@ class AppGenerator < Rails::Generator::Base m.template "helpers/application.rb", "app/controllers/application.rb", :assigns => { :app_name => @app_name, :app_secret => md5.hexdigest } m.template "helpers/application_helper.rb", "app/helpers/application_helper.rb" m.template "helpers/test_helper.rb", "test/test_helper.rb" - m.template "helpers/performance_test_helper.rb", "test/performance/test_helper.rb" m.template "helpers/performance_test.rb", "test/performance/browsing_test.rb" # database.yml and routes.rb diff --git a/railties/lib/rails_generator/generators/components/performance_test/templates/performance_test.rb b/railties/lib/rails_generator/generators/components/performance_test/templates/performance_test.rb index 352ff48054..27c91b0fca 100644 --- a/railties/lib/rails_generator/generators/components/performance_test/templates/performance_test.rb +++ b/railties/lib/rails_generator/generators/components/performance_test/templates/performance_test.rb @@ -1,4 +1,5 @@ -require 'performance/test_helper' +require 'test_helper' +require 'performance_test_help' class <%= class_name %>Test < ActionController::PerformanceTest # Replace this with your real tests. |