move "check for ruby-prof" from AD/testing/performance_test to AS/testing/performance, where it is actually required

1 files changed, 9 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..465bf40568 100644
--- a/actionpack/lib/action_dispatch/testing/performance_test.rb
+++ b/actionpack/lib/action_dispatch/testing/performance_test.rb
@@ -1,17 +1,13 @@
 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.
+  #
+  # 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
-rescue NameError
-  $stderr.puts "Specify ruby-prof as application's dependency in Gemfile to run benchmarks."
 end