rspec-mocks 2.5.0 → 2.6.0

data/spec/rspec/mocks/stub_chain_spec.rb

@@ -3,30 +3,27 @@ require 'spec_helper'
 module RSpec
   module Mocks
     describe "A chained method stub" do
-      before(:each) do
-        @subject = Object.new
-      end
-
+      subject { Object.new }
 
       context "with one method in chain" do
         context "using and_return" do
           it "returns expected value from chaining only one method call" do
-            @subject.stub_chain(:msg1).and_return(:return_value)
-            @subject.msg1.should equal(:return_value)
+            subject.stub_chain(:msg1).and_return(:return_value)
+            subject.msg1.should equal(:return_value)
           end
         end
 
         context "using a block" do
           it "returns the correct value" do
-            @subject.stub_chain(:msg1) { :return_value }
-            @subject.msg1.should equal(:return_value)
+            subject.stub_chain(:msg1) { :return_value }
+            subject.msg1.should equal(:return_value)
           end
         end
 
         context "using a hash" do
           it "returns the value of the key/value pair" do
-            @subject.stub_chain(:msg1 => :return_value)
-            @subject.msg1.should equal(:return_value)
+            subject.stub_chain(:msg1 => :return_value)
+            subject.msg1.should equal(:return_value)
           end
         end
       end
@@ -34,22 +31,22 @@ module RSpec
       context "with two methods in chain" do
         context "using and_return" do
           it "returns expected value from chaining two method calls" do
-            @subject.stub_chain(:msg1, :msg2).and_return(:return_value)
-            @subject.msg1.msg2.should equal(:return_value)
+            subject.stub_chain(:msg1, :msg2).and_return(:return_value)
+            subject.msg1.msg2.should equal(:return_value)
           end
         end
 
         context "using a block" do
           it "returns the correct value" do
-            @subject.stub_chain(:msg1, :msg2) { :return_value }
-            @subject.msg1.msg2.should equal(:return_value)
+            subject.stub_chain(:msg1, :msg2) { :return_value }
+            subject.msg1.msg2.should equal(:return_value)
           end
         end
 
         context "using a hash" do
           it "returns the value of the key/value pair" do
-            @subject.stub_chain(:msg1, :msg2 => :return_value)
-            @subject.msg1.msg2.should equal(:return_value)
+            subject.stub_chain(:msg1, :msg2 => :return_value)
+            subject.msg1.msg2.should equal(:return_value)
           end
         end
       end
@@ -57,57 +54,95 @@ module RSpec
       context "with four methods in chain" do
         context "using and_return" do
           it "returns expected value from chaining two method calls" do
-            @subject.stub_chain(:msg1, :msg2, :msg3, :msg4).and_return(:return_value)
-            @subject.msg1.msg2.msg3.msg4.should equal(:return_value)
+            subject.stub_chain(:msg1, :msg2, :msg3, :msg4).and_return(:return_value)
+            subject.msg1.msg2.msg3.msg4.should equal(:return_value)
           end
         end
 
         context "using a block" do
           it "returns the correct value" do
-            @subject.stub_chain(:msg1, :msg2, :msg3, :msg4) { :return_value }
-            @subject.msg1.msg2.msg3.msg4.should equal(:return_value)
+            subject.stub_chain(:msg1, :msg2, :msg3, :msg4) { :return_value }
+            subject.msg1.msg2.msg3.msg4.should equal(:return_value)
           end
         end
 
         context "using a hash" do
           it "returns the value of the key/value pair" do
-            @subject.stub_chain(:msg1, :msg2, :msg3, :msg4 => :return_value)
-            @subject.msg1.msg2.msg3.msg4.should equal(:return_value)
+            subject.stub_chain(:msg1, :msg2, :msg3, :msg4 => :return_value)
+            subject.msg1.msg2.msg3.msg4.should equal(:return_value)
           end
         end
 
         context "using a hash with a string key" do
           it "returns the value of the key/value pair" do
-            @subject.stub_chain("msg1.msg2.msg3.msg4" => :return_value)
-            @subject.msg1.msg2.msg3.msg4.should equal(:return_value)
+            subject.stub_chain("msg1.msg2.msg3.msg4" => :return_value)
+            subject.msg1.msg2.msg3.msg4.should equal(:return_value)
           end
         end
       end
 
       it "returns expected value from chaining four method calls" do
-        @subject.stub_chain(:msg1, :msg2, :msg3, :msg4).and_return(:return_value)
-        @subject.msg1.msg2.msg3.msg4.should equal(:return_value)
+        subject.stub_chain(:msg1, :msg2, :msg3, :msg4).and_return(:return_value)
+        subject.msg1.msg2.msg3.msg4.should equal(:return_value)
       end
 
-      it "returns expected value from chaining four method calls twice with some shared" do
-        @subject.stub_chain(:msg1, :msg2, :msg3, :msg4).and_return(:first)
-        @subject.stub_chain(:msg5, :msg2, :msg3, :msg4).and_return(:second)
+      context "with messages shared across multiple chains" do
+        context "using and_return" do
+          context "starting with the same message" do
+            it "returns expected value" do
+              subject.stub_chain(:msg1, :msg2, :msg3).and_return(:first)
+              subject.stub_chain(:msg1, :msg2, :msg4).and_return(:second)
+
+              subject.msg1.msg2.msg3.should equal(:first)
+              subject.msg1.msg2.msg4.should equal(:second)
+            end
+          end
+
+          context "starting with the different messages" do
+            it "returns expected value" do
+              subject.stub_chain(:msg1, :msg2, :msg3).and_return(:first)
+              subject.stub_chain(:msg4, :msg2, :msg3).and_return(:second)
+
+              subject.msg1.msg2.msg3.should equal(:first)
+              subject.msg4.msg2.msg3.should equal(:second)
+            end
+          end
+        end
+
+        context "using => value" do
+          context "starting with the same message" do
+            it "returns expected value", :focus => true do
+              subject.stub_chain(:msg1, :msg2, :msg3 => :first)
+              subject.stub_chain(:msg1, :msg2, :msg4 => :second)
+
+              subject.msg1.msg2.msg3.should equal(:first)
+              subject.msg1.msg2.msg4.should equal(:second)
+            end
+          end
 
-        @subject.msg1.msg2.msg3.msg4.should equal(:first)
-        @subject.msg5.msg2.msg3.msg4.should equal(:second)
+          context "starting with different messages" do
+            it "returns expected value", :focus => true do
+              subject.stub_chain(:msg1, :msg2, :msg3 => :first)
+              subject.stub_chain(:msg4, :msg2, :msg3 => :second)
+
+              subject.msg1.msg2.msg3.should equal(:first)
+              subject.msg4.msg2.msg3.should equal(:second)
+            end
+          end
+        end
       end
 
       it "returns expected value when chain is a dot separated string, like stub_chain('msg1.msg2.msg3')" do
-        @subject.stub_chain("msg1.msg2.msg3").and_return(:return_value)
-        @subject.msg1.msg2.msg3.should equal(:return_value)
+        subject.stub_chain("msg1.msg2.msg3").and_return(:return_value)
+        subject.msg1.msg2.msg3.should equal(:return_value)
       end
 
       it "returns expected value from two chains with shared messages at the beginning" do
-        @subject.stub_chain(:msg1, :msg2, :msg3, :msg4).and_return(:first)
-        @subject.stub_chain(:msg1, :msg2, :msg3, :msg5).and_return(:second)
+        subject.stub_chain(:msg1, :msg2, :msg3, :msg4).and_return(:first)
+        subject.stub_chain(:msg1, :msg2, :msg3, :msg5).and_return(:second)
 
-        @subject.msg1.msg2.msg3.msg4.should equal(:first)
-        @subject.msg1.msg2.msg3.msg5.should equal(:second)
+        subject.msg1.msg2.msg3.msg4.should equal(:first)
+        subject.msg1.msg2.msg3.msg5.should equal(:second)
       end
     end
   end

data/spec/rspec/mocks/stub_spec.rb

@@ -31,7 +31,7 @@ module RSpec
       
       [:stub!, :stub].each do |method|
         describe "using #{method}" do
-          it "returns expected value when expected message is received" do
+          it "returns declared value when message is received" do
             @instance.send(method, :msg).and_return(:return_value)
             @instance.msg.should equal(:return_value)
             @instance.rspec_verify
@@ -39,92 +39,95 @@ module RSpec
         end
       end
 
-      it "ignores when expected message is received" do
+      it "instructs an instance to respond_to the message" do
+        @instance.stub(:msg)
+        @instance.should respond_to(:msg)
+      end
+
+      it "instructs a class object to respond_to the message" do
+        @class.stub(:msg)
+        @class.should respond_to(:msg)
+      end
+
+      it "ignores when expected message is received with no args" do
         @instance.stub(:msg)
         @instance.msg
-        lambda do
+        expect do
           @instance.rspec_verify
-        end.should_not raise_error
+        end.not_to raise_error
       end
 
       it "ignores when message is received with args" do
         @instance.stub(:msg)
         @instance.msg(:an_arg)
-        lambda do
+        expect do
           @instance.rspec_verify
-        end.should_not raise_error
+        end.not_to raise_error
       end
 
       it "ignores when expected message is not received" do
         @instance.stub(:msg)
-        lambda do
+        expect do
           @instance.rspec_verify
-        end.should_not raise_error
+        end.not_to raise_error
       end
 
       it "handles multiple stubbed methods" do
         @instance.stub(:msg1 => 1, :msg2 => 2)
-        @instance.msg1.should == 1
-        @instance.msg2.should == 2
-      end
-      
-      it "clears itself when verified" do
-        @instance.stub(:this_should_go).and_return(:blah)
-        @instance.this_should_go.should == :blah
-        @instance.rspec_verify
-        lambda do
-          @instance.this_should_go
-        end.should raise_error(NameError)
+        @instance.msg1.should eq(1)
+        @instance.msg2.should eq(2)
       end
 
-      it "returns values in order to consecutive calls" do
-        return_values = ["1",2,Object.new]
-        @instance.stub(:msg).and_return(*return_values)
-        @instance.msg.should == return_values[0]
-        @instance.msg.should == return_values[1]
-        @instance.msg.should == return_values[2]
-      end
+      describe "#rspec_reset" do
+        it "removes stubbed methods that didn't exist" do
+          @instance.stub(:non_existent_method)
+          @instance.rspec_reset
+          @instance.should_not respond_to(:non_existent_method)
+        end
 
-      it "keeps returning last value in consecutive calls" do
-        return_values = ["1",2,Object.new]
-        @instance.stub(:msg).and_return(return_values[0],return_values[1],return_values[2])
-        @instance.msg.should == return_values[0]
-        @instance.msg.should == return_values[1]
-        @instance.msg.should == return_values[2]
-        @instance.msg.should == return_values[2]
-        @instance.msg.should == return_values[2]
-      end
-
-      it "reverts to original instance method if there is one" do
-        @instance.existing_instance_method.should equal(:original_value)
-        @instance.stub(:existing_instance_method).and_return(:mock_value)
-        @instance.existing_instance_method.should equal(:mock_value)
-        @instance.rspec_verify
-        @instance.existing_instance_method.should equal(:original_value)
-      end
+        it "restores existing instance methods" do
+          # See bug reports 8302 adn 7805
+          @instance.stub(:existing_instance_method) { :stub_value }
+          @instance.rspec_reset
+          @instance.existing_instance_method.should eq(:original_value)
+        end
 
-      it "reverts to original private instance method if there is one" do
-        @instance.existing_instance_method.should equal(:original_value)
-        @instance.stub(:existing_private_instance_method).and_return(:mock_value)
-        @instance.existing_instance_method.should equal(:mock_value)
-        @instance.rspec_verify
-        @instance.existing_instance_method.should equal(:original_value)
+        it "restores existing private instance methods" do
+          # See bug reports 8302 adn 7805
+          @instance.stub(:existing_private_instance_method) { :stub_value }
+          @instance.rspec_reset
+          @instance.send(:existing_private_instance_method).should eq(:original_value)
+        end
+
+        it "restores existing class methods" do
+          # See bug reports 8302 adn 7805
+          @class.stub(:existing_class_method) { :stub_value }
+          @class.rspec_reset
+          @class.existing_class_method.should eq(:original_value)
+        end
+
+        it "restores existing private class methods" do
+          # See bug reports 8302 adn 7805
+          @class.stub(:existing_private_class_method) { :stub_value }
+          @class.rspec_reset
+          @class.send(:existing_private_class_method).should eq(:original_value)
+        end
       end
 
-      it "reverts to original class method if there is one" do
-        @class.existing_class_method.should equal(:original_value)
-        @class.stub(:existing_class_method).and_return(:mock_value)
-        @class.existing_class_method.should equal(:mock_value)
-        @class.rspec_verify
-        @class.existing_class_method.should equal(:original_value)
+      it "returns values in order to consecutive calls" do
+        @instance.stub(:msg).and_return("1",2,:three)
+        @instance.msg.should eq("1")
+        @instance.msg.should eq(2)
+        @instance.msg.should eq(:three)
       end
 
-      it "reverts to original private class method if there is one" do
-        @class.existing_class_method.should equal(:original_value)
-        @class.stub(:existing_private_class_method).and_return(:mock_value)
-        @class.existing_class_method.should equal(:mock_value)
-        @class.rspec_verify
-        @class.existing_class_method.should equal(:original_value)
+      it "keeps returning last value in consecutive calls" do
+        @instance.stub(:msg).and_return("1",2,:three)
+        @instance.msg.should eq("1")
+        @instance.msg.should eq(2)
+        @instance.msg.should eq(:three)
+        @instance.msg.should eq(:three)
+        @instance.msg.should eq(:three)
       end
 
       it "yields a specified object" do

data/spec/rspec/mocks/to_ary_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+describe "a double receiving to_ary" do
+  shared_examples "to_ary" do
+    it "returns nil" do
+      expect do
+        obj.to_ary.should be_nil
+      end.to raise_error(NoMethodError)
+    end
+
+    it "can be overridden with a stub" do
+      obj.stub(:to_ary) { :non_nil_value }
+      obj.to_ary.should be(:non_nil_value)
+    end
+
+    it "supports Array#flatten" do
+      obj = double('foo')
+      [obj].flatten.should eq([obj])
+    end
+  end
+
+  context "double as_null_object" do
+    let(:obj) { double('obj').as_null_object }
+    include_examples "to_ary"
+  end
+
+  context "double without as_null_object" do
+    let(:obj) { double('obj') }
+    include_examples "to_ary"
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-mocks
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 2
-  - 5
+  - 6
   - 0
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors: 
 - David Chelimsky
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-05 00:00:00 -06:00
+date: 2011-05-12 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - .autotest
 - .document
 - .gitignore
+- .travis.yml
 - Gemfile
 - Guardfile
 - License.txt
@@ -44,23 +45,30 @@ files:
 - features/README.markdown
 - features/Upgrade.md
 - features/message_expectations/README.md
+- features/message_expectations/any_instance.feature
 - features/message_expectations/block_local_expectations.feature.pending
 - features/message_expectations/expect_message.feature
 - features/message_expectations/warn_when_expectation_is_set_on_nil.feature
 - features/method_stubs/README.md
+- features/method_stubs/any_instance.feature
+- features/method_stubs/as_null_object.feature
 - features/method_stubs/simple_return_value.feature
 - features/method_stubs/stub_chain.feature
 - features/method_stubs/stub_implementation.feature
+- features/method_stubs/to_ary.feature
 - features/outside_rspec/configuration.feature
 - features/outside_rspec/standalone.feature
+- features/step_definitions/additional_cli_steps.rb
 - features/support/env.rb
 - lib/rspec/mocks.rb
+- lib/rspec/mocks/any_instance.rb
 - lib/rspec/mocks/argument_expectation.rb
 - lib/rspec/mocks/argument_matchers.rb
 - lib/rspec/mocks/error_generator.rb
 - lib/rspec/mocks/errors.rb
 - lib/rspec/mocks/extensions/instance_exec.rb
 - lib/rspec/mocks/extensions/marshal.rb
+- lib/rspec/mocks/extensions/psych.rb
 - lib/rspec/mocks/framework.rb
 - lib/rspec/mocks/message_expectation.rb
 - lib/rspec/mocks/method_double.rb
@@ -76,6 +84,7 @@ files:
 - lib/spec/mocks.rb
 - rspec-mocks.gemspec
 - spec/rspec/mocks/and_yield_spec.rb
+- spec/rspec/mocks/any_instance_spec.rb
 - spec/rspec/mocks/any_number_of_times_spec.rb
 - spec/rspec/mocks/argument_expectation_spec.rb
 - spec/rspec/mocks/at_least_spec.rb
@@ -87,9 +96,7 @@ files:
 - spec/rspec/mocks/bug_report_496_spec.rb
 - spec/rspec/mocks/bug_report_600_spec.rb
 - spec/rspec/mocks/bug_report_7611_spec.rb
-- spec/rspec/mocks/bug_report_7805_spec.rb
 - spec/rspec/mocks/bug_report_8165_spec.rb
-- spec/rspec/mocks/bug_report_8302_spec.rb
 - spec/rspec/mocks/bug_report_830_spec.rb
 - spec/rspec/mocks/bug_report_957_spec.rb
 - spec/rspec/mocks/double_spec.rb
@@ -115,6 +122,7 @@ files:
 - spec/rspec/mocks/stub_implementation_spec.rb
 - spec/rspec/mocks/stub_spec.rb
 - spec/rspec/mocks/stubbed_message_expectations_spec.rb
+- spec/rspec/mocks/to_ary_spec.rb
 - spec/rspec/mocks/twice_counts_spec.rb
 - spec/rspec/mocks_spec.rb
 - spec/spec_helper.rb
@@ -149,26 +157,32 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rspec
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.5.0
+summary: rspec-mocks-2.6.0
 test_files: 
 - features/Changelog.md
 - features/README.markdown
 - features/Upgrade.md
 - features/message_expectations/README.md
+- features/message_expectations/any_instance.feature
 - features/message_expectations/block_local_expectations.feature.pending
 - features/message_expectations/expect_message.feature
 - features/message_expectations/warn_when_expectation_is_set_on_nil.feature
 - features/method_stubs/README.md
+- features/method_stubs/any_instance.feature
+- features/method_stubs/as_null_object.feature
 - features/method_stubs/simple_return_value.feature
 - features/method_stubs/stub_chain.feature
 - features/method_stubs/stub_implementation.feature
+- features/method_stubs/to_ary.feature
 - features/outside_rspec/configuration.feature
 - features/outside_rspec/standalone.feature
+- features/step_definitions/additional_cli_steps.rb
 - features/support/env.rb
 - spec/rspec/mocks/and_yield_spec.rb
+- spec/rspec/mocks/any_instance_spec.rb
 - spec/rspec/mocks/any_number_of_times_spec.rb
 - spec/rspec/mocks/argument_expectation_spec.rb
 - spec/rspec/mocks/at_least_spec.rb
@@ -180,9 +194,7 @@ test_files:
 - spec/rspec/mocks/bug_report_496_spec.rb
 - spec/rspec/mocks/bug_report_600_spec.rb
 - spec/rspec/mocks/bug_report_7611_spec.rb
-- spec/rspec/mocks/bug_report_7805_spec.rb
 - spec/rspec/mocks/bug_report_8165_spec.rb
-- spec/rspec/mocks/bug_report_8302_spec.rb
 - spec/rspec/mocks/bug_report_830_spec.rb
 - spec/rspec/mocks/bug_report_957_spec.rb
 - spec/rspec/mocks/double_spec.rb
@@ -208,6 +220,7 @@ test_files:
 - spec/rspec/mocks/stub_implementation_spec.rb
 - spec/rspec/mocks/stub_spec.rb
 - spec/rspec/mocks/stubbed_message_expectations_spec.rb
+- spec/rspec/mocks/to_ary_spec.rb
 - spec/rspec/mocks/twice_counts_spec.rb
 - spec/rspec/mocks_spec.rb
 - spec/spec_helper.rb

data/spec/rspec/mocks/bug_report_7805_spec.rb

@@ -1,22 +0,0 @@
-require 'spec_helper'
-
-module Bug7805
-  #This is really a duplicate of 8302
-
-  describe "Stubs should correctly restore module methods" do
-    it "1 - stub the open method" do
-      File.stub(:open).and_return("something")
-      File.open.should == "something"
-    end
-    it "2 - use File.open to create example.txt" do
-      filename = "#{File.dirname(__FILE__)}/example-#{Time.new.to_i}.txt"
-      File.exist?(filename).should be_false
-      file = File.open(filename,'w')
-      file.close
-      File.exist?(filename).should be_true
-      File.delete(filename)
-      File.exist?(filename).should be_false
-    end
-  end
-
-end

data/spec/rspec/mocks/bug_report_8302_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-module Bug8302
-  describe "Bug report 8302:" do
-    class Foo
-      def Foo.class_method(arg)
-      end
-  
-      def instance_bar(arg)
-      end
-    end
-
-    it "class method is not restored correctly when proxied" do
-      Foo.should_not_receive(:class_method).with(Array.new)
-      Foo.rspec_verify
-      Foo.class_method(Array.new)
-    end
-
-    it "instance method is not restored correctly when proxied" do
-      foo = Foo.new
-      foo.should_not_receive(:instance_bar).with(Array.new)
-      foo.rspec_verify
-      foo.instance_bar(Array.new)
-    end
-  end
-end