aboutsummaryrefslogtreecommitdiffstats
path: root/railties/helpers
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2008-10-17 22:58:37 +0200
committerPratik Naik <pratiknaik@gmail.com>2008-10-17 22:58:37 +0200
commit5384ba3081745ea44481750e6471e4dcaa8d1a93 (patch)
tree93cc21507e666e5b8c6717a4b54a45603fea664f /railties/helpers
parent47be090d37e803af502dc4cf97930184007c660d (diff)
downloadrails-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/helpers')
-rw-r--r--railties/helpers/performance_test.rb3
-rw-r--r--railties/helpers/performance_test_helper.rb2
2 files changed, 2 insertions, 3 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'