mocha 1.6.0 → 1.7.0

data/lib/mocha/integration/mini_test/version_200.rb

@@ -11,7 +11,7 @@ module Mocha
         end
 
         def self.description
-          "monkey patch for MiniTest gem v2.0.0"
+          'monkey patch for MiniTest gem v2.0.0'
         end
 
         def self.included(mod)
@@ -19,6 +19,7 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run runner
             trap 'INFO' do
               time = Time.now - runner.start_time
@@ -57,6 +58,7 @@ module Mocha
             end
             result
           end
+          # rubocop:enable all
         end
       end
     end

data/lib/mocha/integration/mini_test/version_201_to_222.rb

@@ -11,7 +11,7 @@ module Mocha
         end
 
         def self.description
-          "monkey patch for MiniTest gem >= v2.0.1 <= v2.2.2"
+          'monkey patch for MiniTest gem >= v2.0.1 <= v2.2.2'
         end
 
         def self.included(mod)
@@ -19,6 +19,7 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run runner
             trap 'INFO' do
               time = runner.start_time ? Time.now - runner.start_time : 0
@@ -57,6 +58,7 @@ module Mocha
             end
             result
           end
+          # rubocop:enable all
         end
       end
     end

data/lib/mocha/integration/mini_test/version_2110_to_2111.rb

@@ -11,7 +11,7 @@ module Mocha
         end
 
         def self.description
-          "monkey patch for MiniTest gem >= v2.11.0 <= v2.11.1"
+          'monkey patch for MiniTest gem >= v2.11.0 <= v2.11.1'
         end
 
         def self.included(mod)
@@ -19,6 +19,7 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run runner
             trap 'INFO' do
               time = runner.start_time ? Time.now - runner.start_time : 0
@@ -61,6 +62,7 @@ module Mocha
             end
             result
           end
+          # rubocop:enable all
         end
       end
     end

data/lib/mocha/integration/mini_test/version_2112_to_320.rb

@@ -11,7 +11,7 @@ module Mocha
         end
 
         def self.description
-          "monkey patch for MiniTest gem >= v2.11.2 <= v3.2.0"
+          'monkey patch for MiniTest gem >= v2.11.2 <= v3.2.0'
         end
 
         def self.included(mod)
@@ -19,6 +19,7 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run runner
             trap "INFO" do
               runner.report.each_with_index do |msg, i|
@@ -64,6 +65,7 @@ module Mocha
             end
             result
           end
+          # rubocop:enable all
         end
       end
     end

data/lib/mocha/integration/mini_test/version_230_to_2101.rb

@@ -11,7 +11,7 @@ module Mocha
         end
 
         def self.description
-          "monkey patch for MiniTest gem >= v2.3.0 <= v2.10.1"
+          'monkey patch for MiniTest gem >= v2.3.0 <= v2.10.1'
         end
 
         def self.included(mod)
@@ -19,6 +19,7 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run runner
             trap 'INFO' do
               time = runner.start_time ? Time.now - runner.start_time : 0
@@ -59,6 +60,7 @@ module Mocha
             end
             result
           end
+          # rubocop:enable all
         end
       end
     end

data/lib/mocha/integration/monkey_patcher.rb

@@ -11,14 +11,12 @@ module Mocha
         end
         if mod.method_defined?(:run_before_mocha)
           Debug.puts "#{mod}#run_before_mocha method already defined"
+        elsif mod.method_defined?(:run)
+          mod.send(:alias_method, :run_before_mocha, :run)
+          mod.send(:remove_method, :run)
+          mod.send(:include, run_method_patch)
         else
-          if mod.method_defined?(:run)
-            mod.send(:alias_method, :run_before_mocha, :run)
-            mod.send(:remove_method, :run)
-            mod.send(:include, run_method_patch)
-          else
-            raise "Unable to monkey-patch #{mod}, because it does not define a `#run` method"
-          end
+          raise "Unable to monkey-patch #{mod}, because it does not define a `#run` method"
         end
       end
     end

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

@@ -5,7 +5,6 @@ require 'mocha/expectation_error'
 module Mocha
   module Integration
     module TestUnit
-
       # Integrates Mocha into recent versions of Test::Unit.
       #
       # See the source code for an example of how to integrate Mocha into a test library.
@@ -13,13 +12,13 @@ module Mocha
         include Mocha::API
 
         # @private
-        def self.applicable_to?(test_unit_version, ruby_version = nil)
+        def self.applicable_to?(test_unit_version, _ruby_version = nil)
           Gem::Requirement.new('>= 2.5.1').satisfied_by?(test_unit_version)
         end
 
         # @private
         def self.description
-          "adapter for Test::Unit gem >= v2.5.1"
+          'adapter for Test::Unit gem >= v2.5.1'
         end
 
         # @private
@@ -39,10 +38,10 @@ module Mocha
         private
 
         # @private
-        def handle_mocha_expectation_error(e)
-          return false unless e.is_a?(Mocha::ExpectationError)
+        def handle_mocha_expectation_error(exception)
+          return false unless exception.is_a?(Mocha::ExpectationError)
           problem_occurred
-          add_failure(e.message, e.backtrace)
+          add_failure(exception.message, exception.backtrace)
           true
         end
       end

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

@@ -6,12 +6,12 @@ module Mocha
   module Integration
     module TestUnit
       module GemVersion200
-        def self.applicable_to?(test_unit_version, ruby_version = nil)
+        def self.applicable_to?(test_unit_version, _ruby_version = nil)
           Gem::Requirement.new('2.0.0').satisfied_by?(test_unit_version)
         end
 
         def self.description
-          "monkey patch for Test::Unit gem v2.0.0"
+          'monkey patch for Test::Unit gem v2.0.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
@@ -53,6 +54,7 @@ module Mocha
               @_result = nil
             end
           end
+          # rubocop:enable all
         end
       end
     end

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

@@ -6,12 +6,12 @@ module Mocha
   module Integration
     module TestUnit
       module GemVersion201To202
-        def self.applicable_to?(test_unit_version, ruby_version = nil)
+        def self.applicable_to?(test_unit_version, _ruby_version = nil)
           Gem::Requirement.new('>= 2.0.1', '<= 2.0.2').satisfied_by?(test_unit_version)
         end
 
         def self.description
-          "monkey patch for Test::Unit gem >= v2.0.1 and <= v2.0.2"
+          'monkey patch for Test::Unit gem >= v2.0.1 and <= v2.0.2'
         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
@@ -53,6 +54,7 @@ module Mocha
               @_result = nil
             end
           end
+          # rubocop:enable all
         end
       end
     end

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

@@ -6,12 +6,12 @@ module Mocha
   module Integration
     module TestUnit
       module GemVersion203To220
-        def self.applicable_to?(test_unit_version, ruby_version = nil)
+        def self.applicable_to?(test_unit_version, _ruby_version = nil)
           Gem::Requirement.new('>= 2.0.3', '<= 2.2.0').satisfied_by?(test_unit_version)
         end
 
         def self.description
-          "monkey patch for Test::Unit gem >= v2.0.3 and <= v2.2.0"
+          'monkey patch for Test::Unit gem >= v2.0.3 and <= v2.2.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
@@ -53,6 +54,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/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
@@ -59,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,6 +19,7 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run(result)
             assertion_counter = AssertionCounter.new(self)
             yield(Test::Unit::TestCase::STARTED, name)
@@ -52,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,6 +19,7 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run(result)
             assertion_counter = AssertionCounter.new(self)
             yield(Test::Unit::TestCase::STARTED, name)
@@ -54,6 +55,7 @@ module Mocha
             result.add_run
             yield(Test::Unit::TestCase::FINISHED, name)
           end
+          # rubocop:enable all
         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