Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Don't create test/performance/test_helper.rb. Just require the needed…

… files from test directly. [#1135 state:resolved]
  • Loading branch information...
commit 5384ba3081745ea44481750e6471e4dcaa8d1a93 1 parent 47be090
@lifo lifo authored
View
3  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
View
2  railties/helpers/performance_test_helper.rb
@@ -1,2 +0,0 @@
-require 'test_helper'
-require 'performance_test_help'
View
1  railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -50,7 +50,6 @@ def manifest
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
View
3  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.
Please sign in to comment.
Something went wrong with that request. Please try again.