rspec-mocks 2.14.2 → 2.14.3

data/Changelog.md

@@ -1,3 +1,11 @@
+### 2.14.3 / 2013-08-08
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.2...v2.14.3)
+
+Bug Fixes:
+
+* Fix stubbing some instance methods for classes whose hierarchy includes
+  a prepended Module (Bradley Schaefer)
+
 ### 2.14.2 / 2013-07-30
 [full changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.1...v2.14.2)
 

data/lib/rspec/mocks/instance_method_stasher.rb

@@ -38,6 +38,12 @@ module RSpec
         # @private
         def method_owned_by_klass?
           owner = @klass.instance_method(@method).owner
+
+          # On Ruby 2.0.0+ the owner of a method on a class which has been
+          # `prepend`ed may actually be an instance, e.g.
+          # `#<MyClass:0x007fbb94e3cd10>`, rather than the expected `MyClass`.
+          owner = owner.class unless owner.is_a? Class
+
           # On 1.8 (and some 1.9s -- e.g. rubinius) aliased methods
           # can report the wrong owner. Example:
           # class MyClass

data/lib/rspec/mocks/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Mocks
     module Version
-      STRING = '2.14.2'
+      STRING = '2.14.3'
     end
   end
 end

data/spec/rspec/mocks/stub_spec.rb

@@ -177,6 +177,43 @@ module RSpec
 
           expect(mod.hello).to eq(:hello)
         end
+
+        if RUBY_VERSION >= '2.0.0'
+          context "with a prepended module (ruby 2.0.0+)" do
+            before do
+              mod = Module.new do
+                def existing_instance_method
+                  "#{super}_prepended".to_sym
+                end
+              end
+
+              @prepended_class = Class.new(@class) do
+                prepend mod
+
+                def non_prepended_method
+                  :not_prepended
+                end
+              end
+              @prepended_instance = @prepended_class.new
+            end
+
+            it "restores prepended instance methods" do
+              allow(@prepended_instance).to receive(:existing_instance_method) { :stubbed }
+              expect(@prepended_instance.existing_instance_method).to eq :stubbed
+
+              reset @prepended_instance
+              expect(@prepended_instance.existing_instance_method).to eq :original_value_prepended
+            end
+
+            it "restores non-prepended instance methods" do
+              allow(@prepended_instance).to receive(:non_prepended_method) { :stubbed }
+              expect(@prepended_instance.non_prepended_method).to eq :stubbed
+
+              reset @prepended_instance
+              expect(@prepended_instance.non_prepended_method).to eq :not_prepended
+            end
+          end
+        end
       end
 
       it "returns values in order to consecutive calls" do

metadata

@@ -2,7 +2,7 @@
 name: rspec-mocks
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 2.14.2
+  version: 2.14.3
 platform: ruby
 authors:
 - Steven Baker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -214,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3181053517643959284
+      hash: -4603029701728341322
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -223,14 +223,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3181053517643959284
+      hash: -4603029701728341322
   none: false
 requirements: []
 rubyforge_project: rspec
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.14.2
+summary: rspec-mocks-2.14.3
 test_files:
 - features/README.md
 - features/Scope.md