display thrown object

freerange · Nov 6, 2019 · 4e32c0c · 4e32c0c
1 parent 9007a97
commit 4e32c0c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 7 deletions.
diff --git a/lib/mocha/invocation.rb b/lib/mocha/invocation.rb
@@ -1,6 +1,7 @@
 require 'mocha/parameters_matcher'
 require 'mocha/raised_exception'
 require 'mocha/return_values'
+require 'mocha/thrown_object'
 require 'mocha/yield_parameters'
 
 module Mocha
@@ -34,6 +35,11 @@ def raised(exception)
       @result = RaisedException.new(exception)
     end
 
+    # @private
+    def threw(tag, value)
+      @result = ThrownObject.new(tag, value)
+    end
+
     # @private
     def mocha_inspect
       desc = "\n  - #{@method_name}#{@arguments.mocha_inspect} # => #{@result.mocha_inspect}"

diff --git a/lib/mocha/thrower.rb b/lib/mocha/thrower.rb
@@ -5,7 +5,8 @@ def initialize(tag, object = nil)
       @object = object
     end
 
-    def evaluate(_invocation)
+    def evaluate(invocation)
+      invocation.threw(@tag, @object)
       throw @tag, @object
     end
   end

diff --git a/lib/mocha/thrown_object.rb b/lib/mocha/thrown_object.rb
@@ -0,0 +1,12 @@
+module Mocha
+  class ThrownObject
+    def initialize(tag, value = nil)
+      @tag = tag
+      @value = value
+    end
+
+    def mocha_inspect
+      "threw (#{@tag.mocha_inspect}, #{@value.mocha_inspect})"
+    end
+  end
+end
diff --git a/test/acceptance/display_matching_invocations_alongside_expectations_test.rb b/test/acceptance/display_matching_invocations_alongside_expectations_test.rb
@@ -19,33 +19,37 @@ def test_should_display_results
     test_result = run_as_test do
       foo = mock('foo')
       foo.expects(:bar).with(1).returns('a')
-      foo.stubs(:bar).with(any_parameters).returns('f').raises(StandardError)
+      foo.stubs(:bar).with(any_parameters).returns('f').raises(StandardError).throws(:tag, 'value')
 
       foo.bar(1, 2) { |_ignored| }
       assert_raise(StandardError) { foo.bar(3, 4) { |_ignored| } }
+      assert_throws(:tag) { foo.bar(5, 6) { |_ignored| } }
     end
     assert_invocations(
       test_result,
-      '- allowed any number of times, invoked twice: #<Mock:foo>.bar(any_parameters)',
+      '- allowed any number of times, invoked 3 times: #<Mock:foo>.bar(any_parameters)',
       '  - #<Mock:foo>.bar(1, 2) # => "f"',
-      '  - #<Mock:foo>.bar(3, 4) # => raised StandardError'
+      '  - #<Mock:foo>.bar(3, 4) # => raised StandardError',
+      '  - #<Mock:foo>.bar(5, 6) # => threw (:tag, "value")'
     )
   end
 
   def test_should_display_yields
     test_result = run_as_test do
       foo = mock('foo')
       foo.expects(:bar).with(1).returns('a')
-      foo.stubs(:bar).with(any_parameters).multiple_yields(%w[b c], %w[d e]).returns('f').raises(StandardError)
+      foo.stubs(:bar).with(any_parameters).multiple_yields(%w[b c], %w[d e]).returns('f').raises(StandardError).throws(:tag, 'value')
 
       foo.bar(1, 2) { |_ignored| }
       assert_raise(StandardError) { foo.bar(3, 4) { |_ignored| } }
+      assert_throws(:tag) { foo.bar(5, 6) { |_ignored| } }
     end
     assert_invocations(
       test_result,
-      '- allowed any number of times, invoked twice: #<Mock:foo>.bar(any_parameters)',
+      '- allowed any number of times, invoked 3 times: #<Mock:foo>.bar(any_parameters)',
       '  - #<Mock:foo>.bar(1, 2) # => "f" after yielding ("b", "c"), then ("d", "e")',
-      '  - #<Mock:foo>.bar(3, 4) # => raised StandardError after yielding ("b", "c"), then ("d", "e")'
+      '  - #<Mock:foo>.bar(3, 4) # => raised StandardError after yielding ("b", "c"), then ("d", "e")',
+      '  - #<Mock:foo>.bar(5, 6) # => threw (:tag, "value") after yielding ("b", "c"), then ("d", "e")'
     )
   end