mocha 1.10.0 → 1.11.2

data/test/acceptance/multiple_yielding_test.rb

@@ -0,0 +1,59 @@
+require File.expand_path('../acceptance_test_helper', __FILE__)
+require 'mocha/configuration'
+
+class MultipleYieldingTest < Mocha::TestCase
+  include AcceptanceTest
+
+  def setup
+    setup_acceptance_test
+  end
+
+  def teardown
+    teardown_acceptance_test
+  end
+
+  def test_yields_values_multiple_times_when_stubbed_method_is_invoked
+    test_result = run_as_test do
+      m = mock('m')
+      m.stubs(:foo).multiple_yields([1], [2, 3])
+      yielded = []
+      m.foo { |*args| yielded << args }
+      assert_equal [[1], [2, 3]], yielded
+    end
+    assert_passed(test_result)
+  end
+
+  def test_yields_values_multiple_times_when_multiple_yields_arguments_are_not_arrays
+    test_result = run_as_test do
+      m = mock('m')
+      m.stubs(:foo).multiple_yields(1, { :b => 2 }, '3')
+      yielded = []
+      m.foo { |*args| yielded << args }
+      assert_equal [[1], [{ :b => 2 }], ['3']], yielded
+    end
+    assert_passed(test_result)
+  end
+
+  def test_raises_local_jump_error_if_instructed_to_multiple_yield_but_no_block_given
+    test_result = run_as_test do
+      Mocha::Configuration.override(:reinstate_undocumented_behaviour_from_v1_9 => false) do
+        m = mock('m')
+        m.stubs(:foo).multiple_yields([])
+        assert_raises(LocalJumpError) { m.foo }
+      end
+    end
+    assert_passed(test_result)
+  end
+
+  def test_yields_different_values_on_consecutive_invocations
+    test_result = run_as_test do
+      m = mock('m')
+      m.stubs(:foo).multiple_yields([0], [1, 2]).then.multiple_yields([3], [4, 5])
+      yielded = []
+      m.foo { |*args| yielded << args }
+      m.foo { |*args| yielded << args }
+      assert_equal [[0], [1, 2], [3], [4, 5]], yielded
+    end
+    assert_passed(test_result)
+  end
+end

data/test/acceptance/stubba_example_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../acceptance_test_helper', __FILE__)
 
 class Widget
   def model
@@ -23,6 +23,16 @@ module Thingy
 end
 
 class StubbaExampleTest < Mocha::TestCase
+  include AcceptanceTest
+
+  def setup
+    setup_acceptance_test
+  end
+
+  def teardown
+    teardown_acceptance_test
+  end
+
   def test_should_stub_instance_method
     widget = Widget.new
     widget.expects(:model).returns('different_model')

data/test/acceptance/stubbing_non_existent_any_instance_method_test.rb

@@ -76,6 +76,22 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
     assert_passed(test_result)
   end
 
+  def test_should_default_to_allowing_stubbing_method_if_responds_to_depends_on_calling_initialize
+    klass = Class.new do
+      def initialize(attrs = {})
+        @attributes = attrs
+      end
+
+      def respond_to?(method, _include_private = false)
+        @attributes.key?(method) ? @attributes[method] : super
+      end
+    end
+    test_result = run_as_test do
+      klass.any_instance.stubs(:foo)
+    end
+    assert_passed(test_result)
+  end
+
   def test_should_allow_stubbing_existing_protected_any_instance_method
     Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new do

data/test/acceptance/yielding_test.rb

@@ -0,0 +1,80 @@
+require File.expand_path('../acceptance_test_helper', __FILE__)
+
+class YieldingTest < Mocha::TestCase
+  include AcceptanceTest
+
+  def setup
+    setup_acceptance_test
+  end
+
+  def teardown
+    teardown_acceptance_test
+  end
+
+  def test_yields_when_stubbed_method_is_invoked
+    test_result = run_as_test do
+      m = mock('m')
+      m.stubs(:foo).yields
+      yielded = false
+      m.foo { yielded = true }
+      assert yielded
+    end
+    assert_passed(test_result)
+  end
+
+  def test_raises_local_jump_error_if_instructed_to_yield_but_no_block_given
+    test_result = run_as_test do
+      Mocha::Configuration.override(:reinstate_undocumented_behaviour_from_v1_9 => false) do
+        m = mock('m')
+        m.stubs(:foo).yields
+        assert_raises(LocalJumpError) { m.foo }
+      end
+    end
+    assert_passed(test_result)
+  end
+
+  def test_yields_when_block_expected_and_block_given
+    test_result = run_as_test do
+      m = mock('m')
+      m.stubs(:foo).with_block_given.yields
+      m.stubs(:foo).with_no_block_given.returns(:bar)
+      yielded = false
+      m.foo { yielded = true }
+      assert yielded
+    end
+    assert_passed(test_result)
+  end
+
+  def test_returns_when_no_block_expected_and_no_block_given
+    test_result = run_as_test do
+      m = mock('m')
+      m.stubs(:foo).with_block_given.yields
+      m.stubs(:foo).with_no_block_given.returns(:bar)
+      assert_equal :bar, m.foo
+    end
+    assert_passed(test_result)
+  end
+
+  def test_yields_values_when_stubbed_method_is_invoked
+    test_result = run_as_test do
+      m = mock('m')
+      m.stubs(:foo).yields(0, 1)
+      yielded = []
+      m.foo { |*args| yielded << args }
+      assert_equal [[0, 1]], yielded
+    end
+    assert_passed(test_result)
+  end
+
+  def test_yields_different_values_on_consecutive_invocations
+    test_result = run_as_test do
+      m = mock('m')
+      m.stubs(:foo).yields(0, 1).then.yields(2, 3)
+      yielded = []
+      m.foo { |*args| yielded << args }
+      m.foo { |*args| yielded << args }
+      assert_equal [[0, 1], [2, 3]], yielded
+    end
+    assert_passed(test_result)
+  end
+end

data/test/unit/expectation_test.rb

@@ -2,9 +2,13 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/expectation'
 require 'mocha/invocation'
 require 'mocha/sequence'
+require 'mocha/configuration'
+require 'mocha/deprecation'
 require 'execution_point'
 require 'simple_counter'
+require 'deprecation_disabler'
 
+# rubocop:disable  Metrics/ClassLength
 class ExpectationTest < Mocha::TestCase
   include Mocha
 
@@ -13,7 +17,7 @@ class ExpectationTest < Mocha::TestCase
   end
 
   def invoke(expectation, &block)
-    expectation.invoke(Invocation.new(:irrelevant, :expected_method), &block)
+    expectation.invoke(Invocation.new(:irrelevant, :expected_method, &block))
   end
 
   def test_should_match_calls_to_same_method_with_any_parameters
@@ -112,8 +116,30 @@ class ExpectationTest < Mocha::TestCase
     assert_equal [], yielded_parameters
   end
 
-  def test_yield_should_fail_when_the_caller_does_not_provide_a_block
-    assert_raises(LocalJumpError) { invoke(new_expectation.yields(:foo)) }
+  def test_yield_should_fail_when_the_caller_does_not_provide_a_block_and_behaviour_from_v1_9_not_retained
+    Mocha::Configuration.override(:reinstate_undocumented_behaviour_from_v1_9 => false) do
+      assert_raises(LocalJumpError) { invoke(new_expectation.yields(:foo)) }
+    end
+  end
+
+  def test_yields_should_display_warning_when_caller_does_not_provide_block
+    DeprecationDisabler.disable_deprecations do
+      invoke(new_expectation.yields(:foo, 1, [2, 3]))
+    end
+    assert message = Deprecation.messages.last
+    assert message.include?('Stubbed method was instructed to yield (:foo, 1, [2, 3])')
+    assert message.include?('but no block was given by invocation: :irrelevant.expected_method()')
+    assert message.include?('This will raise a LocalJumpError in the future.')
+  end
+
+  def test_multiple_yields_should_display_warning_when_caller_does_not_provide_block
+    DeprecationDisabler.disable_deprecations do
+      invoke(new_expectation.multiple_yields(:foo, 1, [2, 3]))
+    end
+    assert message = Deprecation.messages.last
+    assert message.include?('Stubbed method was instructed to yield (2, 3)')
+    assert message.include?('but no block was given by invocation: :irrelevant.expected_method()')
+    assert message.include?('This will raise a LocalJumpError in the future.')
   end
 
   def test_should_yield_with_specified_parameters
@@ -475,3 +501,4 @@ class ExpectationTest < Mocha::TestCase
     assert expectation.inspect.include?(expectation.mocha_inspect)
   end
 end
+# rubocop:enable  Metrics/ClassLength

data/test/unit/yield_parameters_test.rb

@@ -1,91 +1,73 @@
 require File.expand_path('../../test_helper', __FILE__)
 
 require 'mocha/yield_parameters'
-require 'mocha/no_yields'
-require 'mocha/single_yield'
-require 'mocha/multiple_yields'
 
 class YieldParametersTest < Mocha::TestCase
   include Mocha
 
   def test_should_return_null_yield_parameter_group_by_default
-    yield_parameters = YieldParameters.new
-    assert yield_parameters.next_invocation.is_a?(NoYields)
+    assert_next_invocation_yields(YieldParameters.new, [])
   end
 
   def test_should_return_single_yield_parameter_group
     yield_parameters = YieldParameters.new
-    yield_parameters.add(1, 2, 3)
-    parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(SingleYield)
-    assert_equal [1, 2, 3], parameter_group.parameters
+    yield_parameters.add([1, 2, 3])
+    assert_next_invocation_yields(yield_parameters, [[1, 2, 3]])
   end
 
   def test_should_keep_returning_single_yield_parameter_group
     yield_parameters = YieldParameters.new
-    yield_parameters.add(1, 2, 3)
-    yield_parameters.next_invocation
-    parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(SingleYield)
-    assert_equal [1, 2, 3], parameter_group.parameters
-    parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(SingleYield)
-    assert_equal [1, 2, 3], parameter_group.parameters
+    yield_parameters.add([1, 2, 3])
+    assert_next_invocation_yields(yield_parameters, [[1, 2, 3]])
+    assert_next_invocation_yields(yield_parameters, [[1, 2, 3]])
   end
 
   def test_should_return_consecutive_single_yield_parameter_groups
     yield_parameters = YieldParameters.new
-    yield_parameters.add(1, 2, 3)
-    yield_parameters.add(4, 5)
-    parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(SingleYield)
-    assert_equal [1, 2, 3], parameter_group.parameters
-    parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(SingleYield)
-    assert_equal [4, 5], parameter_group.parameters
+    yield_parameters.add([1, 2, 3])
+    yield_parameters.add([4, 5])
+    assert_next_invocation_yields(yield_parameters, [[1, 2, 3]])
+    assert_next_invocation_yields(yield_parameters, [[4, 5]])
   end
 
   def test_should_return_multiple_yield_parameter_group
     yield_parameters = YieldParameters.new
-    yield_parameters.multiple_add([1, 2, 3], [4, 5])
-    parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(MultipleYields)
-    assert_equal [[1, 2, 3], [4, 5]], parameter_group.parameter_groups
+    yield_parameters.add([1, 2, 3], [4, 5])
+    assert_next_invocation_yields(yield_parameters, [[1, 2, 3], [4, 5]])
+  end
+
+  def test_should_return_multiple_yield_parameter_group_when_arguments_are_not_arrays
+    yield_parameters = YieldParameters.new
+    yield_parameters.add(1, { :b => 2 }, 3)
+    assert_next_invocation_yields(yield_parameters, [[1], [{ :b => 2 }], [3]])
   end
 
   def test_should_keep_returning_multiple_yield_parameter_group
     yield_parameters = YieldParameters.new
-    yield_parameters.multiple_add([1, 2, 3], [4, 5])
-    yield_parameters.next_invocation
-    parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(MultipleYields)
-    assert_equal [[1, 2, 3], [4, 5]], parameter_group.parameter_groups
-    parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(MultipleYields)
-    assert_equal [[1, 2, 3], [4, 5]], parameter_group.parameter_groups
+    yield_parameters.add([1, 2, 3], [4, 5])
+    assert_next_invocation_yields(yield_parameters, [[1, 2, 3], [4, 5]])
+    assert_next_invocation_yields(yield_parameters, [[1, 2, 3], [4, 5]])
   end
 
   def test_should_return_consecutive_multiple_yield_parameter_groups
     yield_parameters = YieldParameters.new
-    yield_parameters.multiple_add([1, 2, 3], [4, 5])
-    yield_parameters.multiple_add([6, 7], [8, 9, 0])
-    parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(MultipleYields)
-    assert_equal [[1, 2, 3], [4, 5]], parameter_group.parameter_groups
-    parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(MultipleYields)
-    assert_equal [[6, 7], [8, 9, 0]], parameter_group.parameter_groups
+    yield_parameters.add([1, 2, 3], [4, 5])
+    yield_parameters.add([6, 7], [8, 9, 0])
+    assert_next_invocation_yields(yield_parameters, [[1, 2, 3], [4, 5]])
+    assert_next_invocation_yields(yield_parameters, [[6, 7], [8, 9, 0]])
   end
 
   def test_should_return_consecutive_single_and_multiple_yield_parameter_groups
     yield_parameters = YieldParameters.new
-    yield_parameters.add(1, 2, 3)
-    yield_parameters.multiple_add([4, 5, 6], [7, 8])
-    parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(SingleYield)
-    assert_equal [1, 2, 3], parameter_group.parameters
-    parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(MultipleYields)
-    assert_equal [[4, 5, 6], [7, 8]], parameter_group.parameter_groups
+    yield_parameters.add([1, 2, 3])
+    yield_parameters.add([4, 5, 6], [7, 8])
+    assert_next_invocation_yields(yield_parameters, [[1, 2, 3]])
+    assert_next_invocation_yields(yield_parameters, [[4, 5, 6], [7, 8]])
+  end
+
+  private
+
+  def assert_next_invocation_yields(yield_parameters, expected)
+    assert_equal expected, yield_parameters.next_invocation
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.2
 platform: ruby
 authors:
 - James Mead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-02 00:00:00.000000000 Z
+date: 2020-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -74,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gemtest"
+- ".github/FUNDING.yml"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".yardopts"
@@ -165,6 +166,7 @@ files:
 - lib/mocha/api.rb
 - lib/mocha/argument_iterator.rb
 - lib/mocha/backtrace_filter.rb
+- lib/mocha/block_matcher.rb
 - lib/mocha/cardinality.rb
 - lib/mocha/central.rb
 - lib/mocha/change_state_side_effect.rb
@@ -217,9 +219,7 @@ files:
 - lib/mocha/minitest.rb
 - lib/mocha/mock.rb
 - lib/mocha/mockery.rb
-- lib/mocha/multiple_yields.rb
 - lib/mocha/names.rb
-- lib/mocha/no_yields.rb
 - lib/mocha/not_initialized_error.rb
 - lib/mocha/object_methods.rb
 - lib/mocha/parameter_matchers.rb
@@ -245,7 +245,6 @@ files:
 - lib/mocha/parameter_matchers/responds_with.rb
 - lib/mocha/parameter_matchers/yaml_equivalent.rb
 - lib/mocha/parameters_matcher.rb
-- lib/mocha/pretty_parameters.rb
 - lib/mocha/raised_exception.rb
 - lib/mocha/receivers.rb
 - lib/mocha/return_values.rb
@@ -253,7 +252,6 @@ files:
 - lib/mocha/sequence.rb
 - lib/mocha/setup.rb
 - lib/mocha/single_return_value.rb
-- lib/mocha/single_yield.rb
 - lib/mocha/singleton_class.rb
 - lib/mocha/state_machine.rb
 - lib/mocha/stubbed_method.rb
@@ -274,13 +272,16 @@ files:
 - test/acceptance/expected_invocation_count_test.rb
 - test/acceptance/failure_messages_test.rb
 - test/acceptance/issue_272_test.rb
+- test/acceptance/issue_457_test.rb
 - test/acceptance/issue_65_test.rb
 - test/acceptance/issue_70_test.rb
 - test/acceptance/mocha_example_test.rb
 - test/acceptance/mocha_test_result_test.rb
+- test/acceptance/mock_built_with_first_argument_type_being_string_test.rb
 - test/acceptance/mock_test.rb
 - test/acceptance/mocked_methods_dispatch_test.rb
 - test/acceptance/multiple_expectations_failure_message_test.rb
+- test/acceptance/multiple_yielding_test.rb
 - test/acceptance/optional_parameters_test.rb
 - test/acceptance/parameter_matcher_test.rb
 - test/acceptance/partial_mocks_test.rb
@@ -326,6 +327,7 @@ files:
 - test/acceptance/throw_test.rb
 - test/acceptance/unexpected_invocation_test.rb
 - test/acceptance/unstubbing_test.rb
+- test/acceptance/yielding_test.rb
 - test/assertions.rb
 - test/deprecation_disabler.rb
 - test/execution_point.rb
@@ -359,8 +361,6 @@ files:
 - test/unit/mock_test.rb
 - test/unit/mockery_test.rb
 - test/unit/module_methods_test.rb
-- test/unit/multiple_yields_test.rb
-- test/unit/no_yields_test.rb
 - test/unit/object_inspect_test.rb
 - test/unit/object_methods_test.rb
 - test/unit/parameter_matchers/all_of_test.rb
@@ -386,7 +386,6 @@ files:
 - test/unit/return_values_test.rb
 - test/unit/sequence_test.rb
 - test/unit/single_return_value_test.rb
-- test/unit/single_yield_test.rb
 - test/unit/state_machine_test.rb
 - test/unit/string_inspect_test.rb
 - test/unit/thrower_test.rb