diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-10-21 14:29:41 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-10-21 14:29:41 +0100 |
| commit | fa09de351c8045c7e7a0f268188ccf80c827b079 (patch) | |
| tree | 529922eaddfb5575d026f214bb84b9cd5a022d23 /railties/lib/rails_generator/generators | |
| parent | d2f3bddaebc0d52fd4df1392c87c84333612c531 (diff) | |
| parent | a5cdb7a813515fa0cbee23101d2f911b4017ed90 (diff) | |
| download | rails-fa09de351c8045c7e7a0f268188ccf80c827b079.tar.gz rails-fa09de351c8045c7e7a0f268188ccf80c827b079.tar.bz2 rails-fa09de351c8045c7e7a0f268188ccf80c827b079.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'railties/lib/rails_generator/generators')
| -rw-r--r-- | railties/lib/rails_generator/generators/applications/app/app_generator.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/components/performance_test/templates/performance_test.rb | 3 |
2 files changed, 2 insertions, 2 deletions
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. |