mocha 1.4.0 → 1.7.0

data/lib/mocha/expectation_error_factory.rb

@@ -2,7 +2,6 @@ require 'mocha/backtrace_filter'
 require 'mocha/expectation_error'
 
 module Mocha
-
   # This factory determines what class of exception should be raised when Mocha detects a test failure.
   #
   # This class should only be used by authors of test libraries and not by typical "users" of Mocha.

data/lib/mocha/expectation_list.rb

@@ -1,7 +1,5 @@
 module Mocha
-
   class ExpectationList
-
     def initialize(expectations = [])
       @expectations = expectations
     end
@@ -24,7 +22,7 @@ module Mocha
     end
 
     def match_allowing_invocation(method_name, *arguments)
-      matching_expectations(method_name, *arguments).detect { |e| e.invocations_allowed? }
+      matching_expectations(method_name, *arguments).detect(&:invocations_allowed?)
     end
 
     def verified?(assertion_counter = nil)
@@ -48,7 +46,7 @@ module Mocha
     end
 
     def +(other)
-      self.class.new(self.to_a + other.to_a)
+      self.class.new(to_a + other.to_a)
     end
 
     private
@@ -56,7 +54,5 @@ module Mocha
     def matching_expectations(method_name, *arguments)
       @expectations.select { |e| e.match?(method_name, *arguments) }
     end
-
   end
-
 end

data/lib/mocha/hooks.rb

@@ -1,7 +1,6 @@
 require 'mocha/mockery'
 
 module Mocha
-
   # Integration hooks for test library authors.
   #
   # The methods in this module should be called from test libraries wishing to integrate with Mocha.
@@ -21,6 +20,7 @@ module Mocha
     #
     # This method should be called before each individual test starts (including before any "setup" code).
     def mocha_setup
+      Mockery.setup
     end
 
     # Verifies that all mock expectations have been met (only for use by authors of test libraries).
@@ -37,8 +37,6 @@ module Mocha
     # This method should be called after each individual test has finished (including after any "teardown" code).
     def mocha_teardown
       Mockery.teardown
-    ensure
-      Mockery.reset_instance
     end
   end
 end

data/lib/mocha/in_state_ordering_constraint.rb

@@ -1,7 +1,5 @@
 module Mocha
-
   class InStateOrderingConstraint
-
     def initialize(state_predicate)
       @state_predicate = state_predicate
     end
@@ -13,7 +11,5 @@ module Mocha
     def mocha_inspect
       "when #{@state_predicate.mocha_inspect}"
     end
-
   end
-
 end

data/lib/mocha/inspect.rb

@@ -1,18 +1,17 @@
 require 'date'
 
 module Mocha
-
   module ObjectMethods
     def mocha_inspect
-      address = self.__id__ * 2
+      address = __id__ * 2
       address += 0x100000000 if address < 0
-      inspect =~ /#</ ? "#<#{self.class}:0x#{'%x' % address}>" : inspect
+      inspect =~ /#</ ? "#<#{self.class}:0x#{format('%x', address)}>" : inspect
     end
   end
 
   module ArrayMethods
     def mocha_inspect
-      "[#{collect { |member| member.mocha_inspect }.join(', ')}]"
+      "[#{collect(&:mocha_inspect).join(', ')}]"
     end
   end
 
@@ -33,7 +32,6 @@ module Mocha
       to_s
     end
   end
-
 end
 
 class Object

data/lib/mocha/instance_method.rb

@@ -1,8 +1,6 @@
 require 'mocha/class_method'
 
 module Mocha
-
   class InstanceMethod < ClassMethod
   end
-
 end

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

@@ -5,7 +5,6 @@ require 'mocha/expectation_error_factory'
 module Mocha
   module Integration
     module MiniTest
-
       # Integrates Mocha into recent versions of MiniTest.
       #
       # See the source code for an example of how to integrate Mocha into a test library.
@@ -19,11 +18,11 @@ module Mocha
 
         # @private
         def self.description
-          "adapter for MiniTest gem >= v3.3.0"
+          'adapter for MiniTest gem >= v3.3.0'
         end
 
         # @private
-        def self.included(mod)
+        def self.included(_mod)
           Mocha::ExpectationErrorFactory.exception_class = ::MiniTest::Assertion
         end
 
@@ -51,4 +50,3 @@ module Mocha
     end
   end
 end
-

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

@@ -4,7 +4,7 @@ module Mocha
   module Integration
     module MiniTest
       def self.translate(exception)
-        return exception unless exception.kind_of?(::Mocha::ExpectationError)
+        return exception unless exception.is_a?(::Mocha::ExpectationError)
         translated_exception = ::MiniTest::Assertion.new(exception.message)
         translated_exception.set_backtrace(exception.backtrace)
         translated_exception

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

@@ -2,16 +2,16 @@ module Mocha
   module Integration
     module MiniTest
       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 MiniTest integration available)"
+          'nothing (no MiniTest integration available)'
         end
 
-        def self.included(mod)
-          raise "No MiniTest integration available"
+        def self.included(_mod)
+          raise 'No MiniTest integration available'
         end
       end
     end

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

@@ -11,7 +11,7 @@ module Mocha
         end
 
         def self.description
-          "monkey patch for MiniTest gem v1.3"
+          'monkey patch for MiniTest gem v1.3'
         end
 
         def self.included(mod)
@@ -19,12 +19,14 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run runner
             assertion_counter = AssertionCounter.new(self)
             result = '.'
             begin
               begin
                 @passed = nil
+                mocha_setup
                 self.setup
                 self.__send__ self.name
                 mocha_verify(assertion_counter)
@@ -44,6 +46,7 @@ module Mocha
             end
             result
           end
+          # rubocop:enable all
         end
       end
     end

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

@@ -11,7 +11,7 @@ module Mocha
         end
 
         def self.description
-          "monkey patch for MiniTest gem v1.4.0"
+          'monkey patch for MiniTest gem v1.4.0'
         end
 
         def self.included(mod)
@@ -19,12 +19,14 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run runner
             assertion_counter = AssertionCounter.new(self)
             result = '.'
             begin
               begin
                 @passed = nil
+                mocha_setup
                 self.setup
                 self.__send__ self.__name__
                 mocha_verify(assertion_counter)
@@ -44,6 +46,7 @@ module Mocha
             end
             result
           end
+          # rubocop:enable all
         end
       end
     end

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

@@ -11,7 +11,7 @@ module Mocha
         end
 
         def self.description
-          "monkey patch for MiniTest gem v1.4.1"
+          'monkey patch for MiniTest gem v1.4.1'
         end
 
         def self.included(mod)
@@ -19,6 +19,7 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run runner
             trap 'INFO' do
               warn '%s#%s %.2fs' % [self.class, self.__name__,
@@ -31,6 +32,7 @@ module Mocha
             begin
               begin
                 @passed = nil
+                mocha_setup
                 self.setup
                 self.__send__ self.__name__
                 mocha_verify(assertion_counter)
@@ -55,6 +57,7 @@ module Mocha
             end
             result
           end
+          # rubocop:enable all
         end
       end
     end

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

@@ -11,7 +11,7 @@ module Mocha
         end
 
         def self.description
-          "monkey patch for MiniTest gem >= v1.4.2 and <= v1.7.2"
+          'monkey patch for MiniTest gem >= v1.4.2 and <= v1.7.2'
         end
 
         def self.included(mod)
@@ -19,6 +19,7 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run runner
             trap 'INFO' do
               warn '%s#%s %.2fs' % [self.class, self.__name__,
@@ -31,6 +32,7 @@ module Mocha
             begin
               begin
                 @passed = nil
+                mocha_setup
                 self.setup
                 self.__send__ self.__name__
                 mocha_verify(assertion_counter)
@@ -55,6 +57,7 @@ module Mocha
             end
             result
           end
+          # rubocop:enable all
         end
       end
     end

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
@@ -31,6 +32,7 @@ module Mocha
             begin
               begin
                 @passed = nil
+                mocha_setup
                 self.setup
                 self.__send__ self.__name__
                 mocha_verify(assertion_counter)
@@ -56,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
@@ -31,6 +32,7 @@ module Mocha
             begin
               begin
                 @passed = nil
+                mocha_setup
                 self.setup
                 self.__send__ self.__name__
                 mocha_verify(assertion_counter)
@@ -56,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
@@ -32,6 +33,7 @@ module Mocha
               begin
                 @passed = nil
                 self.before_setup
+                mocha_setup
                 self.setup
                 self.after_setup
                 self.run_test self.__name__
@@ -60,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|
@@ -35,6 +36,7 @@ module Mocha
               begin
                 @passed = nil
                 self.before_setup
+                mocha_setup
                 self.setup
                 self.after_setup
                 self.run_test self.__name__
@@ -63,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
@@ -31,6 +32,7 @@ module Mocha
             begin
               begin
                 @passed = nil
+                mocha_setup
                 self.setup
                 self.run_setup_hooks
                 self.__send__ self.__name__
@@ -58,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
@@ -26,6 +27,7 @@ module Mocha
               yield(Test::Unit::TestCase::STARTED, name)
               begin
                 begin
+                  mocha_setup
                   run_setup
                   __send__(@method_name)
                   mocha_verify(assertion_counter)
@@ -52,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
@@ -26,6 +27,7 @@ module Mocha
               yield(Test::Unit::TestCase::STARTED, name)
               begin
                 begin
+                  mocha_setup
                   run_setup
                   run_test
                   mocha_verify(assertion_counter)
@@ -52,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
@@ -26,6 +27,7 @@ module Mocha
               yield(Test::Unit::TestCase::STARTED, name)
               begin
                 begin
+                  mocha_setup
                   run_setup
                   run_test
                   mocha_verify(assertion_counter)
@@ -52,6 +54,7 @@ module Mocha
               # @_result = nil # For test-spec's after_all :<
             end
           end
+          # rubocop:enable all
         end
       end
     end