mocha 1.8.0 → 1.11.0

data/test/unit/object_methods_test.rb

@@ -44,7 +44,7 @@ class ObjectMethodsTest < Mocha::TestCase
   end
 
   def test_should_use_stubba_instance_method_for_object
-    assert_equal Mocha::InstanceMethod, Object.new.stubba_method
+    assert_equal Mocha::InstanceMethod, @object.stubba_method
   end
 
   def test_should_stub_self_for_object
@@ -52,11 +52,12 @@ class ObjectMethodsTest < Mocha::TestCase
   end
 
   def test_nobody_expects_the_spanish_inquisition
-    assert_raise(Mocha::ExpectationErrorFactory.exception_class) { @object.expects(:the_spanish_inquisition) }
+    assert_raises(Mocha::ExpectationErrorFactory.exception_class) { @object.expects(:the_spanish_inquisition) }
   end
 
   def test_should_alias_object_method
     klass = Class.new { def self.method_x; end }
+    klass.extend(Mocha::ObjectMethods)
     assert_equal klass._method(:method_x), klass.method(:method_x)
   end
 end

data/test/unit/parameter_matchers/equivalent_uri_test.rb

@@ -1,23 +1,14 @@
 require File.expand_path('../../../test_helper', __FILE__)
-require 'deprecation_disabler'
 require 'mocha/parameter_matchers/equivalent_uri'
 
 class EquivalentUriMatchesTest < Mocha::TestCase
   include Mocha::ParameterMatchers
-  include DeprecationDisabler
 
   def test_should_match_identical_uri
     matcher = equivalent_uri('http://example.com/foo?a=1&b=2')
     assert matcher.matches?(['http://example.com/foo?a=1&b=2'])
   end
 
-  def test_should_support_legacy_matcher_method
-    disable_deprecations do
-      matcher = has_equivalent_query_string('http://example.com/foo?a=1&b=2')
-      assert matcher.matches?(['http://example.com/foo?a=1&b=2'])
-    end
-  end
-
   def test_should_match_uri_with_rearranged_query_string
     matcher = equivalent_uri('http://example.com/foo?b=2&a=1')
     assert matcher.matches?(['http://example.com/foo?a=1&b=2'])

data/test/unit/parameter_matchers/has_entries_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../../test_helper', __FILE__)
 
 require 'mocha/parameter_matchers/has_entries'
-require 'mocha/parameter_matchers/object'
+require 'mocha/parameter_matchers/instance_methods'
 require 'mocha/inspect'
 
 class HasEntriesTest < Mocha::TestCase

data/test/unit/parameter_matchers/has_entry_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../../test_helper', __FILE__)
 
 require 'mocha/parameter_matchers/has_entry'
-require 'mocha/parameter_matchers/object'
+require 'mocha/parameter_matchers/instance_methods'
 require 'mocha/parameter_matchers/equals'
 require 'mocha/inspect'
 

data/test/unit/parameter_matchers/has_key_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../../test_helper', __FILE__)
 
 require 'mocha/parameter_matchers/has_key'
-require 'mocha/parameter_matchers/object'
+require 'mocha/parameter_matchers/instance_methods'
 require 'mocha/inspect'
 
 class HasKeyTest < Mocha::TestCase

data/test/unit/parameter_matchers/has_value_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../../test_helper', __FILE__)
 
 require 'mocha/parameter_matchers/has_value'
-require 'mocha/parameter_matchers/object'
+require 'mocha/parameter_matchers/instance_methods'
 require 'mocha/parameter_matchers/equals'
 require 'mocha/inspect'
 

data/test/unit/parameter_matchers/includes_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../../test_helper', __FILE__)
 
 require 'mocha/parameter_matchers/includes'
-require 'mocha/parameter_matchers/object'
+require 'mocha/parameter_matchers/instance_methods'
 require 'mocha/parameter_matchers/has_key'
 require 'mocha/parameter_matchers/regexp_matches'
 require 'mocha/inspect'

data/test/unit/parameter_matchers/responds_with_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../../test_helper', __FILE__)
 
 require 'mocha/parameter_matchers/responds_with'
-require 'mocha/parameter_matchers/object'
+require 'mocha/parameter_matchers/instance_methods'
 require 'mocha/inspect'
 
 class RespondsWithTest < Mocha::TestCase

data/test/unit/return_values_test.rb

@@ -1,61 +1,66 @@
 require File.expand_path('../../test_helper', __FILE__)
 
+require 'mocha/invocation'
 require 'mocha/return_values'
 
 class ReturnValuesTest < Mocha::TestCase
   include Mocha
 
+  def new_invocation
+    Invocation.new(:irrelevant, :irrelevant)
+  end
+
   def test_should_return_nil
     values = ReturnValues.new
-    assert_nil values.next
+    assert_nil values.next(new_invocation)
   end
 
   def test_should_keep_returning_nil
     values = ReturnValues.new
-    values.next
-    assert_nil values.next
-    assert_nil values.next
+    values.next(new_invocation)
+    assert_nil values.next(new_invocation)
+    assert_nil values.next(new_invocation)
   end
 
   def test_should_return_evaluated_single_return_value
     values = ReturnValues.new(SingleReturnValue.new('value'))
-    assert_equal 'value', values.next
+    assert_equal 'value', values.next(new_invocation)
   end
 
   def test_should_keep_returning_evaluated_single_return_value
     values = ReturnValues.new(SingleReturnValue.new('value'))
-    values.next
-    assert_equal 'value', values.next
-    assert_equal 'value', values.next
+    values.next(new_invocation)
+    assert_equal 'value', values.next(new_invocation)
+    assert_equal 'value', values.next(new_invocation)
   end
 
   def test_should_return_consecutive_evaluated_single_return_values
     values = ReturnValues.new(SingleReturnValue.new('value_1'), SingleReturnValue.new('value_2'))
-    assert_equal 'value_1', values.next
-    assert_equal 'value_2', values.next
+    assert_equal 'value_1', values.next(new_invocation)
+    assert_equal 'value_2', values.next(new_invocation)
   end
 
   def test_should_keep_returning_last_of_consecutive_evaluated_single_return_values
     values = ReturnValues.new(SingleReturnValue.new('value_1'), SingleReturnValue.new('value_2'))
-    values.next
-    values.next
-    assert_equal 'value_2', values.next
-    assert_equal 'value_2', values.next
+    values.next(new_invocation)
+    values.next(new_invocation)
+    assert_equal 'value_2', values.next(new_invocation)
+    assert_equal 'value_2', values.next(new_invocation)
   end
 
   def test_should_build_single_return_values_for_each_values
     values = ReturnValues.build('value_1', 'value_2', 'value_3').values
-    assert_equal 'value_1', values[0].evaluate
-    assert_equal 'value_2', values[1].evaluate
-    assert_equal 'value_3', values[2].evaluate
+    assert_equal 'value_1', values[0].evaluate(new_invocation)
+    assert_equal 'value_2', values[1].evaluate(new_invocation)
+    assert_equal 'value_3', values[2].evaluate(new_invocation)
   end
 
   def test_should_combine_two_sets_of_return_values
     values1 = ReturnValues.build('value_1')
     values2 = ReturnValues.build('value_2a', 'value_2b')
     values = (values1 + values2).values
-    assert_equal 'value_1', values[0].evaluate
-    assert_equal 'value_2a', values[1].evaluate
-    assert_equal 'value_2b', values[2].evaluate
+    assert_equal 'value_1', values[0].evaluate(new_invocation)
+    assert_equal 'value_2a', values[1].evaluate(new_invocation)
+    assert_equal 'value_2b', values[2].evaluate(new_invocation)
   end
 end

data/test/unit/single_return_value_test.rb

@@ -1,12 +1,17 @@
 require File.expand_path('../../test_helper', __FILE__)
 
+require 'mocha/invocation'
 require 'mocha/single_return_value'
 
 class SingleReturnValueTest < Mocha::TestCase
   include Mocha
 
+  def new_invocation
+    Invocation.new(:irrelevant, :irrelevant)
+  end
+
   def test_should_return_value
     value = SingleReturnValue.new('value')
-    assert_equal 'value', value.evaluate
+    assert_equal 'value', value.evaluate(new_invocation)
   end
 end

data/test/unit/thrower_test.rb

@@ -1,18 +1,23 @@
 require File.expand_path('../../test_helper', __FILE__)
 
+require 'mocha/invocation'
 require 'mocha/thrower'
 
 class ThrowerTest < Mocha::TestCase
   include Mocha
 
+  def new_invocation
+    Invocation.new(:irrelevant, :irrelevant)
+  end
+
   def test_should_throw_tag
     thrower = Thrower.new(:tag)
-    assert_throws(:tag) { thrower.evaluate }
+    assert_throws(:tag) { thrower.evaluate(new_invocation) }
   end
 
   def test_should_throw_tag_with_return_value
     thrower = Thrower.new(:tag, 'return-value')
-    return_value = catch(:tag) { thrower.evaluate }
+    return_value = catch(:tag) { thrower.evaluate(new_invocation) }
     assert_equal 'return-value', return_value
   end
 end

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,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.11.0
 platform: ruby
 authors:
 - James Mead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-12-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: metaclass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gemtest"
+- ".github/FUNDING.yml"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".yardopts"
@@ -141,7 +128,6 @@ files:
 - docs/Mocha/StateMachine/State.html
 - docs/Mocha/StateMachine/StatePredicate.html
 - docs/Mocha/StubbingError.html
-- docs/Mocha/UnexpectedInvocation.html
 - docs/_index.html
 - docs/class_list.html
 - docs/css/common.css
@@ -168,6 +154,7 @@ files:
 - gemfiles/Gemfile.minitest.2.11.0
 - gemfiles/Gemfile.minitest.2.11.2
 - gemfiles/Gemfile.minitest.2.3.0
+- gemfiles/Gemfile.minitest.5.11.3
 - gemfiles/Gemfile.minitest.latest
 - gemfiles/Gemfile.test-unit.2.0.0
 - gemfiles/Gemfile.test-unit.2.0.1
@@ -179,10 +166,10 @@ 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
-- lib/mocha/class_method.rb
 - lib/mocha/class_methods.rb
 - lib/mocha/configuration.rb
 - lib/mocha/debug.rb
@@ -224,18 +211,15 @@ files:
 - lib/mocha/integration/test_unit/nothing.rb
 - lib/mocha/integration/test_unit/ruby_version_185_and_below.rb
 - lib/mocha/integration/test_unit/ruby_version_186_and_above.rb
+- lib/mocha/invocation.rb
 - lib/mocha/is_a.rb
 - lib/mocha/logger.rb
+- lib/mocha/macos_version.rb
 - lib/mocha/method_matcher.rb
-- lib/mocha/mini_test.rb
 - lib/mocha/minitest.rb
 - lib/mocha/mock.rb
 - lib/mocha/mockery.rb
-- lib/mocha/module_method.rb
-- lib/mocha/module_methods.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
@@ -251,38 +235,39 @@ files:
 - lib/mocha/parameter_matchers/has_key.rb
 - lib/mocha/parameter_matchers/has_value.rb
 - lib/mocha/parameter_matchers/includes.rb
+- lib/mocha/parameter_matchers/instance_methods.rb
 - lib/mocha/parameter_matchers/instance_of.rb
 - lib/mocha/parameter_matchers/is_a.rb
 - lib/mocha/parameter_matchers/kind_of.rb
 - lib/mocha/parameter_matchers/not.rb
-- lib/mocha/parameter_matchers/object.rb
 - lib/mocha/parameter_matchers/optionally.rb
 - lib/mocha/parameter_matchers/regexp_matches.rb
 - 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
 - lib/mocha/ruby_version.rb
 - lib/mocha/sequence.rb
 - lib/mocha/setup.rb
 - lib/mocha/single_return_value.rb
-- lib/mocha/single_yield.rb
-- lib/mocha/standalone.rb
+- lib/mocha/singleton_class.rb
 - lib/mocha/state_machine.rb
+- lib/mocha/stubbed_method.rb
 - lib/mocha/stubbing_error.rb
 - lib/mocha/test_unit.rb
 - lib/mocha/thrower.rb
-- lib/mocha/unexpected_invocation.rb
+- lib/mocha/thrown_object.rb
 - lib/mocha/version.rb
 - lib/mocha/yield_parameters.rb
-- lib/mocha_standalone.rb
 - mocha.gemspec
 - test/acceptance/acceptance_test_helper.rb
 - test/acceptance/bug_18914_test.rb
 - test/acceptance/bug_21465_test.rb
 - test/acceptance/bug_21563_test.rb
+- test/acceptance/display_matching_invocations_alongside_expectations_test.rb
 - test/acceptance/exception_rescue_test.rb
 - test/acceptance/expectations_on_multiple_methods_test.rb
 - test/acceptance/expected_invocation_count_test.rb
@@ -292,10 +277,11 @@ files:
 - 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/mock_with_initializer_block_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
@@ -341,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
@@ -360,7 +347,6 @@ files:
 - test/unit/cardinality_test.rb
 - test/unit/central_test.rb
 - test/unit/change_state_side_effect_test.rb
-- test/unit/class_method_test.rb
 - test/unit/class_methods_test.rb
 - test/unit/configuration_test.rb
 - test/unit/date_time_inspect_test.rb
@@ -370,12 +356,11 @@ files:
 - test/unit/hash_inspect_test.rb
 - test/unit/hooks_test.rb
 - test/unit/in_state_ordering_constraint_test.rb
+- test/unit/instance_method_test.rb
 - test/unit/method_matcher_test.rb
 - 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
@@ -401,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
@@ -428,8 +412,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Mocking and stubbing library