1 files changed, 29 insertions, 4 deletions
diff --git a/activesupport/test/rescuable_test.rb b/activesupport/test/rescuable_test.rb
index ec9d231125..bd43ad0797 100644
--- a/activesupport/test/rescuable_test.rb
+++ b/activesupport/test/rescuable_test.rb
@@ -12,6 +12,12 @@ end
 class CoolError < StandardError
 end
 
+module WeirdError
+  def self.===(other)
+    Exception === other && other.respond_to?(:weird?)
+  end
+end
+
 class Stargate
   attr_accessor :result
 
@@ -29,6 +35,10 @@ class Stargate
     @result = e.message
   end
 
+  rescue_from WeirdError do
+    @result = 'weird'
+  end
+
   def dispatch(method)
     send(method)
   rescue Exception => e
@@ -47,6 +57,16 @@ class Stargate
     raise MadRonon.new("dex")
   end
 
+  def weird
+    StandardError.new.tap do |exc|
+      def exc.weird?
+        true
+      end
+
+      raise exc
+    end
+  end
+
   def sos
     @result = 'killed'
   end
@@ -91,15 +111,20 @@ class RescuableTest < ActiveSupport::TestCase
     assert_equal 'dex', @stargate.result
   end
 
+  def test_rescue_from_error_dispatchers_with_case_operator
+    @stargate.dispatch :weird
+    assert_equal 'weird', @stargate.result
+  end
+
   def test_rescues_defined_later_are_added_at_end_of_the_rescue_handlers_array
-    expected = ["WraithAttack", "WraithAttack", "NuclearExplosion", "MadRonon"]
-    result = @stargate.send(:rescue_handlers).collect {|e| e.first}
+    expected = ["WraithAttack", "WraithAttack", "NuclearExplosion", "MadRonon", "WeirdError"]
+    result = @stargate.send(:rescue_handlers).collect(&:first)
     assert_equal expected, result
   end
 
   def test_children_should_inherit_rescue_definitions_from_parents_and_child_rescue_should_be_appended
-    expected = ["WraithAttack", "WraithAttack", "NuclearExplosion", "MadRonon", "CoolError"]
-    result = @cool_stargate.send(:rescue_handlers).collect {|e| e.first}
+    expected = ["WraithAttack", "WraithAttack", "NuclearExplosion", "MadRonon", "WeirdError", "CoolError"]
+    result = @cool_stargate.send(:rescue_handlers).collect(&:first)
     assert_equal expected, result
   end
 end