Reduce warning messages when running Active Support tests

Eliminate the warnings generated by redefining methods and constants.

2 files changed, 8 insertions, 2 deletions

diff --git a/activesupport/lib/active_support/testing/performance/ruby.rb b/activesupport/lib/active_support/testing/performance/ruby.rb
index 1104fc0a03..12aef0d7fe 100644
--- a/activesupport/lib/active_support/testing/performance/ruby.rb
+++ b/activesupport/lib/active_support/testing/performance/ruby.rb
@@ -18,6 +18,7 @@ module ActiveSupport
         end).freeze
 
       protected
+        remove_method :run_gc
         def run_gc
           GC.start
         end
@@ -28,6 +29,7 @@ module ActiveSupport
           @supported = @metric.measure_mode rescue false
         end
 
+        remove_method :run
         def run
           return unless @supported
 
@@ -39,6 +41,7 @@ module ActiveSupport
           @total = @data.threads.sum(0) { |thread| thread.methods.max.total_time }
         end
 
+        remove_method :record
         def record
           return unless @supported
 
@@ -78,6 +81,7 @@ module ActiveSupport
             self.class::Mode
           end
 
+          remove_method :profile
           def profile
             RubyProf.resume
             yield
@@ -86,6 +90,7 @@ module ActiveSupport
           end
 
           protected
+            remove_method :with_gc_stats
             def with_gc_stats
               GC::Profiler.enable
               GC.start
diff --git a/activesupport/test/core_ext/kernel_test.rb b/activesupport/test/core_ext/kernel_test.rb
index e90b9d454f..99e4506be7 100644
--- a/activesupport/test/core_ext/kernel_test.rb
+++ b/activesupport/test/core_ext/kernel_test.rb
@@ -96,15 +96,16 @@ class KernelDebuggerTest < ActiveSupport::TestCase
   end
 
   def test_debugger_not_available_message_to_rails_logger
+    Object.send(:remove_const, :Rails) if Object.const_defined?(:Rails)
     rails = Class.new do
       def self.logger
         @logger ||= MockStdErr.new
       end
     end
-    Object.const_set("Rails", rails)
+    Object.const_set(:Rails, rails)
     debugger
     assert_match(/Debugger requested/, rails.logger.output.first)
   ensure
-    Object.send(:remove_const, "Rails")
+    Object.send(:remove_const, :Rails)
   end
 end