mocha 1.6.0 → 1.7.0

data/lib/mocha/detection/mini_test.rb

@@ -6,8 +6,6 @@ module Mocha
           ::Minitest::Test
         elsif defined?(::MiniTest::Unit::TestCase)
           ::MiniTest::Unit::TestCase
-        else
-          nil
         end
       end
 

data/lib/mocha/detection/test_unit.rb

@@ -3,11 +3,9 @@ module Mocha
     module TestUnit
       def self.testcase
         if defined?(::Test::Unit::TestCase) &&
-          !(defined?(::MiniTest::Unit::TestCase) && (::Test::Unit::TestCase < ::MiniTest::Unit::TestCase)) &&
-          !(defined?(::MiniTest::Spec) && (::Test::Unit::TestCase < ::MiniTest::Spec))
+           !(defined?(::MiniTest::Unit::TestCase) && (::Test::Unit::TestCase < ::MiniTest::Unit::TestCase)) &&
+           !(defined?(::MiniTest::Spec) && (::Test::Unit::TestCase < ::MiniTest::Spec))
           ::Test::Unit::TestCase
-        else
-          nil
         end
       end
 
@@ -16,8 +14,10 @@ module Mocha
         if testcase
           begin
             require 'test/unit/version'
+          # rubocop:disable Lint/HandleExceptions
           rescue LoadError
           end
+          # rubocop:enable Lint/HandleExceptions
           if defined?(::Test::Unit::VERSION)
             version = ::Test::Unit::VERSION
           end

data/lib/mocha/error_with_filtered_backtrace.rb

@@ -1,17 +1,13 @@
 require 'mocha/backtrace_filter'
 
 module Mocha
-
   # @private
   class ErrorWithFilteredBacktrace < StandardError
-
     # @private
     def initialize(message = nil, backtrace = [])
       super(message)
       filter = BacktraceFilter.new
       set_backtrace(filter.filtered(backtrace))
     end
-
   end
-
 end

data/lib/mocha/exception_raiser.rb

@@ -1,9 +1,8 @@
 module Mocha
-
   class ExceptionRaiser
-
     def initialize(exception, message)
-      @exception, @message = exception, message
+      @exception = exception
+      @message = message
     end
 
     def evaluate
@@ -11,7 +10,5 @@ module Mocha
       raise @exception, @message if @message
       raise @exception
     end
-
   end
-
 end

data/lib/mocha/expectation.rb

@@ -11,10 +11,8 @@ require 'mocha/change_state_side_effect'
 require 'mocha/cardinality'
 
 module Mocha
-
   # Methods on expectations returned from {Mock#expects}, {Mock#stubs}, {ObjectMethods#expects} and {ObjectMethods#stubs}.
   class Expectation
-
     # Modifies expectation so that the number of calls to the expected method must be within a specific +range+.
     #
     # @param [Range,Integer] range specifies the allowable range in the number of expected invocations.
@@ -184,7 +182,7 @@ module Mocha
     #   object = mock()
     #   object.expects(:expected_method).at_most_once
     #   2.times { object.expected_method } # => unexpected invocation
-    def at_most_once()
+    def at_most_once
       at_most(1)
       self
     end
@@ -506,7 +504,8 @@ module Mocha
       @parameters_matcher = ParametersMatcher.new
       @ordering_constraints = []
       @side_effects = []
-      @cardinality, @invocation_count = Cardinality.exactly(1), 0
+      @cardinality = Cardinality.exactly(1)
+      @invocation_count = 0
       @return_values = ReturnValues.new
       @yield_parameters = YieldParameters.new
       @backtrace = backtrace || caller
@@ -529,12 +528,12 @@ module Mocha
 
     # @private
     def perform_side_effects
-      @side_effects.each { |side_effect| side_effect.perform }
+      @side_effects.each(&:perform)
     end
 
     # @private
     def in_correct_order?
-      @ordering_constraints.all? { |ordering_constraint| ordering_constraint.allows_invocation_now? }
+      @ordering_constraints.all?(&:allows_invocation_now?)
     end
 
     # @private
@@ -560,8 +559,8 @@ module Mocha
     # @private
     def invoke
       @invocation_count += 1
-      perform_side_effects()
-      if block_given? then
+      perform_side_effects
+      if block_given?
         @yield_parameters.next_invocation.each do |yield_parameters|
           yield(*yield_parameters)
         end
@@ -584,21 +583,21 @@ module Mocha
     def inspect
       address = __id__ * 2
       address += 0x100000000 if address < 0
-      "#<Expectation:0x#{'%x' % address} #{mocha_inspect} >"
+      "#<Expectation:0x#{format('%x', address)} #{mocha_inspect} >"
     end
 
     # @private
     def mocha_inspect
       message = "#{@cardinality.mocha_inspect}, "
       message << case @invocation_count
-        when 0 then "not yet invoked"
-        when 1 then "invoked once"
-        when 2 then "invoked twice"
-        else "invoked #{@invocation_count} times"
-      end
-      message << ": "
+                 when 0 then 'not yet invoked'
+                 when 1 then 'invoked once'
+                 when 2 then 'invoked twice'
+                 else "invoked #{@invocation_count} times"
+                 end
+      message << ': '
       message << method_signature
-      message << "; #{@ordering_constraints.map { |oc| oc.mocha_inspect }.join("; ")}" unless @ordering_constraints.empty?
+      message << "; #{@ordering_constraints.map(&:mocha_inspect).join('; ')}" unless @ordering_constraints.empty?
       message
     end
 
@@ -606,7 +605,5 @@ module Mocha
     def method_signature
       "#{@mock.mocha_inspect}.#{@method_matcher.mocha_inspect}#{@parameters_matcher.mocha_inspect}"
     end
-
   end
-
 end

data/lib/mocha/expectation_error.rb

@@ -4,5 +4,7 @@ module Mocha
   # Authors of test libraries may use +Mocha::ExpectationErrorFactory+ to have Mocha raise a different exception.
   #
   # @see Mocha::ExpectationErrorFactory
+  # rubocop:disable Lint/InheritException
   class ExpectationError < Exception; end
+  # rubocop:enable Lint/InheritException
 end

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.

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.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/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,6 +19,7 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run runner
             assertion_counter = AssertionCounter.new(self)
             result = '.'
@@ -45,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,6 +19,7 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run runner
             assertion_counter = AssertionCounter.new(self)
             result = '.'
@@ -45,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__,
@@ -56,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__,
@@ -56,6 +57,7 @@ module Mocha
             end
             result
           end
+          # rubocop:enable all
         end
       end
     end