Merge pull request #5583 from etiennebarrie/deprecator

Use a dedicated ActiveSupport::Deprecation

test/test_helper.rb

@@ -23,6 +23,19 @@ end
 if ActiveSupport.respond_to?(:test_order)
   ActiveSupport.test_order = :random
 end
+class ActiveSupport::TestCase
+  if ActiveSupport.version < Gem::Version.new("5.0")
+    def assert_deprecated(match, deprecator)
+      super(match) do
+        behavior = deprecator.behavior
+        deprecator.behavior = ActiveSupport::Deprecation.behavior
+        yield
+      ensure
+        deprecator.behavior = behavior
+      end
+    end
+  end
+end
 
 OmniAuth.config.logger = Logger.new('/dev/null')