mocha 1.4.0 → 1.7.0

data/lib/mocha/integration/test_unit/gem_version_230_to_250.rb

@@ -6,12 +6,12 @@ module Mocha
   module Integration
     module TestUnit
       module GemVersion230To250
-        def self.applicable_to?(test_unit_version, ruby_version = nil)
+        def self.applicable_to?(test_unit_version, _ruby_version = nil)
           Gem::Requirement.new('>= 2.3.0', '<= 2.5.0').satisfied_by?(test_unit_version)
         end
 
         def self.description
-          "monkey patch for Test::Unit gem >= v2.3.0 and <= v2.5.0"
+          'monkey patch for Test::Unit gem >= v2.3.0 and <= v2.5.0'
         end
 
         def self.included(mod)
@@ -19,6 +19,7 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run(result)
             assertion_counter = AssertionCounter.new(self)
             begin
@@ -28,6 +29,7 @@ module Mocha
               yield(Test::Unit::TestCase::STARTED_OBJECT, self)
               begin
                 begin
+                  mocha_setup
                   run_setup
                   run_test
                   run_cleanup
@@ -58,6 +60,7 @@ module Mocha
               # @_result = nil # For test-spec's after_all :<
             end
           end
+          # rubocop:enable all
         end
       end
     end

data/lib/mocha/integration/test_unit/nothing.rb

@@ -2,16 +2,16 @@ module Mocha
   module Integration
     module TestUnit
       module Nothing
-        def self.applicable_to?(test_unit_version, ruby_version = nil)
+        def self.applicable_to?(_test_unit_version, _ruby_version = nil)
           true
         end
 
         def self.description
-          "nothing (no Test::Unit integration available)"
+          'nothing (no Test::Unit integration available)'
         end
 
-        def self.included(mod)
-          raise "No Test::Unit integration available"
+        def self.included(_mod)
+          raise 'No Test::Unit integration available'
         end
       end
     end

data/lib/mocha/integration/test_unit/ruby_version_185_and_below.rb

@@ -11,7 +11,7 @@ module Mocha
         end
 
         def self.description
-          "monkey patch for standard library in Ruby <= v1.8.5"
+          'monkey patch for standard library in Ruby <= v1.8.5'
         end
 
         def self.included(mod)
@@ -19,12 +19,14 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run(result)
             assertion_counter = AssertionCounter.new(self)
             yield(Test::Unit::TestCase::STARTED, name)
             @_result = result
             begin
               begin
+                mocha_setup
                 setup
                 __send__(@method_name)
                 mocha_verify(assertion_counter)
@@ -51,6 +53,7 @@ module Mocha
             result.add_run
             yield(Test::Unit::TestCase::FINISHED, name)
           end
+          # rubocop:enable all
         end
       end
     end

data/lib/mocha/integration/test_unit/ruby_version_186_and_above.rb

@@ -11,7 +11,7 @@ module Mocha
         end
 
         def self.description
-          "monkey patch for standard library Test::Unit in Ruby >= v1.8.6"
+          'monkey patch for standard library Test::Unit in Ruby >= v1.8.6'
         end
 
         def self.included(mod)
@@ -19,12 +19,14 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run(result)
             assertion_counter = AssertionCounter.new(self)
             yield(Test::Unit::TestCase::STARTED, name)
             @_result = result
             begin
               begin
+                mocha_setup
                 setup
                 __send__(@method_name)
                 mocha_verify(assertion_counter)
@@ -53,6 +55,7 @@ module Mocha
             result.add_run
             yield(Test::Unit::TestCase::FINISHED, name)
           end
+          # rubocop:enable all
         end
       end
     end

data/lib/mocha/integration.rb

@@ -5,10 +5,9 @@ require 'mocha/integration/mini_test'
 module Mocha
   module Integration
     def self.activate
-      if [Integration::TestUnit, Integration::MiniTest].map(&:activate).none?
-        Deprecation.warning("Test::Unit or MiniTest must be loaded *before* `require 'mocha/setup'`.")
-        Deprecation.warning("If you're integrating with a test library other than Test::Unit or MiniTest, you should use `require 'mocha/api'` instead of `require 'mocha/setup'`.")
-      end
+      return unless [Integration::TestUnit, Integration::MiniTest].map(&:activate).none?
+      Deprecation.warning("Test::Unit or MiniTest must be loaded *before* `require 'mocha/setup'`.")
+      Deprecation.warning("If you're integrating with a test library other than Test::Unit or MiniTest, you should use `require 'mocha/api'` instead of `require 'mocha/setup'`.")
     end
   end
 end

data/lib/mocha/is_a.rb

@@ -1,9 +1,7 @@
 class Object
-
   # :stopdoc:
 
   alias_method :__is_a__, :is_a?
 
   # :startdoc:
-
 end

data/lib/mocha/logger.rb

@@ -1,7 +1,5 @@
 module Mocha
-
   class Logger
-
     def initialize(io)
       @io = io
     end
@@ -9,7 +7,5 @@ module Mocha
     def warn(message)
       @io.puts "WARNING: #{message}"
     end
-
   end
-
 end

data/lib/mocha/method_matcher.rb

@@ -1,7 +1,5 @@
 module Mocha
-
   class MethodMatcher
-
     attr_reader :expected_method_name
 
     def initialize(expected_method_name)
@@ -13,9 +11,7 @@ module Mocha
     end
 
     def mocha_inspect
-      "#{@expected_method_name}"
+      @expected_method_name.to_s
     end
-
   end
-
 end

data/lib/mocha/minitest.rb

@@ -1,3 +1,3 @@
-require "mocha/integration/mini_test"
+require 'mocha/integration/mini_test'
 
 Mocha::Integration::MiniTest.activate

data/lib/mocha/mock.rb

@@ -12,7 +12,6 @@ require 'mocha/deprecation'
 require 'mocha/ruby_version'
 
 module Mocha
-
   # Traditional mock object.
   #
   # All methods return an {Expectation} which can be further modified by
@@ -69,7 +68,6 @@ module Mocha
   # different mock objects, use the {Expectation#in_sequence} method to
   # explicitly define a total or partial ordering of invocations.
   class Mock
-
     # Adds an expectation that the specified method must be called exactly once with any parameters.
     #
     # @param [Symbol,String] method_name name of expected method
@@ -106,13 +104,13 @@ module Mocha
     #   object.expects(:expected_method_two).returns(:result_two)
     def expects(method_name_or_hash, backtrace = nil)
       iterator = ArgumentIterator.new(method_name_or_hash)
-      iterator.each { |*args|
+      iterator.each do |*args|
         method_name = args.shift
         ensure_method_not_already_defined(method_name)
         expectation = Expectation.new(self, method_name, backtrace)
-        expectation.returns(args.shift) if args.length > 0
+        expectation.returns(args.shift) unless args.empty?
         @expectations.add(expectation)
-      }
+      end
     end
 
     # Adds an expectation that the specified method may be called any number of times with any parameters.
@@ -142,14 +140,14 @@ module Mocha
     #   object.stubs(:stubbed_method_two).returns(:result_two)
     def stubs(method_name_or_hash, backtrace = nil)
       iterator = ArgumentIterator.new(method_name_or_hash)
-      iterator.each { |*args|
+      iterator.each do |*args|
         method_name = args.shift
         ensure_method_not_already_defined(method_name)
         expectation = Expectation.new(self, method_name, backtrace)
         expectation.at_least(0)
-        expectation.returns(args.shift) if args.length > 0
+        expectation.returns(args.shift) unless args.empty?
         @expectations.add(expectation)
-      }
+      end
     end
 
     # Removes the specified stubbed method (added by calls to {#expects} or {#stubs}) and all expectations associated with it.
@@ -261,10 +259,9 @@ module Mocha
       @everything_stubbed = false
       @responder = nil
       @unexpected_invocation = nil
-      if block
-        Deprecation.warning('Passing a block is deprecated. Use Object#tap or define stubs/expectations with an explicit receiver instead.')
-        instance_eval(&block)
-      end
+      return unless block
+      Deprecation.warning('Passing a block is deprecated. Use Object#tap or define stubs/expectations with an explicit receiver instead.')
+      instance_eval(&block)
     end
 
     # @private
@@ -293,30 +290,30 @@ module Mocha
     end
 
     # @private
+    # rubocop:disable Style/MethodMissingSuper
     def method_missing(symbol, *arguments, &block)
-      if @responder and not @responder.respond_to?(symbol)
-        raise NoMethodError, "undefined method `#{symbol}' for #{self.mocha_inspect} which responds like #{@responder.mocha_inspect}"
+      if @responder && !@responder.respond_to?(symbol)
+        raise NoMethodError, "undefined method `#{symbol}' for #{mocha_inspect} which responds like #{@responder.mocha_inspect}"
       end
-      if matching_expectation_allowing_invocation = all_expectations.match_allowing_invocation(symbol, *arguments)
+      if (matching_expectation_allowing_invocation = all_expectations.match_allowing_invocation(symbol, *arguments))
         matching_expectation_allowing_invocation.invoke(&block)
-      else
-        if (matching_expectation = all_expectations.match(symbol, *arguments)) || (!matching_expectation && !@everything_stubbed)
-          if @unexpected_invocation.nil?
-            @unexpected_invocation = UnexpectedInvocation.new(self, symbol, *arguments)
-            matching_expectation.invoke(&block) if matching_expectation
-            message = @unexpected_invocation.full_description
-            message << @mockery.mocha_inspect
-          else
-            message = @unexpected_invocation.short_description
-          end
-          raise ExpectationErrorFactory.build(message, caller)
+      elsif (matching_expectation = all_expectations.match(symbol, *arguments)) || (!matching_expectation && !@everything_stubbed)
+        if @unexpected_invocation.nil?
+          @unexpected_invocation = UnexpectedInvocation.new(self, symbol, *arguments)
+          matching_expectation.invoke(&block) if matching_expectation
+          message = @unexpected_invocation.full_description
+          message << @mockery.mocha_inspect
+        else
+          message = @unexpected_invocation.short_description
         end
+        raise ExpectationErrorFactory.build(message, caller)
       end
     end
+    # rubocop:enable Style/MethodMissingSuper
 
     # @private
     def respond_to_missing?(symbol, include_private = false)
-      if @responder then
+      if @responder
         if @responder.method(:respond_to?).arity > 1
           @responder.respond_to?(symbol, include_private)
         else
@@ -351,14 +348,12 @@ module Mocha
 
     # @private
     def ensure_method_not_already_defined(method_name)
-      self.__metaclass__.send(:undef_method, method_name) if self.__metaclass__.method_defined?(method_name) || self.__metaclass__.private_method_defined?(method_name)
+      __metaclass__.send(:undef_method, method_name) if __metaclass__.method_defined?(method_name) || __metaclass__.private_method_defined?(method_name)
     end
 
     # @private
     def any_expectations?
       @expectations.any?
     end
-
   end
-
 end

data/lib/mocha/mockery.rb

@@ -7,16 +7,41 @@ require 'mocha/state_machine'
 require 'mocha/logger'
 require 'mocha/configuration'
 require 'mocha/stubbing_error'
+require 'mocha/not_initialized_error'
 require 'mocha/expectation_error_factory'
 
 module Mocha
-
   class Mockery
+    class Null < self
+      def add_mock(*)
+        raise_not_initialized_error
+      end
 
-    class << self
+      def add_state_machine(*)
+        raise_not_initialized_error
+      end
+
+      def stubba
+        Central::Null.new(&method(:raise_not_initialized_error))
+      end
+
+      private
 
+      def raise_not_initialized_error
+        message = 'Mocha methods cannot be used outside the context of a test'
+        raise NotInitializedError.new(message, caller)
+      end
+    end
+
+    class << self
       def instance
-        @instance ||= new
+        instances.last || Null.new
+      end
+
+      def setup
+        mockery = new
+        mockery.logger = instance.logger unless instances.empty?
+        @instances.push(mockery)
       end
 
       def verify(*args)
@@ -25,12 +50,16 @@ module Mocha
 
       def teardown
         instance.teardown
+      ensure
+        @instances.pop
+        @instances = nil if instances.empty?
       end
 
-      def reset_instance
-        @instance = nil
-      end
+      private
 
+      def instances
+        @instances ||= []
+      end
     end
 
     def named_mock(name, &block)
@@ -56,18 +85,17 @@ module Mocha
     def verify(assertion_counter = nil)
       unless mocks.all? { |mock| mock.__verified__?(assertion_counter) }
         message = "not all expectations were satisfied\n#{mocha_inspect}"
-        if unsatisfied_expectations.empty?
-          backtrace = caller
-        else
-          backtrace = unsatisfied_expectations[0].backtrace
-        end
+        backtrace = if unsatisfied_expectations.empty?
+                      caller
+                    else
+                      unsatisfied_expectations[0].backtrace
+                    end
         raise ExpectationErrorFactory.build(message, backtrace)
       end
       expectations.each do |e|
         unless Mocha::Configuration.allow?(:stubbing_method_unnecessarily)
-          unless e.used?
-            on_stubbing_method_unnecessarily(e)
-          end
+          next if e.used?
+          on_stubbing_method_unnecessarily(e)
         end
       end
     end
@@ -90,22 +118,22 @@ module Mocha
     end
 
     def mocha_inspect
-      message = ""
-      message << "unsatisfied expectations:\n- #{unsatisfied_expectations.map { |e| e.mocha_inspect }.join("\n- ")}\n" unless unsatisfied_expectations.empty?
-      message << "satisfied expectations:\n- #{satisfied_expectations.map { |e| e.mocha_inspect }.join("\n- ")}\n" unless satisfied_expectations.empty?
-      message << "states:\n- #{state_machines.map { |sm| sm.mocha_inspect }.join("\n- ")}" unless state_machines.empty?
+      message = ''
+      message << "unsatisfied expectations:\n- #{unsatisfied_expectations.map(&:mocha_inspect).join("\n- ")}\n" unless unsatisfied_expectations.empty?
+      message << "satisfied expectations:\n- #{satisfied_expectations.map(&:mocha_inspect).join("\n- ")}\n" unless satisfied_expectations.empty?
+      message << "states:\n- #{state_machines.map(&:mocha_inspect).join("\n- ")}" unless state_machines.empty?
       message
     end
 
     def on_stubbing(object, method)
       method = PRE_RUBY_V19 ? method.to_s : method.to_sym
       unless Mocha::Configuration.allow?(:stubbing_non_existent_method)
-        unless object.method_exists?(method, include_public_methods = true)
+        unless object.method_exists?(method, true)
           on_stubbing_non_existent_method(object, method)
         end
       end
       unless Mocha::Configuration.allow?(:stubbing_non_public_method)
-        if object.method_exists?(method, include_public_methods = false)
+        if object.method_exists?(method, false)
           on_stubbing_non_public_method(object, method)
         end
       end
@@ -114,54 +142,48 @@ module Mocha
           on_stubbing_method_on_nil(object, method)
         end
       end
-      unless Mocha::Configuration.allow?(:stubbing_method_on_non_mock_object)
-        on_stubbing_method_on_non_mock_object(object, method)
-      end
+      return if Mocha::Configuration.allow?(:stubbing_method_on_non_mock_object)
+      on_stubbing_method_on_non_mock_object(object, method)
     end
 
     def on_stubbing_non_existent_method(object, method)
       if Mocha::Configuration.prevent?(:stubbing_non_existent_method)
         raise StubbingError.new("stubbing non-existent method: #{object.mocha_inspect}.#{method}", caller)
       end
-      if Mocha::Configuration.warn_when?(:stubbing_non_existent_method)
-        logger.warn "stubbing non-existent method: #{object.mocha_inspect}.#{method}"
-      end
+      return unless Mocha::Configuration.warn_when?(:stubbing_non_existent_method)
+      logger.warn "stubbing non-existent method: #{object.mocha_inspect}.#{method}"
     end
 
     def on_stubbing_non_public_method(object, method)
       if Mocha::Configuration.prevent?(:stubbing_non_public_method)
         raise StubbingError.new("stubbing non-public method: #{object.mocha_inspect}.#{method}", caller)
       end
-      if Mocha::Configuration.warn_when?(:stubbing_non_public_method)
-        logger.warn "stubbing non-public method: #{object.mocha_inspect}.#{method}"
-      end
+      return unless Mocha::Configuration.warn_when?(:stubbing_non_public_method)
+      logger.warn "stubbing non-public method: #{object.mocha_inspect}.#{method}"
     end
 
     def on_stubbing_method_on_nil(object, method)
       if Mocha::Configuration.prevent?(:stubbing_method_on_nil)
         raise StubbingError.new("stubbing method on nil: #{object.mocha_inspect}.#{method}", caller)
       end
-      if Mocha::Configuration.warn_when?(:stubbing_method_on_nil)
-        logger.warn "stubbing method on nil: #{object.mocha_inspect}.#{method}"
-      end
+      return unless Mocha::Configuration.warn_when?(:stubbing_method_on_nil)
+      logger.warn "stubbing method on nil: #{object.mocha_inspect}.#{method}"
     end
 
     def on_stubbing_method_on_non_mock_object(object, method)
       if Mocha::Configuration.prevent?(:stubbing_method_on_non_mock_object)
         raise StubbingError.new("stubbing method on non-mock object: #{object.mocha_inspect}.#{method}", caller)
       end
-      if Mocha::Configuration.warn_when?(:stubbing_method_on_non_mock_object)
-        logger.warn "stubbing method on non-mock object: #{object.mocha_inspect}.#{method}"
-      end
+      return unless Mocha::Configuration.warn_when?(:stubbing_method_on_non_mock_object)
+      logger.warn "stubbing method on non-mock object: #{object.mocha_inspect}.#{method}"
     end
 
     def on_stubbing_method_unnecessarily(expectation)
       if Mocha::Configuration.prevent?(:stubbing_method_unnecessarily)
         raise StubbingError.new("stubbing method unnecessarily: #{expectation.method_signature}", expectation.backtrace)
       end
-      if Mocha::Configuration.warn_when?(:stubbing_method_unnecessarily)
-        logger.warn "stubbing method unnecessarily: #{expectation.method_signature}"
-      end
+      return unless Mocha::Configuration.warn_when?(:stubbing_method_unnecessarily)
+      logger.warn "stubbing method unnecessarily: #{expectation.method_signature}"
     end
 
     attr_writer :logger
@@ -170,7 +192,6 @@ module Mocha
       @logger ||= Logger.new($stderr)
     end
 
-
     private
 
     def expectations
@@ -178,11 +199,11 @@ module Mocha
     end
 
     def unsatisfied_expectations
-      expectations.reject { |e| e.verified? }
+      expectations.reject(&:verified?)
     end
 
     def satisfied_expectations
-      expectations.select { |e| e.verified? }
+      expectations.select(&:verified?)
     end
 
     def add_mock(mock)
@@ -200,7 +221,5 @@ module Mocha
       @mocks = nil
       @state_machines = nil
     end
-
   end
-
 end

data/lib/mocha/module_method.rb

@@ -1,16 +1,6 @@
 require 'mocha/class_method'
 
 module Mocha
-
   class ModuleMethod < ClassMethod
-
-    def method_exists?(method)
-      return true if stubbee.public_methods(false).include?(method)
-      return true if stubbee.protected_methods(false).include?(method)
-      return true if stubbee.private_methods(false).include?(method)
-      return false
-    end
-
   end
-
 end

data/lib/mocha/module_methods.rb

@@ -1,14 +1,10 @@
 require 'mocha/module_method'
 
 module Mocha
-
   # @private
   module ModuleMethods
-
     def stubba_method
       Mocha::ModuleMethod
     end
-
   end
-
 end

data/lib/mocha/multiple_yields.rb

@@ -1,7 +1,5 @@
 module Mocha
-
   class MultipleYields
-
     attr_reader :parameter_groups
 
     def initialize(*parameter_groups)
@@ -13,8 +11,5 @@ module Mocha
         yield(parameter_group)
       end
     end
-
   end
-
 end
-

data/lib/mocha/names.rb

@@ -1,7 +1,5 @@
 module Mocha
-
   class ImpersonatingName
-
     def initialize(object)
       @object = object
     end
@@ -9,11 +7,9 @@ module Mocha
     def mocha_inspect
       @object.mocha_inspect
     end
-
   end
 
   class ImpersonatingAnyInstanceName
-
     def initialize(klass)
       @klass = klass
     end
@@ -21,11 +17,9 @@ module Mocha
     def mocha_inspect
       "#<AnyInstance:#{@klass.mocha_inspect}>"
     end
-
   end
 
   class Name
-
     def initialize(name)
       @name = name
     end
@@ -33,11 +27,9 @@ module Mocha
     def mocha_inspect
       "#<Mock:#{@name}>"
     end
-
   end
 
   class DefaultName
-
     def initialize(mock)
       @mock = mock
     end
@@ -45,9 +37,7 @@ module Mocha
     def mocha_inspect
       address = @mock.__id__ * 2
       address += 0x100000000 if address < 0
-      "#<Mock:0x#{'%x' % address}>"
+      "#<Mock:0x#{format('%x', address)}>"
     end
-
   end
-
 end

data/lib/mocha/no_yields.rb

@@ -1,11 +1,5 @@
 module Mocha
-
   class NoYields
-
-    def each
-    end
-
+    def each; end
   end
-
 end
-

data/lib/mocha/not_initialized_error.rb

@@ -0,0 +1,7 @@
+require 'mocha/error_with_filtered_backtrace'
+
+module Mocha
+  # Exception raised when Mocha has not been initialized, e.g. outside the
+  # context of a test.
+  class NotInitializedError < ErrorWithFilteredBacktrace; end
+end