mocha 1.9.0 → 1.11.1

data/lib/mocha/parameter_matchers.rb

@@ -3,7 +3,7 @@ module Mocha
   module ParameterMatchers; end
 end
 
-require 'mocha/parameter_matchers/object'
+require 'mocha/parameter_matchers/instance_methods'
 
 require 'mocha/parameter_matchers/all_of'
 require 'mocha/parameter_matchers/any_of'

data/lib/mocha/parameter_matchers/all_of.rb

@@ -4,7 +4,7 @@ module Mocha
   module ParameterMatchers
     # Matches if all +matchers+ match.
     #
-    # @param [*Array<Base>] parameter_matchers parameter matchers.
+    # @param [*Array<Base>] matchers parameter matchers.
     # @return [AllOf] parameter matcher.
     #
     # @see Expectation#with

data/lib/mocha/parameter_matchers/any_of.rb

@@ -4,7 +4,7 @@ module Mocha
   module ParameterMatchers
     # Matches if any +matchers+ match.
     #
-    # @param [*Array<Base>] parameter_matchers parameter matchers.
+    # @param [*Array<Base>] matchers parameter matchers.
     # @return [AnyOf] parameter matcher.
     #
     # @see Expectation#with

data/lib/mocha/parameter_matchers/equivalent_uri.rb

@@ -27,15 +27,6 @@ module Mocha
       EquivalentUri.new(uri)
     end
 
-    # @deprecated Use {#equivalent_uri} instead.
-    # rubocop:disable Naming/PredicateName
-    def has_equivalent_query_string(uri)
-      Mocha::Deprecation.warning('`has_equivalent_query_string` is deprecated. Please use `equivalent_uri` instead.')
-
-      equivalent_uri(uri)
-    end
-    # rubocop:enable Naming/PredicateName
-
     # Parameter matcher which matches URIs with equivalent query strings.
     class EquivalentUri < Base
       # @private

data/lib/mocha/parameter_matchers/includes.rb

@@ -72,6 +72,7 @@ module Mocha
       end
 
       # @private
+      # rubocop:disable Metrics/PerceivedComplexity
       def matches?(available_parameters)
         parameter = available_parameters.shift
         return false unless parameter.respond_to?(:include?)
@@ -89,6 +90,7 @@ module Mocha
           AllOf.new(*includes_matchers).matches?([parameter])
         end
       end
+      # rubocop:enable Metrics/PerceivedComplexity
 
       # @private
       def mocha_inspect

data/lib/mocha/parameter_matchers/instance_methods.rb

@@ -0,0 +1,18 @@
+require 'mocha/parameter_matchers/equals'
+
+module Mocha
+  module ParameterMatchers
+    # @private
+    module InstanceMethods
+      # @private
+      def to_matcher
+        Mocha::ParameterMatchers::Equals.new(self)
+      end
+    end
+  end
+end
+
+# @private
+class Object
+  include Mocha::ParameterMatchers::InstanceMethods
+end

data/lib/mocha/raised_exception.rb

@@ -0,0 +1,11 @@
+module Mocha
+  class RaisedException
+    def initialize(exception)
+      @exception = exception
+    end
+
+    def mocha_inspect
+      "raised #{@exception}"
+    end
+  end
+end

data/lib/mocha/return_values.rb

@@ -12,11 +12,11 @@ module Mocha
       @values = values
     end
 
-    def next
+    def next(invocation)
       case @values.length
       when 0 then nil
-      when 1 then @values.first.evaluate
-      else @values.shift.evaluate
+      when 1 then @values.first.evaluate(invocation)
+      else @values.shift.evaluate(invocation)
       end
     end
 

data/lib/mocha/setup.rb

@@ -1,4 +1,9 @@
 require 'mocha/integration'
+require 'mocha/deprecation'
+
+Mocha::Deprecation.warning(
+  "Require 'mocha/test_unit', 'mocha/minitest' or 'mocha/api' instead of 'mocha/setup'."
+)
 
 module Mocha
   def self.activate

data/lib/mocha/single_return_value.rb

@@ -6,7 +6,8 @@ module Mocha
       @value = value
     end
 
-    def evaluate
+    def evaluate(invocation)
+      invocation.returned(@value)
       @value
     end
   end

data/lib/mocha/singleton_class.rb

@@ -0,0 +1,9 @@
+if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('1.9.2')
+  unless Kernel.method_defined?(:singleton_class)
+    module Kernel
+      def singleton_class
+        class << self; self; end
+      end
+    end
+  end
+end

data/lib/mocha/{class_method.rb → stubbed_method.rb}

@@ -1,8 +1,8 @@
 require 'mocha/ruby_version'
-require 'metaclass'
+require 'mocha/singleton_class'
 
 module Mocha
-  class ClassMethod
+  class StubbedMethod
     PrependedModule = Class.new(Module)
 
     attr_reader :stubbee, :method_name
@@ -28,15 +28,15 @@ module Mocha
     end
 
     def mock
-      stubbee.mocha
+      mock_owner.mocha
     end
 
     def reset_mocha
-      stubbee.reset_mocha
+      mock_owner.reset_mocha
     end
 
     def hide_original_method
-      return unless method_defined_in_stubbee_or_in_ancestor_chain?
+      return unless original_method_owner.__method_exists__?(method_name)
       store_original_method_visibility
       if use_prepended_module_for_stub_method?
         use_prepended_module_for_stub_method
@@ -55,29 +55,28 @@ module Mocha
     end
 
     def define_new_method
-      stub_method_owner.class_eval(*stub_method_definition)
-      return unless original_visibility
-      Module.instance_method(original_visibility).bind(stub_method_owner).call(method_name)
+      self_in_scope = self
+      method_name_in_scope = method_name
+      stub_method_owner.send(:define_method, method_name) do |*args, &block|
+        self_in_scope.mock.method_missing(method_name_in_scope, *args, &block)
+      end
+      retain_original_visibility(stub_method_owner)
     end
 
     def remove_new_method
       stub_method_owner.send(:remove_method, method_name)
     end
 
+    def store_original_method
+      @original_method = stubbee_method(method_name)
+    end
+
     def restore_original_method
       return if use_prepended_module_for_stub_method?
       if stub_method_overwrites_original_method?
-        if PRE_RUBY_V19
-          original_method_in_scope = original_method
-          original_method_owner.send(:define_method, method_name) do |*args, &block|
-            original_method_in_scope.call(*args, &block)
-          end
-        else
-          original_method_owner.send(:define_method, method_name, original_method)
-        end
+        original_method_owner.send(:define_method, method_name, method_body(original_method))
       end
-      return unless original_visibility
-      Module.instance_method(original_visibility).bind(stubbee.__metaclass__).call(method_name)
+      retain_original_visibility(original_method_owner)
     end
 
     def matches?(other)
@@ -91,23 +90,17 @@ module Mocha
       "#{stubbee}.#{method_name}"
     end
 
-    def method_visibility
-      (original_method_owner.public_method_defined?(method_name) && :public) ||
-        (original_method_owner.protected_method_defined?(method_name) && :protected) ||
-        (original_method_owner.private_method_defined?(method_name) && :private)
-    end
-    alias_method :method_defined_in_stubbee_or_in_ancestor_chain?, :method_visibility
-
     private
 
-    attr_reader :original_method, :original_visibility
-
-    def store_original_method
-      @original_method = stubbee._method(method_name)
+    def retain_original_visibility(method_owner)
+      return unless original_visibility
+      Module.instance_method(original_visibility).bind(method_owner).call(method_name)
     end
 
+    attr_reader :original_method, :original_visibility
+
     def store_original_method_visibility
-      @original_visibility = method_visibility
+      @original_visibility = original_method_owner.__method_visibility__(method_name)
     end
 
     def stub_method_overwrites_original_method?
@@ -127,21 +120,8 @@ module Mocha
       original_method_owner.__send__ :prepend, @stub_method_owner
     end
 
-    def stub_method_definition
-      method_implementation = <<-CODE
-      def #{method_name}(*args, &block)
-        mocha.method_missing(:#{method_name}, *args, &block)
-      end
-      CODE
-      [method_implementation, __FILE__, __LINE__ - 4]
-    end
-
     def stub_method_owner
       @stub_method_owner ||= original_method_owner
     end
-
-    def original_method_owner
-      stubbee.__metaclass__
-    end
   end
 end

data/lib/mocha/test_unit.rb

@@ -1,3 +1,8 @@
 require 'mocha/integration/test_unit'
+require 'mocha/deprecation'
 
-Mocha::Integration::TestUnit.activate
+unless Mocha::Integration::TestUnit.activate
+  Mocha::Deprecation.warning(
+    "Test::Unit must be loaded *before* `require 'mocha/test_unit'`."
+  )
+end

data/lib/mocha/thrower.rb

@@ -5,7 +5,8 @@ module Mocha
       @object = object
     end
 
-    def evaluate
+    def evaluate(invocation)
+      invocation.threw(@tag, @object)
       throw @tag, @object
     end
   end

data/lib/mocha/thrown_object.rb

@@ -0,0 +1,12 @@
+module Mocha
+  class ThrownObject
+    def initialize(tag, value = nil)
+      @tag = tag
+      @value = value
+    end
+
+    def mocha_inspect
+      "threw (#{@tag.mocha_inspect}, #{@value.mocha_inspect})"
+    end
+  end
+end

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = '1.9.0'.freeze
+  VERSION = '1.11.1'.freeze
 end

data/lib/mocha/yield_parameters.rb

@@ -1,7 +1,3 @@
-require 'mocha/no_yields'
-require 'mocha/single_yield'
-require 'mocha/multiple_yields'
-
 module Mocha
   class YieldParameters
     def initialize
@@ -10,18 +6,16 @@ module Mocha
 
     def next_invocation
       case @parameter_groups.length
-      when 0 then NoYields.new
+      when 0 then []
       when 1 then @parameter_groups.first
       else @parameter_groups.shift
       end
     end
 
-    def add(*parameters)
-      @parameter_groups << SingleYield.new(*parameters)
-    end
-
-    def multiple_add(*parameter_groups)
-      @parameter_groups << MultipleYields.new(*parameter_groups)
+    def add(*parameter_groups)
+      @parameter_groups << parameter_groups.map do |pg|
+        pg.is_a?(Array) ? pg : [pg]
+      end
     end
   end
 end

data/mocha.gemspec

@@ -2,7 +2,7 @@ lib = File.expand_path('../lib/', __FILE__)
 $LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 require 'mocha/version'
 
-Gem::Specification.new do |s|
+Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
   s.name = 'mocha'
   s.version = Mocha::VERSION
   s.licenses = ['MIT', 'BSD-2-Clause']
@@ -20,8 +20,6 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.summary = 'Mocking and stubbing library'
 
-  s.add_dependency('metaclass', '~> 0.0.1')
-
   unless s.respond_to?(:add_development_dependency)
     class << s
       def add_development_dependency(*args)

data/test/acceptance/acceptance_test_helper.rb

@@ -1,8 +1,15 @@
 require File.expand_path('../../test_helper', __FILE__)
 require 'test_runner'
 require 'mocha/configuration'
+require 'mocha/mockery'
 require 'introspection'
 
+if Mocha::Detection::MiniTest.testcase && (ENV['MOCHA_RUN_INTEGRATION_TESTS'] != 'test-unit')
+  require 'mocha/minitest'
+else
+  require 'mocha/test_unit'
+end
+
 module AcceptanceTest
   class FakeLogger
     attr_reader :warnings

data/test/acceptance/bug_18914_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class Bug18914Test < Mocha::TestCase
   include AcceptanceTest

data/test/acceptance/bug_21465_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class Bug21465Test < Mocha::TestCase
   include AcceptanceTest

data/test/acceptance/bug_21563_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class Bug21563Test < Mocha::TestCase
   include AcceptanceTest

data/test/acceptance/display_matching_invocations_alongside_expectations_test.rb

@@ -0,0 +1,69 @@
+require File.expand_path('../acceptance_test_helper', __FILE__)
+
+class DisplayMatchingInvocationsAlongsideExpectationsTest < Mocha::TestCase
+  include AcceptanceTest
+
+  def setup
+    setup_acceptance_test
+    Mocha.configuration.display_matching_invocations_on_failure = true
+  end
+
+  def test_should_display_results
+    test_result = run_as_test do
+      foo = mock('foo')
+      foo.expects(:bar).with(1).returns('a')
+      foo.stubs(:bar).with(any_parameters).returns('f').raises(StandardError).throws(:tag, 'value')
+
+      foo.bar(1, 2)
+      assert_raises(StandardError) { foo.bar(3, 4) }
+      assert_throws(:tag) { foo.bar(5, 6) }
+    end
+    assert_invocations(
+      test_result,
+      '- allowed any number of times, invoked 3 times: #<Mock:foo>.bar(any_parameters)',
+      '  - #<Mock:foo>.bar(1, 2) # => "f"',
+      '  - #<Mock:foo>.bar(3, 4) # => raised StandardError',
+      '  - #<Mock:foo>.bar(5, 6) # => threw (:tag, "value")'
+    )
+  end
+
+  def test_should_display_yields
+    test_result = run_as_test do
+      foo = mock('foo')
+      foo.expects(:bar).with(1).returns('a')
+      foo.stubs(:bar).with(any_parameters).multiple_yields('bc', %w[d e]).returns('f').raises(StandardError).throws(:tag, 'value')
+
+      foo.bar(1, 2) { |_ignored| }
+      assert_raises(StandardError) { foo.bar(3, 4) { |_ignored| } }
+      assert_throws(:tag) { foo.bar(5, 6) { |_ignored| } }
+    end
+    assert_invocations(
+      test_result,
+      '- allowed any number of times, invoked 3 times: #<Mock:foo>.bar(any_parameters)',
+      '  - #<Mock:foo>.bar(1, 2) { ... } # => "f" after yielding ("bc"), then ("d", "e")',
+      '  - #<Mock:foo>.bar(3, 4) { ... } # => raised StandardError after yielding ("bc"), then ("d", "e")',
+      '  - #<Mock:foo>.bar(5, 6) { ... } # => threw (:tag, "value") after yielding ("bc"), then ("d", "e")'
+    )
+  end
+
+  def test_should_display_empty_yield_and_return
+    test_result = run_as_test do
+      foo = mock('foo')
+      foo.expects(:bar).with(1).returns('a')
+      foo.stubs(:bar).with(any_parameters).yields
+
+      foo.bar(1, 2) { |_ignored| }
+    end
+    assert_invocations(
+      test_result,
+      '- allowed any number of times, invoked once: #<Mock:foo>.bar(any_parameters)',
+      '  - #<Mock:foo>.bar(1, 2) { ... } # => nil after yielding ()'
+    )
+  end
+
+  def assert_invocations(test_result, *invocations)
+    assert_failed(test_result)
+    assert_equal invocations.unshift('satisfied expectations:'),
+                 test_result.failure_message_lines[-invocations.size..-1]
+  end
+end