Fix bug where custom deprecators are not used.

Add tests for ActiveSupport::Deprecation.deprecate_methods
Modify ActiveSupport::Testing::Deprecation to allow a custom deprecator
Leverage ActiveSupport::Testing::Deprecation assert_deprecated
Update documentation for ActiveSupport::Deprecation.deprecate_methods

Use cases:
Using the default deprecator => "removed from Rails X.Y"
Passing a custom deprecator in the options hash => "removed from MyGem next-release"
Deprecating methods directly from custom deprecator => "removed from MyGem next-release"

1 files changed, 34 insertions, 0 deletions

diff --git a/activesupport/test/deprecation/method_wrappers_test.rb b/activesupport/test/deprecation/method_wrappers_test.rb
new file mode 100644
index 0000000000..9a4ca2b217
--- /dev/null
+++ b/activesupport/test/deprecation/method_wrappers_test.rb
@@ -0,0 +1,34 @@
+require 'abstract_unit'
+require 'active_support/deprecation'
+
+class MethodWrappersTest < ActiveSupport::TestCase
+  def setup
+    @klass = Class.new do
+      def new_method; "abc" end
+      alias_method :old_method, :new_method
+    end
+  end
+
+  def test_deprecate_methods_warning_default
+    warning = /old_method is deprecated and will be removed from Rails \d.\d \(use new_method instead\)/
+    ActiveSupport::Deprecation.deprecate_methods(@klass, :old_method => :new_method)
+
+    assert_deprecated(warning) { assert_equal "abc", @klass.new.old_method }
+  end
+
+  def test_deprecate_methods_warning_with_optional_deprecator
+    warning = /old_method is deprecated and will be removed from MyGem next-release \(use new_method instead\)/
+    deprecator = ActiveSupport::Deprecation.new("next-release", "MyGem")
+    ActiveSupport::Deprecation.deprecate_methods(@klass, :old_method => :new_method, :deprecator => deprecator)
+
+    assert_deprecated(warning, deprecator) { assert_equal "abc", @klass.new.old_method }
+  end
+
+  def test_deprecate_methods_warning_when_deprecated_with_custom_deprecator
+    warning = /old_method is deprecated and will be removed from MyGem next-release \(use new_method instead\)/
+    deprecator = ActiveSupport::Deprecation.new("next-release", "MyGem")
+    deprecator.deprecate_methods(@klass, :old_method => :new_method)
+
+    assert_deprecated(warning, deprecator) { assert_equal "abc", @klass.new.old_method }
+  end
+end