mocha 1.9.0 → 1.10.0.alpha

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

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0.alpha
 platform: ruby
 authors:
 - James Mead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-17 00:00:00.000000000 Z
+date: 2019-11-24 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
@@ -99,6 +85,7 @@ files:
 - RELEASE.md
 - Rakefile
 - bin/build-matrix
+- docs/CNAME
 - docs/Mocha.html
 - docs/Mocha/API.html
 - docs/Mocha/ClassMethods.html
@@ -140,7 +127,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
@@ -167,6 +153,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
@@ -181,7 +168,6 @@ files:
 - 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
@@ -223,15 +209,14 @@ 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
@@ -250,17 +235,18 @@ 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
@@ -268,20 +254,21 @@ files:
 - 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,7 +279,6 @@ files:
 - test/acceptance/mocha_example_test.rb
 - test/acceptance/mocha_test_result_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/optional_parameters_test.rb
@@ -359,7 +345,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
@@ -369,6 +354,7 @@ 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
@@ -423,11 +409,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Mocking and stubbing library

data/docs/Mocha/UnexpectedInvocation.html

@@ -1,140 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<title>
-  Class: Mocha::UnexpectedInvocation
-  
-    &mdash; Mocha 1.9.0
-  
-</title>
-
-  <link rel="stylesheet" href="../css/style.css" type="text/css" charset="utf-8" />
-
-  <link rel="stylesheet" href="../css/common.css" type="text/css" charset="utf-8" />
-
-<script type="text/javascript" charset="utf-8">
-  pathId = "Mocha::UnexpectedInvocation";
-  relpath = '../';
-</script>
-
-
-  <script type="text/javascript" charset="utf-8" src="../js/jquery.js"></script>
-
-  <script type="text/javascript" charset="utf-8" src="../js/app.js"></script>
-
-
-  </head>
-  <body>
-    <div class="nav_wrap">
-      <iframe id="nav" src="../class_list.html?1"></iframe>
-      <div id="resizer"></div>
-    </div>
-
-    <div id="main" tabindex="-1">
-      <div id="header">
-        <div id="menu">
-  
-    <a href="../_index.html">Index (U)</a> &raquo;
-    <span class='title'><span class='object_link'><a href="../Mocha.html" title="Mocha (module)">Mocha</a></span></span>
-     &raquo; 
-    <span class="title">UnexpectedInvocation</span>
-  
-</div>
-
-        <div id="search">
-  
-    <a class="full_list_link" id="class_list_link"
-        href="../class_list.html">
-
-        <svg width="24" height="24">
-          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
-          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
-          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
-        </svg>
-    </a>
-  
-</div>
-        <div class="clear"></div>
-      </div>
-
-      <div id="content"><h1>Class: Mocha::UnexpectedInvocation
-  
-  
-  
-</h1>
-<div class="box_info">
-  
-  <dl>
-    <dt>Inherits:</dt>
-    <dd>
-      <span class="inheritName"><span class='object_link'>Object</span></span>
-      
-        <ul class="fullTree">
-          <li><span class='object_link'>Object</span></li>
-          
-            <li class="next">Mocha::UnexpectedInvocation</li>
-          
-        </ul>
-        <a href="#" class="inheritanceTree">show all</a>
-      
-    </dd>
-  </dl>
-  
-
-  
-  
-  
-  
-  
-
-  
-
-  
-  <dl>
-    <dt>Defined in:</dt>
-    <dd>lib/mocha/unexpected_invocation.rb</dd>
-  </dl>
-  
-</div>
-
-<h2>Overview</h2><div class="docstring">
-  <div class="discussion">
-    
-<p>Exception raised when an unexpected method is invoked</p>
-
-
-  </div>
-</div>
-<div class="tags">
-  
-
-</div>
-
-
-
-
-
-
-
-
-<script async src="https://www.googletagmanager.com/gtag/js?id=UA-625523-7"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', 'UA-625523-7');
-</script>
-</div>
-
-      <div id="footer">
-  Generated on Mon Jun 17 18:38:45 2019 by
-  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.19 (ruby-2.5.3).
-</div>
-
-    </div>
-  </body>
-</html>