mocha 1.7.0 → 1.10.2

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/yard-templates/default/layout/html/google_analytics.erb

@@ -1,11 +1,8 @@
-<script src="/javascripts/app.js" type="text/javascript" charset="utf-8"></script>
-
+<script async src="https://www.googletagmanager.com/gtag/js?id=<%= ENV['GOOGLE_ANALYTICS_WEB_PROPERTY_ID'] %>"></script>
 <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
 
-  ga('create', '<%= ENV['GOOGLE_ANALYTICS_WEB_PROPERTY_ID'] %>', 'gofreerange.com');
-  ga('send', 'pageview');
-</script>
+  gtag('config', '<%= ENV['GOOGLE_ANALYTICS_WEB_PROPERTY_ID'] %>');
+</script>

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.10.2
 platform: ruby
 authors:
 - James Mead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-09 00:00:00.000000000 Z
+date: 2019-12-12 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
@@ -70,44 +56,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.58.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.58.2
 description: Mocking and stubbing library with JMock/SchMock syntax, which allows
   mocking and stubbing of methods on real (non-mock) classes.
 email: mocha-developer@googlegroups.com
@@ -127,6 +85,65 @@ files:
 - RELEASE.md
 - Rakefile
 - bin/build-matrix
+- docs/CNAME
+- docs/Mocha.html
+- docs/Mocha/API.html
+- docs/Mocha/ClassMethods.html
+- docs/Mocha/Configuration.html
+- docs/Mocha/Expectation.html
+- docs/Mocha/ExpectationError.html
+- docs/Mocha/ExpectationErrorFactory.html
+- docs/Mocha/Hooks.html
+- docs/Mocha/Integration.html
+- docs/Mocha/Integration/MiniTest.html
+- docs/Mocha/Integration/MiniTest/Adapter.html
+- docs/Mocha/Integration/TestUnit.html
+- docs/Mocha/Integration/TestUnit/Adapter.html
+- docs/Mocha/Mock.html
+- docs/Mocha/ObjectMethods.html
+- docs/Mocha/ParameterMatchers.html
+- docs/Mocha/ParameterMatchers/AllOf.html
+- docs/Mocha/ParameterMatchers/AnyOf.html
+- docs/Mocha/ParameterMatchers/AnyParameters.html
+- docs/Mocha/ParameterMatchers/Anything.html
+- docs/Mocha/ParameterMatchers/Base.html
+- docs/Mocha/ParameterMatchers/Equals.html
+- docs/Mocha/ParameterMatchers/EquivalentUri.html
+- docs/Mocha/ParameterMatchers/HasEntries.html
+- docs/Mocha/ParameterMatchers/HasEntry.html
+- docs/Mocha/ParameterMatchers/HasKey.html
+- docs/Mocha/ParameterMatchers/HasValue.html
+- docs/Mocha/ParameterMatchers/Includes.html
+- docs/Mocha/ParameterMatchers/InstanceOf.html
+- docs/Mocha/ParameterMatchers/IsA.html
+- docs/Mocha/ParameterMatchers/KindOf.html
+- docs/Mocha/ParameterMatchers/Not.html
+- docs/Mocha/ParameterMatchers/Optionally.html
+- docs/Mocha/ParameterMatchers/RegexpMatches.html
+- docs/Mocha/ParameterMatchers/RespondsWith.html
+- docs/Mocha/ParameterMatchers/YamlEquivalent.html
+- docs/Mocha/Sequence.html
+- docs/Mocha/StateMachine.html
+- docs/Mocha/StateMachine/State.html
+- docs/Mocha/StateMachine/StatePredicate.html
+- docs/Mocha/StubbingError.html
+- docs/_index.html
+- docs/class_list.html
+- docs/css/common.css
+- docs/css/full_list.css
+- docs/css/style.css
+- docs/file.COPYING.html
+- docs/file.MIT-LICENSE.html
+- docs/file.README.html
+- docs/file.RELEASE.html
+- docs/file_list.html
+- docs/frames.html
+- docs/index.html
+- docs/js/app.js
+- docs/js/full_list.js
+- docs/js/jquery.js
+- docs/method_list.html
+- docs/top-level-namespace.html
 - gemfiles/Gemfile.minitest.1.3.0
 - gemfiles/Gemfile.minitest.1.4.0
 - gemfiles/Gemfile.minitest.1.4.1
@@ -136,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
@@ -150,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
@@ -192,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
@@ -219,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
@@ -237,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
@@ -260,8 +278,8 @@ 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/optional_parameters_test.rb
@@ -328,7 +346,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
@@ -338,6 +355,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
@@ -376,7 +394,7 @@ files:
 - test/unit/yield_parameters_test.rb
 - yard-templates/default/layout/html/google_analytics.erb
 - yard-templates/default/layout/html/setup.rb
-homepage: http://gofreerange.com/mocha/docs
+homepage: https://mocha.jamesmead.org
 licenses:
 - MIT
 - BSD-2-Clause
@@ -396,8 +414,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Mocking and stubbing library