aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRizwan Reza <rizwanreza@gmail.com>2010-03-28 15:02:17 +0430
committerRizwan Reza <rizwanreza@gmail.com>2010-03-28 15:03:25 +0430
commit835f5d0269a8d3615585119e77f1ba7d601c943b (patch)
tree0da52f2b6502ab4da97847e0f808a6b862a67483 /actionpack
parent66d57d7ba83df52ff1e0485c89f6192c2f84c6b8 (diff)
downloadrails-835f5d0269a8d3615585119e77f1ba7d601c943b.tar.gz
rails-835f5d0269a8d3615585119e77f1ba7d601c943b.tar.bz2
rails-835f5d0269a8d3615585119e77f1ba7d601c943b.zip
Rails 3 application can run performance tests now. [#4171 state:resolved]
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/testing/performance_test.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/performance_test.rb b/actionpack/lib/action_dispatch/testing/performance_test.rb
index 1b9a6c18b7..33a5c68b9d 100644
--- a/actionpack/lib/action_dispatch/testing/performance_test.rb
+++ b/actionpack/lib/action_dispatch/testing/performance_test.rb
@@ -1,7 +1,7 @@
require 'active_support/testing/performance'
require 'active_support/testing/default'
-if defined?(ActiveSupport::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
@@ -14,4 +14,6 @@ if defined?(ActiveSupport::Testing::Performance)
include ActiveSupport::Testing::Default
end
end
+rescue NameError
+ $stderr.puts "Specify ruby-prof as application's dependency in Gemfile to run benchmarks."
end \ No newline at end of file