aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/testing
diff options
context:
space:
mode:
authorYehuda Katz <wycats@Yehuda-Katz.local>2009-12-03 09:06:01 -0800
committerYehuda Katz <wycats@Yehuda-Katz.local>2009-12-03 09:06:01 -0800
commit96e0638ce2a287eb5c43266fb4eb3e656e9968cf (patch)
tree71dea7fc5d718108b96fc6af7ce4d430ebb5a453 /actionpack/lib/action_dispatch/testing
parentc1304098cca8a9247a9ad1461a1a343354650843 (diff)
downloadrails-96e0638ce2a287eb5c43266fb4eb3e656e9968cf.tar.gz
rails-96e0638ce2a287eb5c43266fb4eb3e656e9968cf.tar.bz2
rails-96e0638ce2a287eb5c43266fb4eb3e656e9968cf.zip
Should fix a few Sam Ruby fails.
Diffstat (limited to 'actionpack/lib/action_dispatch/testing')
-rw-r--r--actionpack/lib/action_dispatch/testing/performance_test.rb24
1 files changed, 13 insertions, 11 deletions
diff --git a/actionpack/lib/action_dispatch/testing/performance_test.rb b/actionpack/lib/action_dispatch/testing/performance_test.rb
index b1ed9d31f4..1b9a6c18b7 100644
--- a/actionpack/lib/action_dispatch/testing/performance_test.rb
+++ b/actionpack/lib/action_dispatch/testing/performance_test.rb
@@ -1,15 +1,17 @@
require 'active_support/testing/performance'
require 'active_support/testing/default'
-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
- include ActiveSupport::Testing::Default
+if defined?(ActiveSupport::Testing::Performance)
+ 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
+ include ActiveSupport::Testing::Default
+ end
end
-end
+end \ No newline at end of file