rspec-mocks 2.0.0.beta.19 → 2.0.0.beta.20

data/spec/rspec/mocks/precise_counts_spec.rb

@@ -7,7 +7,7 @@ module RSpec
         @mock = double("test mock")
       end
 
-      it "should fail when exactly n times method is called less than n times" do
+      it "fails when exactly n times method is called less than n times" do
         @mock.should_receive(:random_call).exactly(3).times
         @mock.random_call
         @mock.random_call
@@ -16,14 +16,14 @@ module RSpec
         end.should raise_error(RSpec::Mocks::MockExpectationError)
       end
 
-      it "should fail when exactly n times method is never called" do
+      it "fails when exactly n times method is never called" do
         @mock.should_receive(:random_call).exactly(3).times
         lambda do
           @mock.rspec_verify
         end.should raise_error(RSpec::Mocks::MockExpectationError)
       end
 
-      it "should pass if exactly n times method is called exactly n times" do
+      it "passes if exactly n times method is called exactly n times" do
         @mock.should_receive(:random_call).exactly(3).times
         @mock.random_call
         @mock.random_call
@@ -31,7 +31,7 @@ module RSpec
         @mock.rspec_verify
       end
 
-      it "should pass multiple calls with different args and counts" do
+      it "passes multiple calls with different args and counts" do
         @mock.should_receive(:random_call).twice.with(1)
         @mock.should_receive(:random_call).once.with(2)
         @mock.random_call(1)
@@ -40,7 +40,7 @@ module RSpec
         @mock.rspec_verify
       end
 
-      it "should pass mutiple calls with different args" do
+      it "passes mutiple calls with different args" do
         @mock.should_receive(:random_call).once.with(1)
         @mock.should_receive(:random_call).once.with(2)
         @mock.random_call(1)

data/spec/rspec/mocks/record_messages_spec.rb

@@ -6,18 +6,18 @@ module RSpec
       before(:each) do
         @mock = double("mock").as_null_object
       end
-      it "should answer false for received_message? when no messages received" do
+      it "answers false for received_message? when no messages received" do
         @mock.received_message?(:message).should be_false
       end
-      it "should answer true for received_message? when message received" do
+      it "answers true for received_message? when message received" do
         @mock.message
         @mock.received_message?(:message).should be_true
       end
-      it "should answer true for received_message? when message received with correct args" do
+      it "answers true for received_message? when message received with correct args" do
         @mock.message 1,2,3
         @mock.received_message?(:message, 1,2,3).should be_true
       end
-      it "should answer false for received_message? when message received with incorrect args" do
+      it "answers false for received_message? when message received with incorrect args" do
         @mock.message 1,2,3
         @mock.received_message?(:message, 1,2).should be_false
       end

data/spec/rspec/mocks/stash_spec.rb

@@ -11,7 +11,7 @@ module RSpec
           end
         end
       end
-      it "should keep the original method intact after multiple expectations are added on the same method" do
+      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)
 

data/spec/rspec/mocks/stub_chain_spec.rb

@@ -29,6 +29,19 @@ module RSpec
         @subject.msg1.msg2.msg3.msg4.should equal(:first)
         @subject.msg5.msg2.msg3.msg4.should equal(:second)
       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)
+      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.msg1.msg2.msg3.msg4.should equal(:first)
+        @subject.msg1.msg2.msg3.msg5.should equal(:second)
+      end
     end
   end
 end

data/spec/rspec/mocks/stub_implementation_spec.rb

@@ -30,7 +30,7 @@ module RSpec
 
   
     describe "unstub implementation" do      
-      it "should replace the stubbed method with the original method" do
+      it "replaces the stubbed method with the original method" do
         obj = Object.new
         def obj.foo; :original; end
         obj.stub(:foo)
@@ -38,7 +38,7 @@ module RSpec
         obj.foo.should == :original
       end
     
-      it "should remove all stubs with the supplied method name" do
+      it "removes all stubs with the supplied method name" do
         obj = Object.new
         def obj.foo; :original; end
         obj.stub(:foo).with(1)
@@ -47,7 +47,7 @@ module RSpec
         obj.foo.should == :original
       end
     
-      it "should not remove any expectations with the same method name" do
+      it "does not remove any expectations with the same method name" do
         obj = Object.new
         def obj.foo; :original; end
         obj.should_receive(:foo).with(3).and_return(:three)
@@ -57,7 +57,7 @@ module RSpec
         obj.foo(3).should == :three
       end
     
-      it "should raise a MockExpectationError if the method has not been stubbed" do
+      it "raises a MockExpectationError if the method has not been stubbed" do
         obj = Object.new
         lambda do
           obj.unstub(:foo)

data/spec/rspec/mocks/stub_spec.rb

@@ -31,7 +31,7 @@ module RSpec
       
       [:stub!, :stub].each do |method|
         describe "using #{method}" do
-          it "should return expected value when expected message is received" do
+          it "returns expected value when expected message is received" do
             @instance.send(method, :msg).and_return(:return_value)
             @instance.msg.should equal(:return_value)
             @instance.rspec_verify
@@ -39,7 +39,7 @@ module RSpec
         end
       end
 
-      it "should ignore when expected message is received" do
+      it "ignores when expected message is received" do
         @instance.stub(:msg)
         @instance.msg
         lambda do
@@ -47,7 +47,7 @@ module RSpec
         end.should_not raise_error
       end
 
-      it "should ignore when message is received with args" do
+      it "ignores when message is received with args" do
         @instance.stub(:msg)
         @instance.msg(:an_arg)
         lambda do
@@ -55,20 +55,20 @@ module RSpec
         end.should_not raise_error
       end
 
-      it "should ignore when expected message is not received" do
+      it "ignores when expected message is not received" do
         @instance.stub(:msg)
         lambda do
           @instance.rspec_verify
         end.should_not raise_error
       end
 
-      it "should handle multiple stubbed methods" do
+      it "handles multiple stubbed methods" do
         @instance.stub(:msg1 => 1, :msg2 => 2)
         @instance.msg1.should == 1
         @instance.msg2.should == 2
       end
       
-      it "should clear itself when verified" do
+      it "clears itself when verified" do
         @instance.stub(:this_should_go).and_return(:blah)
         @instance.this_should_go.should == :blah
         @instance.rspec_verify
@@ -77,7 +77,7 @@ module RSpec
         end.should raise_error(NameError)
       end
 
-      it "should return values in order to consecutive calls" do
+      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]
@@ -85,7 +85,7 @@ module RSpec
         @instance.msg.should == return_values[2]
       end
 
-      it "should keep returning last value in consecutive calls" do
+      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]
@@ -95,7 +95,7 @@ module RSpec
         @instance.msg.should == return_values[2]
       end
 
-      it "should revert to original instance method if there is one" do
+      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)
@@ -103,7 +103,7 @@ module RSpec
         @instance.existing_instance_method.should equal(:original_value)
       end
 
-      it "should revert to original private instance method if there is one" do
+      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)
@@ -111,7 +111,7 @@ module RSpec
         @instance.existing_instance_method.should equal(:original_value)
       end
 
-      it "should revert to original class method if there is one" do
+      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)
@@ -119,7 +119,7 @@ module RSpec
         @class.existing_class_method.should equal(:original_value)
       end
 
-      it "should revert to original private class method if there is one" do
+      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)
@@ -127,7 +127,7 @@ module RSpec
         @class.existing_class_method.should equal(:original_value)
       end
 
-      it "should yield a specified object" do
+      it "yields a specified object" do
         @instance.stub(:method_that_yields).and_yield(:yielded_obj)
         current_value = :value_before
         @instance.method_that_yields {|val| current_value = val}
@@ -135,7 +135,7 @@ module RSpec
         @instance.rspec_verify
       end
 
-      it "should yield multiple times with multiple calls to and_yield" do
+      it "yields multiple times with multiple calls to and_yield" do
         @instance.stub(:method_that_yields_multiple_times).and_yield(:yielded_value).
                                                        and_yield(:another_value)
         current_value = []
@@ -144,32 +144,32 @@ module RSpec
         @instance.rspec_verify
       end
       
-      it "should yield a specified object and return another specified object" do
+      it "yields a specified object and return another specified object" do
         yielded_obj = double("my mock")
         yielded_obj.should_receive(:foo).with(:bar)
         @instance.stub(:method_that_yields_and_returns).and_yield(yielded_obj).and_return(:baz)
         @instance.method_that_yields_and_returns { |o| o.foo :bar }.should == :baz
       end
 
-      it "should throw when told to" do
+      it "throws when told to" do
         @stub.stub(:something).and_throw(:up)
         lambda do
           @stub.something
         end.should throw_symbol(:up)
       end
       
-      it "should override a pre-existing method" do
+      it "overrides a pre-existing method" do
         @stub.stub(:existing_instance_method).and_return(:updated_stub_value)
         @stub.existing_instance_method.should == :updated_stub_value
       end
 
-      it "should override a pre-existing stub" do
+      it "overrides a pre-existing stub" do
         @stub.stub(:foo) { 'bar' }
         @stub.stub(:foo) { 'baz' }
         @stub.foo.should == 'baz'
       end
       
-      it "should limit " do
+      it "allows a stub and an expectation" do
         @stub.stub(:foo).with("bar")
         @stub.should_receive(:foo).with("baz")
         @stub.foo("bar")
@@ -189,32 +189,32 @@ module RSpec
         @stub.stub(:foo).with("bar")
       end
 
-      it "should not complain if not called" do
+      it "does not complain if not called" do
       end
 
-      it "should not complain if called with arg" do
+      it "does not complain if called with arg" do
         @stub.foo("bar")
       end
 
-      it "should complain if called with no arg" do
+      it "complains if called with no arg" do
         lambda do
           @stub.foo
         end.should raise_error
       end
 
-      it "should complain if called with other arg" do
+      it "complains if called with other arg" do
         lambda do
           @stub.foo("other")
         end.should raise_error
       end
 
-      it "should not complain if also mocked w/ different args" do
+      it "does not complain if also mocked w/ different args" do
         @stub.should_receive(:foo).with("baz")
         @stub.foo("bar")
         @stub.foo("baz")
       end
 
-      it "should complain if also mocked w/ different args AND called w/ a 3rd set of args" do
+      it "complains if also mocked w/ different args AND called w/ a 3rd set of args" do
         @stub.should_receive(:foo).with("baz")
         @stub.foo("bar")
         @stub.foo("baz")
@@ -223,7 +223,7 @@ module RSpec
         end.should raise_error
       end
       
-      it "should support options" do
+      it "supports options" do
         @stub.stub(:foo, :expected_from => "bar")
       end
     end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require 'rspec/expectations'
 
 module Macros
   def treats_method_missing_as_private(options = {:noop => true, :subject => nil})
-    it "should have method_missing as private" do
+    it "has method_missing as private" do
       with_ruby 1.8 do
         self.class.describes.private_instance_methods.should include("method_missing")
       end
@@ -13,7 +13,7 @@ module Macros
       end
     end
 
-    it "should not respond_to? method_missing (because it's private)" do
+    it "does not respond_to? method_missing (because it's private)" do
       formatter = options[:subject] || described_class.new({ }, StringIO.new)
       formatter.should_not respond_to(:method_missing)
     end

data/spec/support/macros.rb

@@ -1,6 +1,6 @@
 module Macros
   def treats_method_missing_as_private(options = {:noop => true, :subject => nil})
-    it "should have method_missing as private" do
+    it "has method_missing as private" do
       with_ruby 1.8 do
         described_class.private_instance_methods.should include("method_missing")
       end
@@ -9,7 +9,7 @@ module Macros
       end
     end
 
-    it "should not respond_to? method_missing (because it's private)" do
+    it "does not respond_to? method_missing (because it's private)" do
       formatter = options[:subject] || described_class.new({ }, StringIO.new)
       formatter.should_not respond_to(:method_missing)
     end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-mocks
 version: !ruby/object:Gem::Version 
-  hash: 62196421
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 19
-  version: 2.0.0.beta.19
+  - 20
+  version: 2.0.0.beta.20
 platform: ruby
 authors: 
 - David Chelimsky
@@ -18,45 +17,43 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-25 00:00:00 -05:00
+date: 2010-08-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
   name: rspec-core
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 62196421
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 19
-        version: 2.0.0.beta.19
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+        - 20
+        version: 2.0.0.beta.20
   type: :development
   prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec-expectations
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 62196421
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 19
-        version: 2.0.0.beta.19
-  requirement: *id002
+        - 20
+        version: 2.0.0.beta.20
+  type: :development
+  prerelease: false
+  version_requirements: *id002
 description: RSpec's 'test double' framework, with support for stubbing and mocking
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: []
@@ -151,13 +148,7 @@ has_rdoc: true
 homepage: http://github.com/rspec/mocks
 licenses: []
 
-post_install_message: |
-  **************************************************
-  
-    Thank you for installing rspec-mocks-2.0.0.beta.19
-    
-  **************************************************
-
+post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -167,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -4186066668250905798
       segments: 
       - 0
       version: "0"
@@ -176,7 +167,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
       segments: 
       - 1
       - 3
@@ -188,7 +178,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.0.0.beta.19
+summary: rspec-mocks-2.0.0.beta.20
 test_files: 
 - spec/rspec/mocks/and_yield_spec.rb
 - spec/rspec/mocks/any_number_of_times_spec.rb