rspec-mocks 2.12.0 → 2.12.1

data/Changelog.md

@@ -1,5 +1,15 @@
+### 2.12.1 / 2012-12-21
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.12.0...v2.12.1)
+
+Bug fixes
+
+* Fix `any_instance` to support `and_call_original`.
+  (Myron Marston)
+* Properly restore stubbed aliased methods on rubies
+  that report the incorrect owner (Myron Marston and Andy Lindeman).
+
 ### 2.12.0 / 2012-11-12
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.11.3...2.12.0)
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.11.3...v2.12.0)
 
 Enhancements
 

data/README.md

@@ -271,10 +271,10 @@ While this is a good thing when you really need it, you probably don't really
 need it! Take care to specify only the things that matter to the behavior of
 your code.
 
-## Stubbing Constants
+## Stubbing and Hiding Constants
 
-See the [stubbing constants
-README](https://github.com/rspec/rspec-mocks/blob/master/features/stubbing_constants/README.md)
+See the [mutating constants
+README](https://github.com/rspec/rspec-mocks/blob/master/features/mutating_constants/README.md)
 for info on this feature.
 
 ## Use `before(:each)`, not `before(:all)`

data/lib/rspec/mocks/any_instance/chain.rb

@@ -13,7 +13,7 @@ module RSpec
           #   @see RSpec::Mocks::MessageExpectation#$1
           #
           def record(method_name)
-            class_eval(<<-EOM, __FILE__, __LINE__)
+            class_eval(<<-EOM, __FILE__, __LINE__ + 1)
               def #{method_name}(*args, &block)
                 record(:#{method_name}, *args, &block)
               end
@@ -25,6 +25,7 @@ module RSpec
         record :and_raise
         record :and_throw
         record :and_yield
+        record :and_call_original
         record :with
         record :once
         record :twice

data/lib/rspec/mocks/any_instance/recorder.rb

@@ -109,6 +109,14 @@ module RSpec
           @played_methods[method_name]
         end
 
+        def build_alias_method_name(method_name)
+          "__#{method_name}_without_any_instance__"
+        end
+
+        def already_observing?(method_name)
+          @observed_methods.include?(method_name)
+        end
+
         private
 
         def normalize_chain(*args)
@@ -130,10 +138,6 @@ module RSpec
           end
         end
 
-        def build_alias_method_name(method_name)
-          "__#{method_name}_without_any_instance__"
-        end
-
         def restore_original_method!(method_name)
           alias_method_name = build_alias_method_name(method_name)
           @klass.class_eval do
@@ -165,15 +169,11 @@ module RSpec
           @observed_methods.delete(method_name)
         end
 
-        def already_observing?(method_name)
-          @observed_methods.include?(method_name)
-        end
-
         def observe!(method_name)
           stop_observing!(method_name) if already_observing?(method_name)
           @observed_methods << method_name
           backup_method!(method_name)
-          @klass.class_eval(<<-EOM, __FILE__, __LINE__)
+          @klass.class_eval(<<-EOM, __FILE__, __LINE__ + 1)
             def #{method_name}(*args, &blk)
               klass = ::Object.instance_method(:method).bind(self).call(:#{method_name}).owner
               klass.__recorder.playback!(self, :#{method_name})
@@ -184,7 +184,7 @@ module RSpec
 
         def mark_invoked!(method_name)
           backup_method!(method_name)
-          @klass.class_eval(<<-EOM, __FILE__, __LINE__)
+          @klass.class_eval(<<-EOM, __FILE__, __LINE__ + 1)
             def #{method_name}(*args, &blk)
               method_name = :#{method_name}
               klass = ::Object.instance_method(:method).bind(self).call(:#{method_name}).owner

data/lib/rspec/mocks/instance_method_stasher.rb

@@ -30,14 +30,29 @@ module RSpec
       end
 
       # @private
-      def method_defined_on_klass?
-        @klass.method_defined?(@method) || @klass.private_method_defined?(@method)
+      def method_defined_on_klass?(klass = @klass)
+        klass.method_defined?(@method) || klass.private_method_defined?(@method)
       end
 
       if ::UnboundMethod.method_defined?(:owner)
         # @private
         def method_owned_by_klass?
-          @klass.instance_method(@method).owner == @klass
+          owner = @klass.instance_method(@method).owner
+          # On 1.8 (and some 1.9s -- e.g. rubinius) aliased methods
+          # can report the wrong owner. Example:
+          # class MyClass
+          #   class << self
+          #     alias alternate_new new
+          #   end
+          # end
+          #
+          # MyClass.owner(:alternate_new) returns `Class` on 1.8,
+          # but we need to consider the owner to be `MyClass` because
+          # it is not actually available on `Class` but is on `MyClass`.
+          # Hence, we verify that the owner actually has the method defined.
+          # If the given owner does not have the method defined, we assume
+          # that the method is actually owned by @klass.
+          owner == @klass || !(method_defined_on_klass?(owner))
         end
       else
         # @private

data/lib/rspec/mocks/method_double.rb

@@ -45,6 +45,15 @@ module RSpec
         if @method_stasher.method_is_stashed?
           # Example: a singleton method defined on @object
           method_handle_for(@object, @method_stasher.stashed_method_name)
+        elsif meth = original_unrecorded_any_instance_method
+          # Example: a method that has been mocked through
+          #   klass.any_instance.should_receive(:msg).and_call_original
+          # any_instance.should_receive(:msg) causes the method to be
+          # replaced with a proxy method, and then `and_call_original`
+          # is recorded and played back on the object instance. We need
+          # special handling here to get a handle on the original method
+          # object rather than the proxy method.
+          meth
         else
           begin
             # Example: an instance method defined on @object's class.
@@ -75,6 +84,19 @@ module RSpec
         end
       end
 
+      def original_unrecorded_any_instance_method
+        return nil unless any_instance_class_recorder_observing_method?(@object.class)
+        alias_name = @object.class.__recorder.build_alias_method_name(@method_name)
+        @object.method(alias_name)
+      end
+
+      def any_instance_class_recorder_observing_method?(klass)
+        return true if klass.__recorder.already_observing?(@method_name)
+        superklass = klass.superclass
+        return false if superklass.nil?
+        any_instance_class_recorder_observing_method?(superklass)
+      end
+
       if RUBY_VERSION.to_f > 1.8
         # @private
         def original_method_from_superclass

data/lib/rspec/mocks/mutate_const.rb

@@ -57,16 +57,22 @@ module RSpec
       end
 
       def recursive_const_get(const_name)
-        const_name.split('::').inject(Object) { |mod, name| get_const_defined_on(mod, 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)
-        const_name.split('::').inject([Object, '']) do |(mod, full_name), name|
+        normalize_const_name(const_name).split('::').inject([Object, '']) do |(mod, full_name), name|
           yield(full_name, name) if block_given? && !mod.is_a?(Module)
           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)

data/lib/rspec/mocks/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Mocks
     module Version
-      STRING = '2.12.0'
+      STRING = '2.12.1'
     end
   end
 end

data/spec/rspec/mocks/and_call_original_spec.rb

@@ -37,6 +37,24 @@ describe "and_call_original" do
       expect(instance.foo).to eq(:bar)
     end
 
+    context 'when using any_instance' do
+      it 'works for instance methods defined on the class' do
+        klass.any_instance.should_receive(:meth_1).and_call_original
+        expect(klass.new.meth_1).to eq(:original)
+      end
+
+      it 'works for instance methods defined on the superclass of the class' do
+        subclass = Class.new(klass)
+        subclass.any_instance.should_receive(:meth_1).and_call_original
+        expect(subclass.new.meth_1).to eq(:original)
+      end
+
+      it 'works when mocking the method on one class and calling the method on an instance of a subclass' do
+        klass.any_instance.should_receive(:meth_1).and_call_original
+        expect(Class.new(klass).new.meth_1).to eq(:original)
+      end
+    end
+
     if RUBY_VERSION.to_f > 1.8
       it 'works for class methods defined on a superclass' do
         subclass = Class.new(klass)
@@ -78,6 +96,17 @@ describe "and_call_original" do
       expect(inst.meth_1).to eq(:original)
     end
 
+    it 'works for aliased methods' do
+      klass = Class.new do
+        class << self
+          alias alternate_new new
+        end
+      end
+
+      klass.should_receive(:alternate_new).and_call_original
+      expect(klass.alternate_new).to be_an_instance_of(klass)
+    end
+
     context 'on an object that defines method_missing' do
       before do
         klass.class_eval do
@@ -98,6 +127,18 @@ describe "and_call_original" do
         expect(instance.greet_jack).to eq("Hello, jack")
       end
 
+      it 'works for an any_instance partial mock' do
+        klass.any_instance.should_receive(:greet_jack).and_call_original
+        expect(instance.greet_jack).to eq("Hello, jack")
+      end
+
+      it 'raises an error for an unhandled message for an any_instance partial mock' do
+        klass.any_instance.should_receive(:not_a_handled_message).and_call_original
+        expect {
+          instance.not_a_handled_message
+        }.to raise_error(NameError, /not_a_handled_message/)
+      end
+
       it 'raises an error on invocation if method_missing does not handle the message' do
         instance.should_receive(:not_a_handled_message).and_call_original
 

data/spec/rspec/mocks/mutate_const_spec.rb

@@ -141,6 +141,10 @@ module RSpec
           it_behaves_like "loaded constant hiding", "TestClass::Nested"
         end
 
+        context 'for a loaded context prefixed with ::' do
+          it_behaves_like 'loaded constant hiding', "::TestClass"
+        end
+
         context 'for an unloaded constant with nested name that matches a top-level constant' do
           it_behaves_like "unloaded constant hiding", "TestClass::Hash"
 
@@ -291,6 +295,10 @@ module RSpec
           it_behaves_like "loaded constant stubbing", "TestClass::Nested"
         end
 
+        context 'for a loaded context prefixed with ::' do
+          it_behaves_like 'loaded constant stubbing', "::TestClass"
+        end
+
         context 'for an unloaded constant with nested name that matches a top-level constant' do
           it_behaves_like "unloaded constant stubbing", "TestClass::Hash"
         end

data/spec/rspec/mocks/partial_mock_spec.rb

@@ -94,7 +94,7 @@ module RSpec
 
       it "includes the class name in the error when mocking a class method that is called an extra time with the wrong args" do
         klass = Class.new do
-          def self.to_s
+          def self.inspect
             "MyClass"
           end
         end

data/spec/rspec/mocks/stash_spec.rb

@@ -11,6 +11,7 @@ module RSpec
           end
         end
       end
+
       it "keeps the original method intact after multiple expectations are added on the same method" do
         klass.should_receive(:foo).with(:fizbaz).and_return(:wowwow)
         klass.should_receive(:foo).with(:bazbar).and_return(:okay)
@@ -23,5 +24,31 @@ module RSpec
         klass.foo(:yeah).should equal(:original_value)
       end
     end
+
+    describe "when a class method is aliased on a subclass and the method is mocked" do
+      let(:klass) do
+        Class.new do
+          class << self
+            alias alternate_new new
+          end
+        end
+      end
+
+      it "restores the original aliased public method" do
+        klass = Class.new do
+          class << self
+            alias alternate_new new
+          end
+        end
+
+        klass.should_receive(:alternate_new)
+        expect(klass.alternate_new).to be_nil
+
+        klass.rspec_verify
+
+        klass.rspec_reset
+        expect(klass.alternate_new).to be_an_instance_of(klass)
+      end
+    end
   end
 end

metadata

@@ -1,71 +1,80 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rspec-mocks
-version: !ruby/object:Gem::Version
-  version: 2.12.0
+version: !ruby/object:Gem::Version 
+  hash: 61
   prerelease: 
+  segments: 
+  - 2
+  - 12
+  - 1
+  version: 2.12.1
 platform: ruby
-authors:
+authors: 
 - Steven Baker
 - David Chelimsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
+
+date: 2012-12-21 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 79
+        segments: 
+        - 10
+        - 0
+        - 0
         version: 10.0.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 10.0.0
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.9
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 1
+        - 9
         version: 1.1.9
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.11
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+  name: cucumber
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 4
+        - 11
         version: 0.4.11
+  prerelease: false
+  type: :development
+  name: aruba
+  requirement: *id003
 description: RSpec's 'test double' framework, with support for stubbing and mocking
 email: rspec-users@rubyforge.org
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/rspec/mocks.rb
 - lib/rspec/mocks/any_instance.rb
 - lib/rspec/mocks/any_instance/chain.rb
@@ -182,38 +191,39 @@ files:
 - spec/rspec/mocks_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/rspec/rspec-mocks
-licenses:
+licenses: 
 - MIT
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -450868354806899778
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -450868354806899778
+      version: "0"
 requirements: []
+
 rubyforge_project: rspec
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.12.0
-test_files:
+summary: rspec-mocks-2.12.1
+test_files: 
 - features/README.md
 - features/Scope.md
 - features/Upgrade.md