diff options
| author | Ryan Bigg <radarlistener@gmail.com> | 2008-10-22 21:46:49 +1030 |
|---|---|---|
| committer | Ryan Bigg <radarlistener@gmail.com> | 2008-10-22 21:46:49 +1030 |
| commit | 4a53eb8a79e3e0535ba19e6da38370a542ce4961 (patch) | |
| tree | 965418cb69895e44879c7b1fa428e808b91aa66a /railties/lib/rails_generator/generators | |
| parent | a325010d6c9b2c69cab5da046e1106aad491b73f (diff) | |
| parent | 303919c62660c68ca450a53ec5ef29ec2c615b7a (diff) | |
| download | rails-4a53eb8a79e3e0535ba19e6da38370a542ce4961.tar.gz rails-4a53eb8a79e3e0535ba19e6da38370a542ce4961.tar.bz2 rails-4a53eb8a79e3e0535ba19e6da38370a542ce4961.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
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. |