Remove deprecations about ActiveSupport::Deprecation

.rubocop.yml

@@ -3,6 +3,7 @@ inherit_gem:
 
 AllCops:
   TargetRubyVersion: 2.6
+  SuggestExtensions: false
   Exclude:
     - gemfiles/vendor/**/*
 

Gemfile.lock

@@ -7,17 +7,28 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4.3)
+    activesupport (7.1.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.4)
     concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     diff-lcs (1.5.0)
-    i18n (1.12.0)
+    drb (2.2.0)
+      ruby2_keywords
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    minitest (5.15.0)
+    minitest (5.20.0)
+    mutex_m (0.2.0)
     parallel (1.21.0)
     parser (3.1.1.0)
       ast (~> 2.4.1)
@@ -52,6 +63,7 @@ GEM
     rubocop-shopify (2.5.0)
       rubocop (~> 1.25)
     ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)

lib/deprecation_toolkit/warning.rb

@@ -40,6 +40,13 @@ def handle_multipart(str)
     def deprecation_triggered?(str)
       DeprecationToolkit::Configuration.warnings_treated_as_deprecation.any? { |warning| warning =~ str }
     end
+
+    def deprecator
+      @deprecator ||= ActiveSupport::Deprecation.new("next", "DeprecationToolkit::Warning").tap do |deprecator|
+        deprecator.behavior = :notify
+        DeprecationSubscriber.attach_to(:deprecation_toolkit_warning)
+      end
+    end
   end
 end
 
@@ -50,7 +57,7 @@ def warn(str)
       return unless str
 
       if DeprecationToolkit::Warning.deprecation_triggered?(str)
-        ActiveSupport::Deprecation.warn(str)
+        DeprecationToolkit::Warning.deprecator.warn(str)
       else
         super
       end

spec/deprecation_toolkit/behaviors/raise_spec.rb

@@ -3,6 +3,8 @@
 require "spec_helper"
 
 RSpec.describe(DeprecationToolkit::Behaviors::Raise) do
+  include TestDeprecator
+
   before do
     @previous_configuration = DeprecationToolkit::Configuration.behavior
     DeprecationToolkit::Configuration.behavior = DeprecationToolkit::Behaviors::Raise
@@ -14,41 +16,41 @@
 
   it ".trigger raises an DeprecationIntroduced error when deprecations are introduced" do |example|
     expect do
-      ActiveSupport::Deprecation.warn("Foo")
-      ActiveSupport::Deprecation.warn("Bar")
+      deprecator.warn("Foo")
+      deprecator.warn("Bar")
 
       DeprecationToolkit::TestTriggerer.trigger_deprecation_toolkit_behavior(example)
     end.to(raise_error(DeprecationToolkit::Behaviors::DeprecationIntroduced))
   end
 
   it ".trigger raises a DeprecationRemoved error when deprecations are removed" do |example|
     expect do
-      ActiveSupport::Deprecation.warn("Foo")
+      deprecator.warn("Foo")
 
       DeprecationToolkit::TestTriggerer.trigger_deprecation_toolkit_behavior(example)
     end.to(raise_error(DeprecationToolkit::Behaviors::DeprecationRemoved))
   end
 
   it ".trigger raises a DeprecationRemoved when mismatched and less than expected" do |example|
     expect do
-      ActiveSupport::Deprecation.warn("C")
+      deprecator.warn("C")
 
       DeprecationToolkit::TestTriggerer.trigger_deprecation_toolkit_behavior(example)
     end.to(raise_error(DeprecationToolkit::Behaviors::DeprecationRemoved))
   end
 
   it ".trigger raises a DeprecationMismatch when same number of deprecations are triggered with mismatches" do |example|
     expect do
-      ActiveSupport::Deprecation.warn("A")
+      deprecator.warn("A")
 
       DeprecationToolkit::TestTriggerer.trigger_deprecation_toolkit_behavior(example)
     end.to(raise_error(DeprecationToolkit::Behaviors::DeprecationMismatch))
   end
 
   it ".trigger does not raise when deprecations are triggered but were already recorded" do |example|
     expect do
-      ActiveSupport::Deprecation.warn("Foo")
-      ActiveSupport::Deprecation.warn("Bar")
+      deprecator.warn("Foo")
+      deprecator.warn("Bar")
 
       DeprecationToolkit::TestTriggerer.trigger_deprecation_toolkit_behavior(example)
     end.not_to(raise_error)
@@ -59,7 +61,7 @@
     DeprecationToolkit::Configuration.allowed_deprecations = [/John Doe/]
 
     begin
-      ActiveSupport::Deprecation.warn("John Doe")
+      deprecator.warn("John Doe")
       expect do
         DeprecationToolkit::TestTriggerer.trigger_deprecation_toolkit_behavior(example)
       end.not_to(raise_error)
@@ -75,7 +77,7 @@ def deprecation_caller
       end
 
       def deprecation_callee
-        ActiveSupport::Deprecation.warn("John Doe")
+        deprecator.warn("John Doe")
       end
     RUBY
 

spec/deprecation_toolkit/behaviors/record_spec.rb

@@ -4,6 +4,8 @@
 require "tmpdir"
 
 RSpec.describe(DeprecationToolkit::Behaviors::Record) do
+  include TestDeprecator
+
   before do
     @previous_deprecation_path = DeprecationToolkit::Configuration.deprecation_path
     @deprecation_path = Dir.mktmpdir
@@ -20,31 +22,31 @@
 
   it ".trigger should record deprecations" do |example|
     expect_deprecations_recorded("Foo", "Bar", example) do
-      ActiveSupport::Deprecation.warn("Foo")
-      ActiveSupport::Deprecation.warn("Bar")
+      deprecator.warn("Foo")
+      deprecator.warn("Bar")
 
       DeprecationToolkit::TestTriggerer.trigger_deprecation_toolkit_behavior(example)
     end
   end
 
   it ".trigger re-record an existing deprecation file" do |example|
     expect_deprecations_recorded("Foo", "Bar", example) do
-      ActiveSupport::Deprecation.warn("Foo")
-      ActiveSupport::Deprecation.warn("Bar")
+      deprecator.warn("Foo")
+      deprecator.warn("Bar")
 
       DeprecationToolkit::TestTriggerer.trigger_deprecation_toolkit_behavior(example)
     end
 
     expect_deprecations_recorded("Foo", example) do
-      ActiveSupport::Deprecation.warn("Foo")
+      deprecator.warn("Foo")
 
       DeprecationToolkit::TestTriggerer.trigger_deprecation_toolkit_behavior(example)
     end
   end
 
   it ".trigger removes the deprecation file when all deprecations were removed" do |example|
     expect_deprecations_recorded("Foo", example) do
-      ActiveSupport::Deprecation.warn("Foo")
+      deprecator.warn("Foo")
 
       DeprecationToolkit::TestTriggerer.trigger_deprecation_toolkit_behavior(example)
     end

spec/spec_helper.rb

@@ -4,10 +4,10 @@
 require "deprecation_toolkit"
 require "deprecation_toolkit/rspec_plugin"
 require "active_support/all"
+require_relative "../test/support/test_deprecator"
 
 DeprecationToolkit::Configuration.test_runner = :rspec
 DeprecationToolkit::Configuration.deprecation_path = "spec/deprecations"
-ActiveSupport::Deprecation.behavior = :silence
 
 RSpec.configure do |config|
   # Disable RSpec exposing methods globally on `Module` and `main`

test/deprecation_toolkit/behaviors/ci_record_helper_test.rb

@@ -27,17 +27,19 @@ class CIRecordHelperTest < ActiveSupport::TestCase
         ci_output = +""
         ci_output << "random stuff generated by CI, this should be filtered out by the Rake Task\n"
 
-        MyTest = Class.new(MiniTest::Test) do
+        MyTest = Class.new(::Minitest::Test) do
+          include TestDeprecator
+
           def self.name
             "MyTest"
           end
 
           def test_generate_deprecation
-            ActiveSupport::Deprecation.warn("Foo")
+            deprecator.warn("Foo")
           end
 
           def test_generate_second_deprecation
-            ActiveSupport::Deprecation.warn("Bar")
+            deprecator.warn("Bar")
           end
         end
 

test/deprecation_toolkit/behaviors/raise_test.rb

@@ -5,6 +5,8 @@
 module DeprecationToolkit
   module Behaviors
     class RaiseTest < ActiveSupport::TestCase
+      include TestDeprecator
+
       setup do
         @previous_configuration = Configuration.behavior
         Configuration.behavior = Raise
@@ -19,8 +21,8 @@ class RaiseTest < ActiveSupport::TestCase
         @expected_exception_message =
           /DEPRECATION\ WARNING\:\ Foo\ \(called\ from\ .*\nDEPRECATION\ WARNING\:\ Bar\ \(called from\ .*/
 
-        ActiveSupport::Deprecation.warn("Foo")
-        ActiveSupport::Deprecation.warn("Bar")
+        deprecator.warn("Foo")
+        deprecator.warn("Bar")
       end
 
       test ".trigger raises a DeprecationRemoved error when deprecations are removed" do
@@ -33,7 +35,7 @@ class RaiseTest < ActiveSupport::TestCase
           DEPRECATION WARNING: Bar
         EOM
 
-        ActiveSupport::Deprecation.warn("Foo")
+        deprecator.warn("Foo")
       end
 
       test ".trigger raises a DeprecationRemoved when less deprecations than expected are triggerd and mismatches" do
@@ -47,7 +49,7 @@ class RaiseTest < ActiveSupport::TestCase
           DEPRECATION WARNING: B
         EOM
 
-        ActiveSupport::Deprecation.warn("C")
+        deprecator.warn("C")
       end
 
       test ".trigger raises a DeprecationMismatch when same number of deprecations are triggered with mismatches" do
@@ -64,13 +66,13 @@ class RaiseTest < ActiveSupport::TestCase
           DEPRECATION WARNING: A
         EOM
 
-        ActiveSupport::Deprecation.warn("A")
+        deprecator.warn("A")
       end
 
       test ".trigger does not raise when deprecations are triggered but were already recorded" do
         assert_nothing_raised do
-          ActiveSupport::Deprecation.warn("Foo")
-          ActiveSupport::Deprecation.warn("Bar")
+          deprecator.warn("Foo")
+          deprecator.warn("Bar")
         end
       end
 
@@ -79,7 +81,7 @@ class RaiseTest < ActiveSupport::TestCase
         Configuration.allowed_deprecations = [/John Doe/]
 
         begin
-          ActiveSupport::Deprecation.warn("John Doe")
+          deprecator.warn("John Doe")
           assert_nothing_raised { trigger_deprecation_toolkit_behavior }
         ensure
           Configuration.allowed_deprecations = @old_allowed_deprecations
@@ -93,7 +95,9 @@ def deprecation_caller
           end
 
           def deprecation_callee
-            ActiveSupport::Deprecation.warn("John Doe")
+            deprecator = ActiveSupport::Deprecation.new
+            deprecator.behavior = :notify
+            deprecator.warn("John Doe")
           end
         RUBY
 
@@ -112,8 +116,8 @@ def deprecation_callee
 
       test ".trigger does not raise when test is flaky" do
         assert_nothing_raised do
-          ActiveSupport::Deprecation.warn("Foo")
-          ActiveSupport::Deprecation.warn("Bar")
+          deprecator.warn("Foo")
+          deprecator.warn("Bar")
         end
       end
 

test/deprecation_toolkit/behaviors/record_test.rb

@@ -6,6 +6,8 @@
 module DeprecationToolkit
   module Behaviors
     class RecordTest < ActiveSupport::TestCase
+      include TestDeprecator
+
       setup do
         @previous_deprecation_path = Configuration.deprecation_path
         @deprecation_path = Dir.mktmpdir
@@ -22,8 +24,8 @@ class RecordTest < ActiveSupport::TestCase
 
       test ".trigger record deprecations" do
         assert_deprecations_recorded("Foo", "Bar") do
-          ActiveSupport::Deprecation.warn("Foo")
-          ActiveSupport::Deprecation.warn("Bar")
+          deprecator.warn("Foo")
+          deprecator.warn("Bar")
 
           trigger_deprecation_toolkit_behavior
         end
@@ -35,7 +37,7 @@ class RecordTest < ActiveSupport::TestCase
         end
 
         assert_deprecations_recorded("Foo", to: "#{@deprecation_path}/prefix") do
-          ActiveSupport::Deprecation.warn("Foo")
+          deprecator.warn("Foo")
 
           trigger_deprecation_toolkit_behavior
         end
@@ -55,22 +57,22 @@ class RecordTest < ActiveSupport::TestCase
 
       test ".trigger re-record an existing deprecation file" do
         assert_deprecations_recorded("Foo", "Bar") do
-          ActiveSupport::Deprecation.warn("Foo")
-          ActiveSupport::Deprecation.warn("Bar")
+          deprecator.warn("Foo")
+          deprecator.warn("Bar")
 
           trigger_deprecation_toolkit_behavior
         end
 
         assert_deprecations_recorded("Foo") do
-          ActiveSupport::Deprecation.warn("Foo")
+          deprecator.warn("Foo")
 
           trigger_deprecation_toolkit_behavior
         end
       end
 
       test ".trigger removes the deprecation file when all deprecations were removed" do
         assert_deprecations_recorded("Foo") do
-          ActiveSupport::Deprecation.warn("Foo")
+          deprecator.warn("Foo")
 
           trigger_deprecation_toolkit_behavior
         end

test/deprecation_toolkit/warning_test.rb

@@ -59,8 +59,10 @@ class WarningTest < ActiveSupport::TestCase
     end
 
     test "warn works as usual when no warnings are treated as deprecation" do
-      assert_nothing_raised do
-        warn "Test warn works correctly"
+      capture_io do
+        assert_nothing_raised do
+          warn "Test warn works correctly"
+        end
       end
     end