aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2011-05-17 14:28:40 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2011-05-17 14:28:40 -0700
commitb77e032ccf50249685c672c2d75f173db2ee2dbf (patch)
tree378cb69c599c5d0198731d1ffe6696e427ffe42c /actionpack/lib
parent1d8d799a01956525eef9bf22088c34e0d1ad4423 (diff)
parent7fcf0ca69e18841be9fb0dcce2721f4ed2c8eca9 (diff)
downloadrails-b77e032ccf50249685c672c2d75f173db2ee2dbf.tar.gz
rails-b77e032ccf50249685c672c2d75f173db2ee2dbf.tar.bz2
rails-b77e032ccf50249685c672c2d75f173db2ee2dbf.zip
Merge pull request #247 from goncalossilva/performance_test
Performance tests improved
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/testing/performance_test.rb19
1 files changed, 6 insertions, 13 deletions
diff --git a/actionpack/lib/action_dispatch/testing/performance_test.rb b/actionpack/lib/action_dispatch/testing/performance_test.rb
index e7aeb45fb3..13fe693c32 100644
--- a/actionpack/lib/action_dispatch/testing/performance_test.rb
+++ b/actionpack/lib/action_dispatch/testing/performance_test.rb
@@ -1,17 +1,10 @@
require 'active_support/testing/performance'
-begin
- module ActionDispatch
- # An integration test that runs a code profiler on your test methods.
- # Profiling output for combinations of each test method, measurement, and
- # output format are written to your tmp/performance directory.
- #
- # By default, process_time is measured and both flat and graph_html output
- # formats are written, so you'll have two output files per test method.
- class PerformanceTest < ActionDispatch::IntegrationTest
- include ActiveSupport::Testing::Performance
- end
+module ActionDispatch
+ # An integration test that runs a code profiler on your test methods.
+ # Profiling output for combinations of each test method, measurement, and
+ # output format are written to your tmp/performance directory.
+ class PerformanceTest < ActionDispatch::IntegrationTest
+ include ActiveSupport::Testing::Performance
end
-rescue NameError
- $stderr.puts "Specify ruby-prof as application's dependency in Gemfile to run benchmarks."
end