rspec-mocks 2.6.0.rc2 → 2.6.0.rc4

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 ### rspec libs
-%w[rspec-core rspec-expectations rspec-mocks].each do |lib|
+%w[rspec rspec-core rspec-expectations rspec-mocks].each do |lib|
   library_path = File.expand_path("../../#{lib}", __FILE__)
   if File.exist?(library_path)
     gem lib, :path => library_path
@@ -12,8 +12,8 @@ end
 
 ### dev dependencies
 gem "rake", "0.8.7"
-# gem "cucumber", "~> 0.10.2"
-# gem "aruba", :git => "git://github.com/aslakhellesoy/aruba"
+gem "cucumber", "~> 0.10.2"
+gem "aruba", "~> 0.3.6"
 gem "rcov", "0.9.9", :platforms => :mri
 gem "relish", "0.2.0"
 gem "guard-rspec", "0.1.9"

data/features/Changelog.md

@@ -1,6 +1,13 @@
+### 2.6.0.rc4 / 2011-05-01
+
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.6.0.rc2...v2.6.0.rc4)
+
+* Bug fixes
+  * Support multiple calls to any_instance in the same example (Sidu Ponnappa)
+
 ### 2.6.0.rc2 / 2011-04-18
 
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.5.0...v2.6.1.rc2)
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.5.0...v2.6.0.rc2)
 
 * Enhancements
   * Add support for any_instance.stub and any_instance.should_receive (Sidu

data/features/Upgrade.md

@@ -1,6 +1,14 @@
-# rspec-mocks-2.2
+## rspec-mocks-2.6
 
-## What's new
+### `any_instance`
+
+Set method stubs and message expectations on any instance of a class:
+
+    class Foo; end
+    Foo.any_instance.stub(:bar) { 'bar' }
+    Foo.new.bar # => 'bar'
+
+## rspec-mocks-2.2
 
 ### `require "rspec/mocks/standalone"`
 

data/lib/rspec/mocks/any_instance.rb

@@ -23,12 +23,12 @@ module RSpec
 
         def constrained_to_any_of?(*constraints)
           constraints.any? do |constraint|
-            messages.any? do |message| 
+            messages.any? do |message|
               message.first.first == constraint
             end
           end
         end
-        
+
         private
         def messages
           @messages ||= []
@@ -90,11 +90,11 @@ module RSpec
         def expectation_fulfilled!
           @expectation_fulfilled = true
         end
-        
+
         def expectation_filfilled?
           @expectation_fulfilled || constrained_to_any_of?(:never, :any_number_of_times)
         end
-        
+
         private
         def verify_invocation_order(rspec_method_name, *args, &block)
         end
@@ -120,7 +120,7 @@ module RSpec
           @message_chains[method_name] = ExpectationChain.new(method_name, *args, &block)
         end
 
-        def stop_observing!
+        def stop_all_observation!
           @observed_methods.each do |method_name|
             restore_method!(method_name)
           end
@@ -136,36 +136,36 @@ module RSpec
         def instance_that_received(method_name)
           @played_methods[method_name]
         end
-        
+
         def verify
           if @expectation_set && !each_expectation_filfilled?
             raise RSpec::Mocks::MockExpectationError, "Exactly one instance should have received the following message(s) but didn't: #{unfulfilled_expectations.sort.join(', ')}"
           end
         end
-        
+
         private
         def each_expectation_filfilled?
           @message_chains.all? do |method_name, chain|
             chain.expectation_filfilled?
           end
         end
-        
+
         def has_expectation?(method_name)
           @message_chains[method_name].is_a?(ExpectationChain)
         end
-        
+
         def unfulfilled_expectations
           @message_chains.map do |method_name, chain|
             method_name.to_s if chain.is_a?(ExpectationChain) unless chain.expectation_filfilled?
           end.compact
         end
-        
+
         def received_expected_message!(method_name)
           @message_chains[method_name].expectation_fulfilled!
           restore_method!(method_name)
           mark_invoked!(method_name)
         end
-        
+
         def restore_method!(method_name)
           if @klass.method_defined?(build_alias_method_name(method_name))
             restore_original_method!(method_name)
@@ -173,7 +173,7 @@ module RSpec
             remove_dummy_method!(method_name)
           end
         end
-        
+
         def build_alias_method_name(method_name)
           "__#{method_name}_without_any_instance__"
         end
@@ -200,8 +200,18 @@ module RSpec
             end
           end
         end
-        
+
+        def stop_observing!(method_name)
+          restore_method!(method_name)
+          @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__)
@@ -234,7 +244,7 @@ module RSpec
         __recorder.verify
         super
       ensure
-        __recorder.stop_observing!
+        __recorder.stop_all_observation!
         @__recorder = nil
       end
 

data/lib/rspec/mocks/argument_expectation.rb

@@ -5,7 +5,7 @@ module RSpec
       
       def initialize(*args, &block)
         @args = args
-        @matchers_block = args.empty? ? block : nil
+        @block = args.empty? ? block : nil
         @match_any_args = false
         @matchers = nil
         
@@ -26,19 +26,20 @@ module RSpec
       end
       
       def is_matcher?(obj)
-        !is_stub_as_null_object?(obj) & obj.respond_to?(:matches?) & obj.respond_to?(:description)
+        !null_object?(obj) & obj.respond_to?(:matches?) & obj.respond_to?(:description)
       end
 
-      def is_stub_as_null_object?(obj)
-        obj.respond_to?(:__rspec_double_acting_as_null_object?) && obj.__rspec_double_acting_as_null_object?
+      def args_match?(*args)
+        match_any_args? || block_passes?(*args) || matchers_match?(*args)
       end
       
-      def args_match?(*args)
-        match_any_args? || matchers_block_matches?(*args) || matchers_match?(*args)
+      private
+      def null_object?(obj)
+        obj.respond_to?(:__rspec_double_acting_as_null_object?) && obj.__rspec_double_acting_as_null_object?
       end
       
-      def matchers_block_matches?(*args)
-        @matchers_block ? @matchers_block.call(*args) : nil
+      def block_passes?(*args)
+        @block.call(*args) if @block
       end
       
       def matchers_match?(*args)

data/lib/rspec/mocks/extensions/marshal.rb

@@ -1,7 +1,5 @@
 module Marshal
-
   class << self
-
     def dump_with_mocks(*args)
       object = args.shift
       return dump_without_mocks(*args.unshift(object)) unless object.instance_variable_defined?(:@mock_proxy)
@@ -21,7 +19,5 @@ module Marshal
     alias_method :dump_without_mocks, :dump
     undef_method :dump
     alias_method :dump, :dump_with_mocks
-
   end
-
 end

data/lib/rspec/mocks/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Mocks # :nodoc:
     module Version # :nodoc:
-      STRING = '2.6.0.rc2'
+      STRING = '2.6.0.rc4'
     end
   end
 end

data/spec/rspec/mocks/any_instance_spec.rb

@@ -8,7 +8,7 @@ module RSpec
       let(:klass) do
         Class.new do
           def existing_method; :existing_method_return_value; end
-          def another_existing_method; 4; end
+          def another_existing_method; end
         end
       end
       let(:existing_method_return_value){ :existing_method_return_value }
@@ -54,21 +54,21 @@ module RSpec
           klass.any_instance.stub(:foo)
           lambda{ klass.new.bar }.should raise_error(NoMethodError)
         end
-        
+
         context "behaves as 'every instance'" do
           it "stubs every instance in the spec" do
             klass.any_instance.stub(:foo).and_return(result = Object.new)
             klass.new.foo.should eq(result)
             klass.new.foo.should eq(result)
           end
-          
+
           it "stubs instance created before any_instance was called" do
             instance = klass.new
             klass.any_instance.stub(:foo).and_return(result = Object.new)
             instance.foo.should eq(result)
           end
         end
-        
+
         context "with #and_return" do
           it "stubs a method that doesn't exist" do
             klass.any_instance.stub(:foo).and_return(1)
@@ -196,12 +196,12 @@ module RSpec
           it "allows expectations on instances to take priority" do
             klass.any_instance.should_receive(:foo)
             klass.new.foo
-            
+
             instance = klass.new
             instance.should_receive(:foo).and_return(result = Object.new)
             instance.foo.should eq(result)
           end
-          
+
           context "behaves as 'exactly one instance'" do
             it "passes if subsequent invocations do not receive that message" do
               klass.any_instance.should_receive(:foo)
@@ -220,7 +220,7 @@ module RSpec
               end.to raise_error(RSpec::Mocks::MockExpectationError, "The message 'foo' was received by #{instance_two.inspect} but has already been received by #{instance_one.inspect}")
             end
           end
-          
+
           context "normal expectations on the class object" do
             it "fail when unfulfilled" do
               expect do
@@ -232,8 +232,8 @@ module RSpec
                 error.message.should_not eq(existing_method_expectation_error_message)
               end)
             end
-            
-            
+
+
             it "pass when expectations are met" do
               klass.any_instance.should_receive(:foo)
               klass.should_receive(:woot).and_return(result = Object.new)
@@ -483,18 +483,18 @@ module RSpec
 
       context "when resetting post-verification" do
         let(:space) { RSpec::Mocks::Space.new }
-        
+
         context "existing method" do
           before(:each) do
             space.add(klass)
           end
-          
+
           context "with stubbing" do
             before(:each) do
               klass.any_instance.stub(:existing_method).and_return(1)
               klass.method_defined?(:__existing_method_without_any_instance__).should be_true
             end
-            
+
             it "restores the class to its original state after each example when no instance is created" do
               space.verify_all
 
@@ -521,7 +521,7 @@ module RSpec
               klass.new.existing_method.should eq(existing_method_return_value)
             end
           end
-          
+
           context "with expectations" do
             context "ensures that the subsequent specs do not see expectations set in previous specs" do
               context "when the instance created after the expectation is set" do
@@ -529,28 +529,28 @@ module RSpec
                   klass.any_instance.should_receive(:existing_method).and_return(Object.new)
                   klass.new.existing_method
                 end
-            
+
                 it "second spec" do
                   klass.new.existing_method.should eq(existing_method_return_value)
                 end
               end
-              
+
               context "when the instance created before the expectation is set" do
                 before :each do
                   @instance = klass.new
                 end
-                
+
                 it "first spec" do
                   klass.any_instance.should_receive(:existing_method).and_return(Object.new)
                   @instance.existing_method
                 end
-            
+
                 it "second spec" do
                   @instance.existing_method.should eq(existing_method_return_value)
                 end
               end
             end
-            
+
             it "ensures that the next spec does not see that expectation" do
               klass.any_instance.should_receive(:existing_method).and_return(Object.new)
               klass.new.existing_method
@@ -561,6 +561,17 @@ module RSpec
           end
         end
 
+        context "with multiple calls to any_instance in the same example" do
+          it "does not prevent the change from being rolled back" do
+            klass.any_instance.stub(:existing_method).and_return(false)
+            klass.any_instance.stub(:existing_method).and_return(true)
+
+            klass.rspec_verify
+            klass.new.should respond_to(:existing_method)
+            klass.new.existing_method.should eq(existing_method_return_value)
+          end
+        end
+
         it "adds an class to the current space when #any_instance is invoked" do
           klass.any_instance
           RSpec::Mocks::space.send(:mocks).should include(klass)
@@ -573,6 +584,7 @@ module RSpec
           RSpec::Mocks::space.send(:mocks).should include(instance)
         end
       end
+
     end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-mocks
 version: !ruby/object:Gem::Version 
-  hash: 15424049
+  hash: 15424061
   prerelease: 6
   segments: 
   - 2
   - 6
   - 0
   - rc
-  - 2
-  version: 2.6.0.rc2
+  - 4
+  version: 2.6.0.rc4
 platform: ruby
 authors: 
 - David Chelimsky
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 -05:00
+date: 2011-05-01 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -161,10 +161,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rspec
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.6.0.rc2
+summary: rspec-mocks-2.6.0.rc4
 test_files: 
 - features/Changelog.md
 - features/README.markdown