rspec-mocks 3.0.4 → 3.1.0

data/lib/rspec/mocks/method_double.rb

@@ -59,7 +59,7 @@ module RSpec
           define_method(method_name) do |*args, &block|
             method_double.proxy_method_invoked(self, *args, &block)
           end
-          self.__send__ visibility, method_name
+          __send__(visibility, method_name)
         end
 
         @method_is_proxied = true
@@ -69,7 +69,7 @@ module RSpec
       # method to perform additional operations.
       #
       # @private
-      def proxy_method_invoked(obj, *args, &block)
+      def proxy_method_invoked(_obj, *args, &block)
         @proxy.message_received method_name, *args, &block
       end
 
@@ -80,9 +80,7 @@ module RSpec
 
         definition_target.__send__(:remove_method, @method_name)
 
-        if @method_stasher.method_is_stashed?
-          @method_stasher.restore
-        end
+        @method_stasher.restore if @method_stasher.method_is_stashed?
         restore_original_visibility
 
         @method_is_proxied = false
@@ -91,7 +89,9 @@ module RSpec
       # @private
       def show_frozen_warning
         RSpec.warn_with(
-          "WARNING: rspec-mocks was unable to restore the original `#{@method_name}` method on #{@object.inspect} because it has been frozen.  If you reuse this object, `#{@method_name}` will continue to respond with its stub implementation.",
+          "WARNING: rspec-mocks was unable to restore the original `#{@method_name}` " \
+          "method on #{@object.inspect} because it has been frozen.  If you reuse this " \
+          "object, `#{@method_name}` will continue to respond with its stub implementation.",
           :call_site                      => nil,
           :use_spec_location_as_call_site => true
         )
@@ -107,7 +107,7 @@ module RSpec
 
       # @private
       def verify
-        expectations.each {|e| e.verify_messages_received}
+        expectations.each { |e| e.verify_messages_received }
       end
 
       # @private
@@ -134,7 +134,7 @@ module RSpec
       def add_expectation(error_generator, expectation_ordering, expected_from, opts, &implementation)
         configure_method
         expectation = message_expectation_class.new(error_generator, expectation_ordering,
-                                             expected_from, self, :expectation, opts, &implementation)
+                                                    expected_from, self, :expectation, opts, &implementation)
         expectations << expectation
         expectation
       end
@@ -149,7 +149,7 @@ module RSpec
       def add_stub(error_generator, expectation_ordering, expected_from, opts={}, &implementation)
         configure_method
         stub = message_expectation_class.new(error_generator, expectation_ordering, expected_from,
-                                      self, :stub, opts, &implementation)
+                                             self, :stub, opts, &implementation)
         stubs.unshift stub
         stub
       end
@@ -172,7 +172,7 @@ module RSpec
       end
 
       # @private
-      def setup_simple_method_double(method_name, response, collection, error_generator = nil, backtrace_line = nil)
+      def setup_simple_method_double(method_name, response, collection, error_generator=nil, backtrace_line=nil)
         define_proxy_method
 
         me = SimpleMessageExpectation.new(method_name, response, error_generator, backtrace_line)
@@ -202,8 +202,6 @@ module RSpec
         raise MockExpectationError, "The method `#{method_name}` was not stubbed or was already unstubbed"
       end
 
-    private
-
       # In Ruby 2.0.0 and above prepend will alter the method lookup chain.
       # We use an object's singleton class to define method doubles upon,
       # however if the object has had it's singleton class (as opposed to
@@ -216,6 +214,9 @@ module RSpec
       # of our own.
       #
       if Support::RubyFeatures.module_prepends_supported?
+
+        private
+
         # We subclass `Module` in order to be able to easily detect our prepended module.
         RSpecPrependedModule = Class.new(Module)
 
@@ -247,6 +248,8 @@ module RSpec
 
       else
 
+        private
+
         def definition_target
           object_singleton_class
         end

data/lib/rspec/mocks/method_reference.rb

@@ -27,7 +27,7 @@ module RSpec
       # cases when we don't know if a method is implemented and
       # both `implemented?` and `unimplemented?` will return false.
       def unimplemented?
-        @object_reference.when_loaded do |m|
+        @object_reference.when_loaded do |_m|
           return !implemented?
         end
 
@@ -44,9 +44,8 @@ module RSpec
       end
 
       def with_signature
-        if original = original_method
-          yield Support::MethodSignature.new(original)
-        end
+        return unless (original = original_method)
+        yield Support::MethodSignature.new(original)
       end
 
       def visibility
@@ -59,7 +58,7 @@ module RSpec
         :public
       end
 
-      private
+    private
 
       def original_method
         @object_reference.when_loaded do |m|
@@ -98,7 +97,8 @@ module RSpec
 
     # @private
     class InstanceMethodReference < MethodReference
-      private
+    private
+
       def method_implemented?(mod)
         MethodReference.method_defined_at_any_visibility?(mod, @method_name)
       end
@@ -133,7 +133,8 @@ module RSpec
 
     # @private
     class ObjectMethodReference < MethodReference
-      private
+    private
+
       def method_implemented?(object)
         object.respond_to?(@method_name, true)
       end

data/lib/rspec/mocks/mutate_const.rb

@@ -1,85 +1,11 @@
+RSpec::Support.require_rspec_support 'recursive_const_methods'
+
 module RSpec
   module Mocks
-    # Provides recursive constant lookup methods useful for
-    # constant stubbing.
-    #
-    # @private
-    module RecursiveConstMethods
-      # We only want to consider constants that are defined directly on a
-      # particular module, and not include top-level/inherited constants.
-      # Unfortunately, the constant API changed between 1.8 and 1.9, so
-      # we need to conditionally define methods to ignore the top-level/inherited
-      # constants.
-      #
-      # Given:
-      #   class A; B = 1; end
-      #   class C < A; end
-      #
-      # On 1.8:
-      #   - C.const_get("Hash") # => ::Hash
-      #   - C.const_defined?("Hash") # => false
-      #   - C.constants # => ["B"]
-      #   - None of these methods accept the extra `inherit` argument
-      # On 1.9:
-      #   - C.const_get("Hash") # => ::Hash
-      #   - C.const_defined?("Hash") # => true
-      #   - C.const_get("Hash", false) # => raises NameError
-      #   - C.const_defined?("Hash", false) # => false
-      #   - C.constants # => [:B]
-      #   - C.constants(false) #=> []
-      if Module.method(:const_defined?).arity == 1
-        def const_defined_on?(mod, const_name)
-          mod.const_defined?(const_name)
-        end
-
-        def get_const_defined_on(mod, const_name)
-          if const_defined_on?(mod, const_name)
-            return mod.const_get(const_name)
-          end
-
-          raise NameError, "uninitialized constant #{mod.name}::#{const_name}"
-        end
-
-        def constants_defined_on(mod)
-          mod.constants.select { |c| const_defined_on?(mod, c) }
-        end
-      else
-        def const_defined_on?(mod, const_name)
-          mod.const_defined?(const_name, false)
-        end
-
-        def get_const_defined_on(mod, const_name)
-          mod.const_get(const_name, false)
-        end
-
-        def constants_defined_on(mod)
-          mod.constants(false)
-        end
-      end
-
-      def recursive_const_get(const_name)
-        normalize_const_name(const_name).split('::').inject(Object) do |mod, name|
-          get_const_defined_on(mod, name)
-        end
-      end
-
-      def recursive_const_defined?(const_name)
-        normalize_const_name(const_name).split('::').inject([Object, '']) do |(mod, full_name), name|
-          yield(full_name, name) if block_given? && !(Module === mod)
-          return false unless const_defined_on?(mod, name)
-          [get_const_defined_on(mod, name), [mod, name].join('::')]
-        end
-      end
-
-      def normalize_const_name(const_name)
-        const_name.sub(/\A::/, '')
-      end
-    end
-
     # Provides information about constants that may (or may not)
     # have been mutated by rspec-mocks.
     class Constant
-      extend RecursiveConstMethods
+      extend Support::RecursiveConstMethods
 
       # @api private
       def initialize(name)
@@ -154,7 +80,7 @@ module RSpec
 
     # Provides a means to stub constants.
     class ConstantMutator
-      extend RecursiveConstMethods
+      extend Support::RecursiveConstMethods
 
       # Stubs a constant.
       #
@@ -167,12 +93,12 @@ module RSpec
       #  examples. This is an alternate public API that is provided
       #  so you can stub constants in other contexts (e.g. helper
       #  classes).
-      def self.stub(constant_name, value, options = {})
+      def self.stub(constant_name, value, options={})
         mutator = if recursive_const_defined?(constant_name, &raise_on_invalid_const)
-          DefinedConstantReplacer
-        else
-          UndefinedConstantSetter
-        end
+                    DefinedConstantReplacer
+                  else
+                    UndefinedConstantSetter
+                  end
 
         mutate(mutator.new(constant_name, value, options[:transfer_nested_constants]))
         value
@@ -188,7 +114,7 @@ module RSpec
       #  so you can hide constants in other contexts (e.g. helper
       #  classes).
       def self.hide(constant_name)
-        mutate(ConstantHider.new(constant_name, nil, { }))
+        mutate(ConstantHider.new(constant_name, nil, {}))
         nil
       end
 
@@ -196,7 +122,7 @@ module RSpec
       #
       # @private
       class BaseMutator
-        include RecursiveConstMethods
+        include Support::RecursiveConstMethods
 
         attr_reader :original_value, :full_constant_name
 
@@ -227,7 +153,7 @@ module RSpec
       # @private
       class ConstantHider < BaseMutator
         def mutate
-          return unless @defined = recursive_const_defined?(full_constant_name)
+          return unless (@defined = recursive_const_defined?(full_constant_name))
           @context = recursive_const_get(@context_parts.join('::'))
           @original_value = get_const_defined_on(@context, @const_name)
 
@@ -298,12 +224,12 @@ module RSpec
           return [] unless should_transfer_nested_constants?
 
           { @original_value => "the original value", @mutated_value => "the stubbed value" }.each do |value, description|
-            unless value.respond_to?(:constants)
-              raise ArgumentError,
-                "Cannot transfer nested constants for #{@full_constant_name} " +
-                "since #{description} is not a class or module and only classes " +
-                "and modules support nested constants."
-            end
+            next if value.respond_to?(:constants)
+
+            raise ArgumentError,
+                  "Cannot transfer nested constants for #{@full_constant_name} " \
+                  "since #{description} is not a class or module and only classes " \
+                  "and modules support nested constants."
           end
 
           if Array === @transfer_nested_constants
@@ -313,9 +239,9 @@ module RSpec
             if undefined_constants.any?
               available_constants = constants_defined_on(@original_value) - @transfer_nested_constants
               raise ArgumentError,
-                "Cannot transfer nested constant(s) #{undefined_constants.join(' and ')} " +
-                "for #{@full_constant_name} since they are not defined. Did you mean " +
-                "#{available_constants.join(' or ')}?"
+                    "Cannot transfer nested constant(s) #{undefined_constants.join(' and ')} " \
+                    "for #{@full_constant_name} since they are not defined. Did you mean " \
+                    "#{available_constants.join(' or ')}?"
             end
 
             @transfer_nested_constants
@@ -363,10 +289,10 @@ module RSpec
 
         def name_for(parent, name)
           root = if parent == Object
-            ''
-          else
-            parent.name
-          end
+                   ''
+                 else
+                   parent.name
+                 end
           root + '::' + name
         end
       end
@@ -389,7 +315,7 @@ module RSpec
       # @api private
       def self.raise_on_invalid_const
         lambda do |const_name, failed_name|
-          raise "Cannot stub constant #{failed_name} on #{const_name} " +
+          raise "Cannot stub constant #{failed_name} on #{const_name} " \
                 "since #{const_name} is not a module."
         end
       end

data/lib/rspec/mocks/object_reference.rb

@@ -1,21 +1,20 @@
 module RSpec
   module Mocks
-
     # @private
     class ObjectReference
       # Returns an appropriate Object or Module reference based
       # on the given argument.
-      def self.for(object_module_or_name, allow_direct_object_refs = false)
+      def self.for(object_module_or_name, allow_direct_object_refs=false)
         case object_module_or_name
-          when Module then DirectModuleReference.new(object_module_or_name)
-          when String then NamedObjectReference.new(object_module_or_name)
+        when Module then DirectModuleReference.new(object_module_or_name)
+        when String then NamedObjectReference.new(object_module_or_name)
+        else
+          if allow_direct_object_refs
+            DirectObjectReference.new(object_module_or_name)
           else
-            if allow_direct_object_refs
-              DirectObjectReference.new(object_module_or_name)
-            else
-              raise ArgumentError,
-                "Module or String expected, got #{object_module_or_name.inspect}"
-            end
+            raise ArgumentError,
+                  "Module or String expected, got #{object_module_or_name.inspect}"
+          end
         end
       end
     end
@@ -35,7 +34,7 @@ module RSpec
 
       def const_to_replace
         raise ArgumentError,
-          "Can not perform constant replacement with an object."
+              "Can not perform constant replacement with an object."
       end
 
       def defined?
@@ -78,11 +77,11 @@ module RSpec
       end
       alias description const_to_replace
 
-      def when_loaded(&block)
+      def when_loaded(&_block)
         yield object if object
       end
 
-   private
+    private
 
       def object
         @object ||= Constant.original(@const_name).original_value

data/lib/rspec/mocks/order_group.rb

@@ -25,10 +25,10 @@ module RSpec
       # @private
       def consume
         remaining_expectations.each_with_index do |expectation, index|
-          if expectation.ordered?
-            @index += index + 1
-            return expectation
-          end
+          next unless expectation.ordered?
+
+          @index += index + 1
+          return expectation
         end
         nil
       end
@@ -76,7 +76,6 @@ module RSpec
       def expectation_for(message)
         @expectations.find { |e| message == e }
       end
-
     end
   end
 end

data/lib/rspec/mocks/proxy.rb

@@ -9,7 +9,7 @@ module RSpec
       end
 
       # @private
-      def ensure_implemented(*args)
+      def ensure_implemented(*_args)
         # noop for basic proxies, see VerifyingProxy for behaviour.
       end
 
@@ -42,7 +42,7 @@ module RSpec
       end
 
       # @private
-      def original_method_handle_for(message)
+      def original_method_handle_for(_message)
         nil
       end
 
@@ -89,20 +89,19 @@ module RSpec
         end
 
         @messages_received.each do |(actual_method_name, args, _)|
-          if expectation.matches?(actual_method_name, *args)
-            expectation.invoke(nil)
-            block.call(*args) if block
-          end
-        end
+          next unless expectation.matches?(actual_method_name, *args)
 
+          expectation.invoke(nil)
+          block.call(*args) if block
+        end
       end
 
       # @private
       def check_for_unexpected_arguments(expectation)
         @messages_received.each do |(method_name, args, _)|
-          if expectation.matches_name_but_not_args(method_name, *args)
-            raise_unexpected_message_args_error(expectation, *args)
-          end
+          next unless expectation.matches_name_but_not_args(method_name, *args)
+
+          raise_unexpected_message_args_error(expectation, *args)
         end
       end
 
@@ -129,7 +128,7 @@ module RSpec
 
       # @private
       def verify
-        @method_doubles.each_value {|d| d.verify}
+        @method_doubles.each_value { |d| d.verify }
       end
 
       # @private
@@ -139,12 +138,12 @@ module RSpec
 
       # @private
       def received_message?(method_name, *args, &block)
-        @messages_received.any? {|array| array == [method_name, args, block]}
+        @messages_received.any? { |array| array == [method_name, args, block] }
       end
 
       # @private
       def has_negative_expectation?(message)
-        method_double_for(message).expectations.detect {|expectation| expectation.negative_expectation_for?(message)}
+        method_double_for(message).expectations.find { |expectation| expectation.negative_expectation_for?(message) }
       end
 
       # @private
@@ -162,16 +161,19 @@ module RSpec
 
         if (stub && expectation && expectation.called_max_times?) || (stub && !expectation)
           expectation.increase_actual_received_count! if expectation && expectation.actual_received_count_matters?
-          if expectation = find_almost_matching_expectation(message, *args)
+          if (expectation = find_almost_matching_expectation(message, *args))
             expectation.advise(*args) unless expectation.expected_messages_received?
           end
           stub.invoke(nil, *args, &block)
         elsif expectation
           expectation.invoke(stub, *args, &block)
-        elsif expectation = find_almost_matching_expectation(message, *args)
+        elsif (expectation = find_almost_matching_expectation(message, *args))
           expectation.advise(*args) if null_object? unless expectation.expected_messages_received?
-          raise_unexpected_message_args_error(expectation, *args) unless (has_negative_expectation?(message) or null_object?)
-        elsif stub = find_almost_matching_stub(message, *args)
+
+          if null_object? || !has_negative_expectation?(message)
+            raise_unexpected_message_args_error(expectation, *args)
+          end
+        elsif (stub = find_almost_matching_stub(message, *args))
           stub.advise(*args)
           raise_missing_default_stub_error(stub, *args)
         elsif Class === @object
@@ -197,7 +199,7 @@ module RSpec
       end
 
       # @private
-      def visibility_for(method_name)
+      def visibility_for(_method_name)
         # This is the default (for test doubles). Subclasses override this.
         :public
       end
@@ -206,9 +208,13 @@ module RSpec
         def prepended_modules_of_singleton_class
           @prepended_modules_of_singleton_class ||= begin
             singleton_class = @object.singleton_class
-            singleton_class.ancestors.take_while do |mod|
-              !(Class === mod || @object.equal?(mod))
-            end
+            ancestors       = singleton_class.ancestors
+
+            # `|| 0` is necessary for Ruby 2.0, where the singleton class
+            # is only in the ancestor list when there are prepended modules.
+            singleton_index = ancestors.index(singleton_class) || 0
+
+            ancestors[0, singleton_index]
           end
         end
       end
@@ -244,11 +250,11 @@ module RSpec
       end
 
       def find_matching_method_stub(method_name, *args)
-        method_double_for(method_name).stubs.find {|stub| stub.matches?(method_name, *args)}
+        method_double_for(method_name).stubs.find { |stub| stub.matches?(method_name, *args) }
       end
 
       def find_almost_matching_stub(method_name, *args)
-        method_double_for(method_name).stubs.find {|stub| stub.matches_name_but_not_args(method_name, *args)}
+        method_double_for(method_name).stubs.find { |stub| stub.matches_name_but_not_args(method_name, *args) }
       end
     end
 
@@ -295,7 +301,7 @@ module RSpec
       end
 
       def reset
-        @method_doubles.each_value {|d| d.reset}
+        @method_doubles.each_value { |d| d.reset }
         super
       end
 
@@ -415,7 +421,7 @@ module RSpec
 
     private
 
-      def warn method_name
+      def warn(method_name)
         source = CallerFilter.first_non_rspec_line
         Kernel.warn("An expectation of :#{method_name} was set on nil. Called from #{source}. Use allow_message_expectations_on_nil to disable warnings.")
       end