mocha 2.8.2 → 3.0.0.pre.rc.1

data/lib/mocha/integration/test_unit.rb

@@ -1,4 +1,5 @@
-require 'mocha/debug'
+# frozen_string_literal: true
+
 require 'mocha/detection/test_unit'
 require 'mocha/integration/test_unit/adapter'
 
@@ -10,14 +11,14 @@ module Mocha
         return false unless target
 
         test_unit_version = Gem::Version.new(Detection::TestUnit.version)
-        Debug.puts "Detected Test::Unit version: #{test_unit_version}"
+        warn "Detected Test::Unit version: #{test_unit_version}" if $DEBUG
 
         unless TestUnit::Adapter.applicable_to?(test_unit_version)
           raise 'Versions of test-unit earlier than v2.5.1 are not supported.'
         end
 
         unless target < TestUnit::Adapter
-          Debug.puts "Applying #{TestUnit::Adapter.description}"
+          warn "Applying #{TestUnit::Adapter.description}" if $DEBUG
           target.send(:include, TestUnit::Adapter)
         end
 

data/lib/mocha/invocation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameters_matcher'
 require 'mocha/raised_exception'
 require 'mocha/return_values'
@@ -21,6 +23,7 @@ module Mocha
       yield_parameters.next_invocation.each do |yield_args|
         @yields << ParametersMatcher.new(yield_args)
         raise LocalJumpError unless @block
+
         @block.call(*yield_args)
       end
       return_values.next(self)
@@ -43,9 +46,9 @@ module Mocha
     end
 
     def call_description
-      description = "#{@mock.mocha_inspect}.#{@method_name}#{argument_description}"
-      description << ' { ... }' unless @block.nil?
-      description
+      strings = ["#{@mock.mocha_inspect}.#{@method_name}#{argument_description}"]
+      strings << ' { ... }' unless @block.nil?
+      strings.join
     end
 
     def short_call_description
@@ -53,9 +56,9 @@ module Mocha
     end
 
     def result_description
-      desc = "# => #{@result.mocha_inspect}"
-      desc << " after yielding #{@yields.map(&:mocha_inspect).join(', then ')}" if @yields.any?
-      desc
+      strings = ["# => #{@result.mocha_inspect}"]
+      strings << " after yielding #{@yields.map(&:mocha_inspect).join(', then ')}" if @yields.any?
+      strings.join
     end
 
     def full_description

data/lib/mocha/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   class Logger
     def initialize(io)

data/lib/mocha/macos_version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   MACOS = /darwin/.match(RUBY_PLATFORM)
   MACOS_VERSION = MACOS && /darwin(\d+)/.match(RUBY_PLATFORM)[1].to_i

data/lib/mocha/method_matcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   class MethodMatcher
     attr_reader :expected_method_name

data/lib/mocha/minitest.rb

@@ -1,4 +1,5 @@
-require 'mocha/ruby_version'
+# frozen_string_literal: true
+
 require 'mocha/integration/minitest'
 
 unless Mocha::Integration::Minitest.activate

data/lib/mocha/mock.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'ruby2_keywords'
 require 'mocha/expectation'
 require 'mocha/expectation_list'
 require 'mocha/invocation'
-require 'mocha/names'
-require 'mocha/receivers'
+require 'mocha/default_name'
+require 'mocha/default_receiver'
 require 'mocha/method_matcher'
 require 'mocha/parameters_matcher'
 require 'mocha/argument_iterator'
@@ -114,8 +116,7 @@ module Mocha
     def expects(method_name_or_hash, backtrace = nil)
       expectation = nil
       iterator = ArgumentIterator.new(method_name_or_hash)
-      iterator.each do |*args|
-        method_name = args.shift
+      iterator.each do |method_name, *args|
         ensure_method_not_already_defined(method_name)
         expectation = Expectation.new(self, method_name, backtrace)
         expectation.in_sequence(@mockery.sequences.last) if @mockery.sequences.any?
@@ -153,8 +154,7 @@ module Mocha
     def stubs(method_name_or_hash, backtrace = nil)
       expectation = nil
       iterator = ArgumentIterator.new(method_name_or_hash)
-      iterator.each do |*args|
-        method_name = args.shift
+      iterator.each do |method_name, *args|
         ensure_method_not_already_defined(method_name)
         expectation = Expectation.new(self, method_name, backtrace)
         expectation.at_least(0)
@@ -315,13 +315,13 @@ module Mocha
     end
 
     # @private
-    def method_missing(symbol, *arguments, &block) # rubocop:disable Style/MethodMissingSuper
+    def method_missing(symbol, *arguments, &block)
       handle_method_call(symbol, arguments, block)
     end
     ruby2_keywords(:method_missing)
 
     # @private
-    def handle_method_call(symbol, arguments, block) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    def handle_method_call(symbol, arguments, block)
       check_expiry
       check_responder_responds_to(symbol)
       invocation = Invocation.new(self, symbol, arguments, block)

data/lib/mocha/mockery.rb

@@ -1,7 +1,12 @@
+# frozen_string_literal: true
+
 require 'mocha/central'
 require 'mocha/mock'
-require 'mocha/names'
-require 'mocha/receivers'
+require 'mocha/name'
+require 'mocha/impersonating_name'
+require 'mocha/impersonating_any_instance_name'
+require 'mocha/object_receiver'
+require 'mocha/any_instance_receiver'
 require 'mocha/state_machine'
 require 'mocha/logger'
 require 'mocha/configuration'
@@ -49,9 +54,13 @@ module Mocha
       end
 
       def teardown(origin = nil)
+        if @instances.nil?
+          raise NotInitializedError, 'Mocha::Mockery.teardown called before Mocha::Mockery.setup'
+        end
+
         instance.teardown(origin)
       ensure
-        @instances.pop
+        @instances.pop unless @instances.nil?
       end
     end
 
@@ -124,12 +133,11 @@ module Mocha
     def on_stubbing(object, method)
       signature_proc = lambda { "#{object.mocha_inspect}.#{method}" }
       check(:stubbing_non_existent_method, 'non-existent method', signature_proc) do
-        !(object.stubba_class.__method_exists__?(method, true) || object.respond_to?(method))
+        !(object.stubba_class.__method_exists__?(method) || object.respond_to?(method))
       end
       check(:stubbing_non_public_method, 'non-public method', signature_proc) do
-        object.stubba_class.__method_exists__?(method, false)
+        object.stubba_class.__method_exists__?(method, include_public_methods: false)
       end
-      check(:stubbing_method_on_nil, 'method on nil', signature_proc) { object.nil? }
       check(:stubbing_method_on_non_mock_object, 'method on non-mock object', signature_proc)
     end
 
@@ -144,9 +152,11 @@ module Mocha
     def check(action, description, signature_proc, backtrace = caller)
       treatment = Mocha.configuration.send(action)
       return if (treatment == :allow) || (block_given? && !yield)
+
       method_signature = signature_proc.call
       message = "stubbing #{description}: #{method_signature}"
       raise StubbingError.new(message, backtrace) if treatment == :prevent
+
       logger.warn(message) if treatment == :warn
     end
 

data/lib/mocha/name.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Mocha
+  class Name
+    def initialize(name)
+      @name = name.to_s
+    end
+
+    def mocha_inspect
+      "#<Mock:#{@name}>"
+    end
+  end
+end

data/lib/mocha/not_initialized_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/error_with_filtered_backtrace'
 
 module Mocha

data/lib/mocha/object_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/mockery'
 require 'mocha/instance_method'
 require 'mocha/argument_iterator'
@@ -12,7 +14,7 @@ module Mocha
     alias_method :_method, :method
 
     # @private
-    def mocha(instantiate = true)
+    def mocha(instantiate: true)
       if instantiate
         @mocha ||= Mocha::Mockery.instance.mock_impersonating(self)
       else
@@ -75,11 +77,11 @@ module Mocha
       if frozen?
         raise StubbingError.new("can't stub method on frozen object: #{mocha_inspect}", caller)
       end
+
       expectation = nil
       mockery = Mocha::Mockery.instance
       iterator = ArgumentIterator.new(expected_methods_vs_return_values)
-      iterator.each do |*args|
-        method_name = args.shift
+      iterator.each do |method_name, *args|
         mockery.on_stubbing(self, method_name)
         method = stubba_method.new(stubba_object, method_name)
         mockery.stubba.stub(method)
@@ -121,11 +123,11 @@ module Mocha
       if frozen?
         raise StubbingError.new("can't stub method on frozen object: #{mocha_inspect}", caller)
       end
+
       expectation = nil
       mockery = Mocha::Mockery.instance
       iterator = ArgumentIterator.new(stubbed_methods_vs_return_values)
-      iterator.each do |*args|
-        method_name = args.shift
+      iterator.each do |method_name, *args|
         mockery.on_stubbing(self, method_name)
         method = stubba_method.new(stubba_object, method_name)
         mockery.stubba.stub(method)

data/lib/mocha/object_receiver.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Mocha
+  class ObjectReceiver
+    def initialize(object)
+      @object = object
+    end
+
+    def mocks
+      object = @object
+      mocks = []
+      while object
+        mocha = object.mocha(instantiate: false)
+        mocks << mocha if mocha
+        object = object.is_a?(Class) ? object.superclass : nil
+      end
+      mocks
+    end
+  end
+end

data/lib/mocha/parameter_matchers/all_of.rb

@@ -1,37 +1,34 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
-require 'mocha/parameter_matchers/deprecations'
 
 module Mocha
   module ParameterMatchers
-    module Methods
-      # Matches if all +matchers+ match.
-      #
-      # @param [*Array<BaseMethods>] matchers parameter matchers.
-      # @return [AllOf] parameter matcher.
-      #
-      # @see Expectation#with
-      #
-      # @example All parameter matchers match.
-      #   object = mock()
-      #   object.expects(:method_1).with(all_of(includes(1), includes(3)))
-      #   object.method_1([1, 3])
-      #   # no error raised
-      #
-      # @example One of the parameter matchers does not match.
-      #   object = mock()
-      #   object.expects(:method_1).with(all_of(includes(1), includes(3)))
-      #   object.method_1([1, 2])
-      #   # error raised, because method_1 was not called with object including 1 and 3
-      def all_of(*matchers)
-        AllOf.new(*matchers)
-      end
+    # Matches if all +matchers+ match.
+    #
+    # @param [*Array<Base>] matchers parameter matchers.
+    # @return [AllOf] parameter matcher.
+    #
+    # @see Expectation#with
+    #
+    # @example All parameter matchers match.
+    #   object = mock()
+    #   object.expects(:method_1).with(all_of(includes(1), includes(3)))
+    #   object.method_1([1, 3])
+    #   # no error raised
+    #
+    # @example One of the parameter matchers does not match.
+    #   object = mock()
+    #   object.expects(:method_1).with(all_of(includes(1), includes(3)))
+    #   object.method_1([1, 2])
+    #   # error raised, because method_1 was not called with object including 1 and 3
+    def all_of(*matchers)
+      AllOf.new(*matchers)
     end
 
-    define_deprecated_matcher_method(:all_of)
-
     # Parameter matcher which combines a number of other matchers using a logical AND.
     class AllOf
-      include BaseMethods
+      include Base
 
       # @private
       def initialize(*matchers)
@@ -49,7 +46,5 @@ module Mocha
         "all_of(#{@matchers.map(&:mocha_inspect).join(', ')})"
       end
     end
-
-    provide_deprecated_access_to(:AllOf)
   end
 end

data/lib/mocha/parameter_matchers/any_of.rb

@@ -1,43 +1,40 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
-require 'mocha/parameter_matchers/deprecations'
 
 module Mocha
   module ParameterMatchers
-    module Methods
-      # Matches if any +matchers+ match.
-      #
-      # @param [*Array<BaseMethods>] matchers parameter matchers.
-      # @return [AnyOf] parameter matcher.
-      #
-      # @see Expectation#with
-      #
-      # @example One parameter matcher matches.
-      #   object = mock()
-      #   object.expects(:method_1).with(any_of(1, 3))
-      #   object.method_1(1)
-      #   # no error raised
-      #
-      # @example The other parameter matcher matches.
-      #   object = mock()
-      #   object.expects(:method_1).with(any_of(1, 3))
-      #   object.method_1(3)
-      #   # no error raised
-      #
-      # @example Neither parameter matcher matches.
-      #   object = mock()
-      #   object.expects(:method_1).with(any_of(1, 3))
-      #   object.method_1(2)
-      #   # error raised, because method_1 was not called with 1 or 3
-      def any_of(*matchers)
-        AnyOf.new(*matchers)
-      end
+    # Matches if any +matchers+ match.
+    #
+    # @param [*Array<Base>] matchers parameter matchers.
+    # @return [AnyOf] parameter matcher.
+    #
+    # @see Expectation#with
+    #
+    # @example One parameter matcher matches.
+    #   object = mock()
+    #   object.expects(:method_1).with(any_of(1, 3))
+    #   object.method_1(1)
+    #   # no error raised
+    #
+    # @example The other parameter matcher matches.
+    #   object = mock()
+    #   object.expects(:method_1).with(any_of(1, 3))
+    #   object.method_1(3)
+    #   # no error raised
+    #
+    # @example Neither parameter matcher matches.
+    #   object = mock()
+    #   object.expects(:method_1).with(any_of(1, 3))
+    #   object.method_1(2)
+    #   # error raised, because method_1 was not called with 1 or 3
+    def any_of(*matchers)
+      AnyOf.new(*matchers)
     end
 
-    define_deprecated_matcher_method(:any_of)
-
     # Parameter matcher which combines a number of other matchers using a logical OR.
     class AnyOf
-      include BaseMethods
+      include Base
 
       # @private
       def initialize(*matchers)
@@ -55,7 +52,5 @@ module Mocha
         "any_of(#{@matchers.map(&:mocha_inspect).join(', ')})"
       end
     end
-
-    provide_deprecated_access_to(:AnyOf)
   end
 end

data/lib/mocha/parameter_matchers/any_parameters.rb

@@ -1,35 +1,32 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
-require 'mocha/parameter_matchers/deprecations'
 
 module Mocha
   module ParameterMatchers
-    module Methods
-      # Matches any parameters. This is used as the default for a newly built expectation.
-      #
-      # @return [AnyParameters] parameter matcher.
-      #
-      # @see Expectation#with
-      #
-      # @example Any parameters will match.
-      #   object = mock()
-      #   object.expects(:method_1).with(any_parameters)
-      #   object.method_1(1, 2, 3, 4)
-      #   # no error raised
-      #
-      #   object = mock()
-      #   object.expects(:method_1).with(any_parameters)
-      #   object.method_1(5, 6, 7, 8, 9, 0)
-      #   # no error raised
-      def any_parameters
-        AnyParameters.new
-      end
+    # Matches any parameters. This is used as the default for a newly built expectation.
+    #
+    # @return [AnyParameters] parameter matcher.
+    #
+    # @see Expectation#with
+    #
+    # @example Any parameters will match.
+    #   object = mock()
+    #   object.expects(:method_1).with(any_parameters)
+    #   object.method_1(1, 2, 3, 4)
+    #   # no error raised
+    #
+    #   object = mock()
+    #   object.expects(:method_1).with(any_parameters)
+    #   object.method_1(5, 6, 7, 8, 9, 0)
+    #   # no error raised
+    def any_parameters
+      AnyParameters.new
     end
 
-    define_deprecated_matcher_method(:any_parameters)
-
     # Parameter matcher which always matches whatever the parameters.
     class AnyParameters
-      include BaseMethods
+      include Base
 
       # @private
       def matches?(available_parameters)
@@ -44,7 +41,5 @@ module Mocha
         'any_parameters'
       end
     end
-
-    provide_deprecated_access_to(:AnyParameters)
   end
 end

data/lib/mocha/parameter_matchers/anything.rb

@@ -1,32 +1,29 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
-require 'mocha/parameter_matchers/deprecations'
 
 module Mocha
   module ParameterMatchers
-    module Methods
-      # Matches any object.
-      #
-      # @return [Anything] parameter matcher.
-      #
-      # @see Expectation#with
-      #
-      # @example Any object will match.
-      #   object = mock()
-      #   object.expects(:method_1).with(anything)
-      #   object.method_1('foo')
-      #   object.method_1(789)
-      #   object.method_1(:bar)
-      #   # no error raised
-      def anything
-        Anything.new
-      end
+    # Matches any object.
+    #
+    # @return [Anything] parameter matcher.
+    #
+    # @see Expectation#with
+    #
+    # @example Any object will match.
+    #   object = mock()
+    #   object.expects(:method_1).with(anything)
+    #   object.method_1('foo')
+    #   object.method_1(789)
+    #   object.method_1(:bar)
+    #   # no error raised
+    def anything
+      Anything.new
     end
 
-    define_deprecated_matcher_method(:anything)
-
     # Parameter matcher which always matches a single parameter.
     class Anything
-      include BaseMethods
+      include Base
 
       # @private
       def matches?(available_parameters)
@@ -39,7 +36,5 @@ module Mocha
         'anything'
       end
     end
-
-    provide_deprecated_access_to(:Anything)
   end
 end

data/lib/mocha/parameter_matchers/base.rb

@@ -1,17 +1,16 @@
-require 'mocha/deprecation'
-require 'mocha/parameter_matchers/deprecations'
+# frozen_string_literal: true
 
 module Mocha
   module ParameterMatchers
-    # @abstract Include and implement +#matches?+ and +#mocha_inspect+ to define a custom matcher. Also add a suitably named instance method to {Methods} to build an instance of the new matcher c.f. {Methods#equals}.
-    module BaseMethods
+    # @abstract Include and implement +#matches?+ and +#mocha_inspect+ to define a custom matcher. Also add a suitably named instance method to {ParameterMatchers} to build an instance of the new matcher c.f. {#equals}.
+    module Base
       # A shorthand way of combining two matchers when both must match.
       #
       # Returns a new {AllOf} parameter matcher combining two matchers using a logical AND.
       #
       # This shorthand will not work with an implicit equals match. Instead, an explicit {Equals} matcher should be used.
       #
-      # @param [BaseMethods] other parameter matcher.
+      # @param [Base] other parameter matcher.
       # @return [AllOf] parameter matcher.
       #
       # @see Expectation#with
@@ -35,7 +34,7 @@ module Mocha
       #
       # This shorthand will not work with an implicit equals match. Instead, an explicit {Equals} matcher should be used.
       #
-      # @param [BaseMethods] other parameter matcher.
+      # @param [Base] other parameter matcher.
       # @return [AnyOf] parameter matcher.
       #
       # @see Expectation#with
@@ -59,22 +58,5 @@ module Mocha
         AnyOf.new(self, other)
       end
     end
-
-    provide_deprecated_access_to(:BaseMethods)
-
-    # @deprecated Include +BaseMethods+ module instead.
-    class Base
-      include BaseMethods
-
-      # @private
-      def self.inherited(subclass)
-        super
-        Deprecation.warning(
-          "Include #{BaseMethods} module into #{subclass} instead of inheriting from #{self}."
-        )
-      end
-    end
-
-    provide_deprecated_access_to(:Base)
   end
 end