Merge pull request #234 from JonRowe/fix_issue_with_stubbing_any_inst…

…ance_and_dup

Fix issue #229 runtime error caused by duplicating an object which is frozen and stubbing with any_instance

lib/rspec/mocks/any_instance.rb

@@ -57,8 +57,9 @@ def modify_dup_to_remove_mock_proxy_when_invoked
         if method_defined?(:dup) and !method_defined?(:__rspec_original_dup)
           class_eval do
             def __rspec_dup(*arguments, &block)
-              __remove_mock_proxy
-              __rspec_original_dup(*arguments, &block)
+              clone = __rspec_original_dup(*arguments, &block)
+              clone.send :__remove_mock_proxy
+              clone
             end
 
             alias_method  :__rspec_original_dup, :dup

lib/rspec/mocks/methods.rb

@@ -135,7 +135,7 @@ def __mock_proxy
           mp
         end
       end
-      
+
       def __remove_mock_proxy
         @mock_proxy = nil
       end

lib/rspec/mocks/space.rb

@@ -25,7 +25,7 @@ def expectation_ordering
       end
 
     private
-    
+
       def receivers
         @receivers ||= []
       end

spec/rspec/mocks/any_instance_spec.rb

@@ -108,6 +108,13 @@ def private_method; :private_method_return_value; end
             klass.any_instance.stub(:foo).and_return(result = Object.new)
             expect(instance.foo).to eq(result)
           end
+
+          it 'handles freeze and duplication correctly' do
+            String.any_instance.stub(:any_method)
+
+            foo = 'foo'.freeze
+            expect(foo.dup.concat 'bar').to eq 'foobar'
+          end
         end
 
         context "with argument matching" do