aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails_generator/generators/components
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2008-10-21 14:29:41 +0100
committerPratik Naik <pratiknaik@gmail.com>2008-10-21 14:29:41 +0100
commitfa09de351c8045c7e7a0f268188ccf80c827b079 (patch)
tree529922eaddfb5575d026f214bb84b9cd5a022d23 /railties/lib/rails_generator/generators/components
parentd2f3bddaebc0d52fd4df1392c87c84333612c531 (diff)
parenta5cdb7a813515fa0cbee23101d2f911b4017ed90 (diff)
downloadrails-fa09de351c8045c7e7a0f268188ccf80c827b079.tar.gz
rails-fa09de351c8045c7e7a0f268188ccf80c827b079.tar.bz2
rails-fa09de351c8045c7e7a0f268188ccf80c827b079.zip
Merge commit 'mainstream/master'
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.