2 files changed, 47 insertions, 8 deletions
diff --git a/activesupport/test/actionable_error_test.rb b/activesupport/test/actionable_error_test.rb
new file mode 100644
index 0000000000..63046b937c
--- /dev/null
+++ b/activesupport/test/actionable_error_test.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "abstract_unit"
+require "active_support/actionable_error"
+
+class ActionableErrorTest < ActiveSupport::TestCase
+  NonActionableError = Class.new(StandardError)
+
+  class DispatchableError < StandardError
+    include ActiveSupport::ActionableError
+
+    class_attribute :flip1, default: false
+    class_attribute :flip2, default: false
+
+    action "Flip 1" do
+      self.flip1 = true
+    end
+
+    action "Flip 2" do
+      self.flip2 = true
+    end
+  end
+
+  test "returns all action of an actionable error" do
+    assert_equal ["Flip 1", "Flip 2"], ActiveSupport::ActionableError.actions(DispatchableError).keys
+    assert_equal ["Flip 1", "Flip 2"], ActiveSupport::ActionableError.actions(DispatchableError.new).keys
+  end
+
+  test "returns no actions for non-actionable errors" do
+    assert ActiveSupport::ActionableError.actions(Exception).empty?
+    assert ActiveSupport::ActionableError.actions(Exception.new).empty?
+  end
+
+  test "dispatches actions from error and name" do
+    assert_changes "DispatchableError.flip1", from: false, to: true do
+      ActiveSupport::ActionableError.dispatch DispatchableError, "Flip 1"
+    end
+  end
+
+  test "cannot dispatch missing actions" do
+    err = assert_raises ActiveSupport::ActionableError::NonActionable do
+      ActiveSupport::ActionableError.dispatch NonActionableError, "action"
+    end
+
+    assert_equal 'Cannot find action "action"', err.to_s
+  end
+end
diff --git a/activesupport/test/deprecation/method_wrappers_test.rb b/activesupport/test/deprecation/method_wrappers_test.rb
index 18729941bc..0aa3233aab 100644
--- a/activesupport/test/deprecation/method_wrappers_test.rb
+++ b/activesupport/test/deprecation/method_wrappers_test.rb
@@ -89,12 +89,4 @@ class MethodWrappersTest < ActiveSupport::TestCase
     warning = /old_method is deprecated and will be removed from Rails \d.\d \(use new_method instead\)/
     assert_deprecated(warning) { assert_equal "abc", @klass.old_method }
   end
-
-  def test_method_with_without_deprecation_is_exposed
-    ActiveSupport::Deprecation.deprecate_methods(@klass, old_method: :new_method)
-
-    warning = /old_method is deprecated and will be removed from Rails \d.\d \(use new_method instead\)/
-    assert_deprecated(warning) { assert_equal "abc", @klass.new.old_method_with_deprecation }
-    assert_equal "abc", @klass.new.old_method_without_deprecation
-  end
 end