mocha 1.6.0 → 1.10.1

data/test/unit/single_return_value_test.rb

@@ -1,14 +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/single_yield_test.rb

@@ -3,7 +3,6 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/single_yield'
 
 class SingleYieldTest < Mocha::TestCase
-
   include Mocha
 
   def test_should_provide_parameters_for_single_yield_in_single_invocation
@@ -14,5 +13,4 @@ class SingleYieldTest < Mocha::TestCase
     end
     assert_equal [[1, 2, 3]], parameter_groups
   end
-
 end

data/test/unit/state_machine_test.rb

@@ -3,7 +3,6 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/state_machine'
 
 class StateMachineTest < Mocha::TestCase
-
   include Mocha
 
   def test_should_initially_be_in_no_state
@@ -92,7 +91,6 @@ class StateMachineTest < Mocha::TestCase
   end
 
   def any_state
-    %w(A B C D)
+    %w[A B C D]
   end
-
 end

data/test/unit/string_inspect_test.rb

@@ -2,10 +2,8 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/inspect'
 
 class StringInspectTest < Mocha::TestCase
-
   def test_should_use_default_inspect_method
-    string = "my_string"
-    assert_equal %{"my_string"}, string.mocha_inspect
+    string = 'my_string'
+    assert_equal %("my_string"), string.mocha_inspect
   end
-
 end

data/test/unit/thrower_test.rb

@@ -1,20 +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

@@ -6,7 +6,6 @@ require 'mocha/single_yield'
 require 'mocha/multiple_yields'
 
 class YieldParametersTest < Mocha::TestCase
-
   include Mocha
 
   def test_should_return_null_yield_parameter_group_by_default
@@ -89,5 +88,4 @@ class YieldParametersTest < Mocha::TestCase
     assert parameter_group.is_a?(MultipleYields)
     assert_equal [[4, 5, 6], [7, 8]], parameter_group.parameter_groups
   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>

data/yard-templates/default/layout/html/setup.rb

@@ -1,6 +1,5 @@
 def init
   super
-  if ENV['GOOGLE_ANALYTICS_WEB_PROPERTY_ID']
-    sections[:layout] << :google_analytics
-  end
+  return unless ENV['GOOGLE_ANALYTICS_WEB_PROPERTY_ID']
+  sections[:layout] << :google_analytics
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.10.1
 platform: ruby
 authors:
 - James Mead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2019-12-04 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
@@ -67,33 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rubocop
   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: redcarpet
-  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
@@ -102,6 +74,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gemtest"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".yardopts"
 - CONTRIBUTING.md
 - COPYING.md
@@ -111,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
@@ -120,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
@@ -134,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
@@ -176,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
@@ -203,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
@@ -221,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
@@ -245,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
@@ -312,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
@@ -322,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
@@ -360,7 +393,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
@@ -380,9 +413,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: mocha
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Mocking and stubbing library
 test_files: []

data/lib/mocha/class_method.rb

@@ -1,119 +0,0 @@
-require 'mocha/ruby_version'
-require 'metaclass'
-
-module Mocha
-
-  class ClassMethod
-
-    PrependedModule = Class.new(Module)
-
-    attr_reader :stubbee, :method
-
-    def initialize(stubbee, method)
-      @stubbee = stubbee
-      @original_method, @original_visibility = nil, nil
-      @method = PRE_RUBY_V19 ? method.to_s : method.to_sym
-    end
-
-    def stub
-      hide_original_method
-      define_new_method
-    end
-
-    def unstub
-      remove_new_method
-      restore_original_method
-      mock.unstub(method.to_sym)
-      unless mock.any_expectations?
-        reset_mocha
-      end
-    end
-
-    def mock
-      stubbee.mocha
-    end
-
-    def reset_mocha
-      stubbee.reset_mocha
-    end
-
-    def hide_original_method
-      if @original_visibility = method_visibility(method)
-        begin
-          if RUBY_V2_PLUS
-            @definition_target = PrependedModule.new
-            stubbee.__metaclass__.__send__ :prepend, @definition_target
-          else
-            @original_method = stubbee._method(method)
-            if @original_method && @original_method.owner == stubbee.__metaclass__
-              stubbee.__metaclass__.send(:remove_method, method)
-            end
-          end
-        rescue NameError
-          # deal with nasties like ActiveRecord::Associations::AssociationProxy
-        end
-      end
-    end
-
-    def define_new_method
-      definition_target.class_eval(<<-CODE, __FILE__, __LINE__ + 1)
-        def #{method}(*args, &block)
-          mocha.method_missing(:#{method}, *args, &block)
-        end
-      CODE
-      if @original_visibility
-        Module.instance_method(@original_visibility).bind(definition_target).call(method)
-      end
-    end
-
-    def remove_new_method
-      definition_target.send(:remove_method, method)
-    end
-
-    def restore_original_method
-      unless RUBY_V2_PLUS
-        if @original_method && @original_method.owner == stubbee.__metaclass__
-          if PRE_RUBY_V19
-            original_method = @original_method
-            stubbee.__metaclass__.send(:define_method, method) do |*args, &block|
-              original_method.call(*args, &block)
-            end
-          else
-            stubbee.__metaclass__.send(:define_method, method, @original_method)
-          end
-        end
-        if @original_visibility
-          Module.instance_method(@original_visibility).bind(stubbee.__metaclass__).call(method)
-        end
-      end
-    end
-
-    def matches?(other)
-      return false unless (other.class == self.class)
-      (stubbee.object_id == other.stubbee.object_id) and (method == other.method)
-    end
-
-    alias_method :==, :eql?
-
-    def to_s
-      "#{stubbee}.#{method}"
-    end
-
-    def method_visibility(method)
-      symbol = method.to_sym
-      metaclass = stubbee.__metaclass__
-
-      (metaclass.public_method_defined?(symbol) && :public) ||
-        (metaclass.protected_method_defined?(symbol) && :protected) ||
-        (metaclass.private_method_defined?(symbol) && :private)
-    end
-
-    private
-
-    def definition_target
-      @definition_target ||= stubbee.__metaclass__
-    end
-
-  end
-
-end