aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails_generator/generators/components
diff options
context:
space:
mode:
authorRyan Bigg <radarlistener@gmail.com>2008-10-22 21:46:49 +1030
committerRyan Bigg <radarlistener@gmail.com>2008-10-22 21:46:49 +1030
commit4a53eb8a79e3e0535ba19e6da38370a542ce4961 (patch)
tree965418cb69895e44879c7b1fa428e808b91aa66a /railties/lib/rails_generator/generators/components
parenta325010d6c9b2c69cab5da046e1106aad491b73f (diff)
parent303919c62660c68ca450a53ec5ef29ec2c615b7a (diff)
downloadrails-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/components')
-rw-r--r--railties/lib/rails_generator/generators/components/performance_test/templates/performance_test.rb3
1 files changed, 2 insertions, 1 deletions
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.