rspec-mocks 2.0.0.beta.4 → 2.0.0.beta.5

data/spec/rspec/mocks/multiple_return_value_spec.rb

@@ -20,7 +20,10 @@ module Rspec
         third = Object.new
         @mock.message.should == @return_values[0]
         @mock.message.should == @return_values[1]
-        lambda { @mock.rspec_verify }.should raise_error(Rspec::Mocks::MockExpectationError, "Mock 'mock' expected :message with (any args) 3 times, but received it twice")
+        expect { @mock.rspec_verify }.to raise_error(
+          Rspec::Mocks::MockExpectationError, 
+          %Q|(Mock "mock").message(any args)\n    expected: 3 times\n    received: 2 times|
+        )
       end
 
       it "should complain when there are too many calls" do
@@ -29,7 +32,10 @@ module Rspec
         @mock.message.should == @return_values[1]
         @mock.message.should == @return_values[2]
         @mock.message.should == @return_values[2]
-        lambda { @mock.rspec_verify }.should raise_error(Rspec::Mocks::MockExpectationError, "Mock 'mock' expected :message with (any args) 3 times, but received it 4 times")
+        expect { @mock.rspec_verify }.to raise_error(
+          Rspec::Mocks::MockExpectationError, 
+          %Q|(Mock "mock").message(any args)\n    expected: 3 times\n    received: 4 times|
+        )
       end
     end
 
@@ -51,7 +57,10 @@ module Rspec
         third = Object.new
         @mock.message.should == @return_values[0]
         @mock.message.should == @return_values[1]
-        lambda { @mock.rspec_verify }.should raise_error(Rspec::Mocks::MockExpectationError, "Mock 'mock' expected :message with (any args) 3 times, but received it twice")
+        expect { @mock.rspec_verify }.to raise_error(
+          Rspec::Mocks::MockExpectationError, 
+          %Q|(Mock "mock").message(any args)\n    expected: 3 times\n    received: 2 times|
+        )
       end
 
       it "should complain when there are too many calls" do
@@ -60,7 +69,10 @@ module Rspec
         @mock.message.should == @return_values[1]
         @mock.message.should == @return_values[2]
         @mock.message.should == @return_values[2]
-        lambda { @mock.rspec_verify }.should raise_error(Rspec::Mocks::MockExpectationError, "Mock 'mock' expected :message with (any args) 3 times, but received it 4 times")
+        expect { @mock.rspec_verify }.to raise_error(
+          Rspec::Mocks::MockExpectationError, 
+          %Q|(Mock "mock").message(any args)\n    expected: 3 times\n    received: 4 times|
+        )
       end
     end
 
@@ -79,9 +91,13 @@ module Rspec
 
       it "should fail when called less than the specified number" do
         @mock.message.should equal(11)
-        lambda { @mock.rspec_verify }.should raise_error(Rspec::Mocks::MockExpectationError, "Mock 'mock' expected :message with (no args) twice, but received it once")
+        expect { @mock.rspec_verify }.to raise_error(
+          Rspec::Mocks::MockExpectationError, 
+          %Q|(Mock "mock").message(no args)\n    expected: 2 times\n    received: 1 time|
+        )
       end
     end
+
     describe "a Mock expectation with multiple return values with a specified count larger than the number of values" do
       before(:each) do
         @mock = Rspec::Mocks::Mock.new("mock")
@@ -97,7 +113,10 @@ module Rspec
 
       it "should fail when called less than the specified number" do
         @mock.message.should equal(11)
-        lambda { @mock.rspec_verify }.should raise_error(Rspec::Mocks::MockExpectationError, "Mock 'mock' expected :message with (any args) 3 times, but received it once")
+        expect { @mock.rspec_verify }.to raise_error(
+          Rspec::Mocks::MockExpectationError, 
+          %Q|(Mock "mock").message(any args)\n    expected: 3 times\n    received: 1 time|
+        )
       end
 
       it "should fail when called greater than the specified number" do
@@ -105,7 +124,10 @@ module Rspec
         @mock.message.should equal(22)
         @mock.message.should equal(22)
         @mock.message.should equal(22)
-        lambda { @mock.rspec_verify }.should raise_error(Rspec::Mocks::MockExpectationError, "Mock 'mock' expected :message with (any args) 3 times, but received it 4 times")
+        expect { @mock.rspec_verify }.to raise_error(
+          Rspec::Mocks::MockExpectationError, 
+          %Q|(Mock "mock").message(any args)\n    expected: 3 times\n    received: 4 times|
+        )
       end
     end
   end

data/spec/rspec/mocks/nil_expectation_warning_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-      def remove_last_describe_from_world
-        Rspec::Core.world.example_groups.pop
-      end
-      
-      def empty_example_group
-        group = Rspec::Core::ExampleGroup.describe(Object, 'Empty Behaviour Group') { }
-        remove_last_describe_from_world
-      end
+def remove_last_describe_from_world
+  Rspec::Core.world.example_groups.pop
+end
+
+def empty_example_group
+  group = Rspec::Core::ExampleGroup.describe(Object, 'Empty Behaviour Group') { }
+  remove_last_describe_from_world
+end
 
 module Rspec
   module Mocks

data/spec/rspec/mocks/null_object_mock_spec.rb

@@ -39,14 +39,14 @@ module Rspec
 
     describe "#null_object?" do
       it "should default to false" do
-        obj = mock('anything')
+        obj = double('anything')
         obj.should_not be_null_object
       end
     end
     
     describe "#as_null_object" do
       it "should set the object to null_object" do
-        obj = mock('anything').as_null_object
+        obj = double('anything').as_null_object
         obj.should be_null_object
       end
     end

data/spec/rspec/mocks/once_counts_spec.rb

@@ -4,7 +4,7 @@ module Rspec
   module Mocks
     describe "OnceCounts" do
       before(:each) do
-        @mock = mock("test mock")
+        @mock = double("test mock")
       end
 
       it "once should fail when called once with wrong args" do

data/spec/rspec/mocks/options_hash_spec.rb

@@ -25,7 +25,7 @@ module Rspec
       it "should use the message supplied with :message after a similar stub" do
         lambda {
           m = Rspec::Mocks::Mock.new("a mock")
-          m.stub!(:message)
+          m.stub(:message)
           m.should_receive(:message, :message => "from mock")
           m.rspec_verify
         }.should raise_error("from mock")

data/spec/rspec/mocks/partial_mock_spec.rb

@@ -9,9 +9,9 @@ module Rspec
     
       it "should name the class in the failure message" do
         @object.should_receive(:foo)
-        lambda do
+        expect do
           @object.rspec_verify
-        end.should raise_error(Rspec::Mocks::MockExpectationError, /<Object:.*> expected/)
+        end.to raise_error(Rspec::Mocks::MockExpectationError, /\(#<Object:.*>\).foo/)
       end
     
       it "should name the class in the failure message when expectation is on class" do
@@ -29,9 +29,12 @@ module Rspec
             
       it "should_not_receive should mock out the method" do
         @object.should_not_receive(:fuhbar)
-        lambda do
+        expect {
           @object.fuhbar
-        end.should raise_error(Rspec::Mocks::MockExpectationError, /<Object:.*> expected :fuhbar with \(no args\) 0 times/)
+        }.to raise_error(
+          Rspec::Mocks::MockExpectationError, 
+          /expected\: 0 times\n    received\: 1 time/
+        )
       end
     
       it "should_not_receive should return a negative message expectation" do
@@ -82,9 +85,12 @@ module Rspec
         allow_message_expectations_on_nil
         
         @this_will_resolve_to_nil.should_receive(:foobar)
-        lambda do
+        expect {
           @this_will_resolve_to_nil.rspec_verify
-        end.should raise_error(Rspec::Mocks::MockExpectationError, /nil expected :foobar with/)
+        }.to raise_error(
+          Rspec::Mocks::MockExpectationError, 
+          %Q|(nil).foobar(any args)\n    expected: 1 time\n    received: 0 times|
+        )
       end
     end
     
@@ -106,7 +112,7 @@ module Rspec
       
       it "should not raise an error when stubbing the object" do
         o = PartiallyMockedEquals.new :foo
-        lambda { o.stub!(:bar) }.should_not raise_error(NoMethodError)
+        lambda { o.stub(:bar) }.should_not raise_error(NoMethodError)
       end
     end
 

data/spec/rspec/mocks/passing_argument_matchers_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 def include_mock_argument_matchers
   before(:each) do
     @mock = Rspec::Mocks::Mock.new("test mock")
-    Kernel.stub!(:warn)
+    Kernel.stub(:warn)
   end
   
   after(:each) do

data/spec/rspec/mocks/precise_counts_spec.rb

@@ -4,7 +4,7 @@ module Rspec
   module Mocks
     describe "PreciseCounts" do
       before(:each) do
-        @mock = mock("test mock")
+        @mock = double("test mock")
       end
 
       it "should fail when exactly n times method is called less than n times" do

data/spec/rspec/mocks/record_messages_spec.rb

@@ -4,7 +4,7 @@ module Rspec
   module Mocks
     describe "a mock" do
       before(:each) do
-        @mock = mock("mock", :null_object => true)
+        @mock = double("mock", :null_object => true)
       end
       it "should answer false for received_message? when no messages received" do
         @mock.received_message?(:message).should be_false

data/spec/rspec/mocks/stub_spec.rb

@@ -28,7 +28,7 @@ module Rspec
       end
 
       it "should ignore when expected message is received" do
-        @instance.stub!(:msg)
+        @instance.stub(:msg)
         @instance.msg
         lambda do
           @instance.rspec_verify
@@ -36,7 +36,7 @@ module Rspec
       end
 
       it "should ignore when message is received with args" do
-        @instance.stub!(:msg)
+        @instance.stub(:msg)
         @instance.msg(:an_arg)
         lambda do
           @instance.rspec_verify
@@ -44,20 +44,20 @@ module Rspec
       end
 
       it "should ignore when expected message is not received" do
-        @instance.stub!(:msg)
+        @instance.stub(:msg)
         lambda do
           @instance.rspec_verify
         end.should_not raise_error
       end
 
       it "should handle multiple stubbed methods" do
-        @instance.stub!(:msg1 => 1, :msg2 => 2)
+        @instance.stub(:msg1 => 1, :msg2 => 2)
         @instance.msg1.should == 1
         @instance.msg2.should == 2
       end
       
       it "should clear itself when verified" do
-        @instance.stub!(:this_should_go).and_return(:blah)
+        @instance.stub(:this_should_go).and_return(:blah)
         @instance.this_should_go.should == :blah
         @instance.rspec_verify
         lambda do
@@ -67,7 +67,7 @@ module Rspec
 
       it "should return values in order to consecutive calls" do
         return_values = ["1",2,Object.new]
-        @instance.stub!(:msg).and_return(return_values[0],return_values[1],return_values[2])
+        @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]
@@ -75,7 +75,7 @@ module Rspec
 
       it "should keep 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.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]
@@ -85,7 +85,7 @@ module Rspec
 
       it "should revert 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.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)
@@ -93,14 +93,14 @@ module Rspec
       
       it "should revert 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.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)
       end
 
       it "should yield a specified object" do
-        @instance.stub!(:method_that_yields).and_yield(:yielded_obj)
+        @instance.stub(:method_that_yields).and_yield(:yielded_obj)
         current_value = :value_before
         @instance.method_that_yields {|val| current_value = val}
         current_value.should == :yielded_obj
@@ -108,7 +108,7 @@ module Rspec
       end
 
       it "should yield multiple times with multiple calls to and_yield" do
-        @instance.stub!(:method_that_yields_multiple_times).and_yield(:yielded_value).
+        @instance.stub(:method_that_yields_multiple_times).and_yield(:yielded_value).
                                                        and_yield(:another_value)
         current_value = []
         @instance.method_that_yields_multiple_times {|val| current_value << val}
@@ -117,42 +117,42 @@ module Rspec
       end
       
       it "should yield a specified object and return another specified object" do
-        yielded_obj = mock("my mock")
+        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.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
-        @mock.stub!(:something).and_throw(:up)
+        @stub.stub(:something).and_throw(:up)
         lambda do
-          @mock.something
+          @stub.something
         end.should throw_symbol(:up)
       end
       
       it "should override a pre-existing stub" do
-        @stub.stub!(:existing_instance_method).and_return(:updated_stub_value)
+        @stub.stub(:existing_instance_method).and_return(:updated_stub_value)
         @stub.existing_instance_method.should == :updated_stub_value
       end
       
       it "should limit " do
-        @stub.stub!(:foo).with("bar")
+        @stub.stub(:foo).with("bar")
         @stub.should_receive(:foo).with("baz")
         @stub.foo("bar")
         @stub.foo("baz")
       end
 
       it "calculates return value by executing block passed to #and_return" do
-        @mock.stub!(:something).with("a","b","c").and_return { |a,b,c| c+b+a }
-        @mock.something("a","b","c").should == "cba"
-        @mock.rspec_verify
+        @stub.stub(:something).with("a","b","c").and_return { |a,b,c| c+b+a }
+        @stub.something("a","b","c").should == "cba"
+        @stub.rspec_verify
       end
     end
     
     describe "A method stub with args" do
       before(:each) do
         @stub = Object.new
-        @stub.stub!(:foo).with("bar")
+        @stub.stub(:foo).with("bar")
       end
 
       it "should not complain if not called" do
@@ -190,7 +190,7 @@ module Rspec
       end
       
       it "should support options" do
-        @stub.stub!(:foo, :expected_from => "bar")
+        @stub.stub(:foo, :expected_from => "bar")
       end
     end
 

data/spec/rspec/mocks/stubbed_message_expectations_spec.rb

@@ -4,23 +4,23 @@ module Rspec
   module Mocks
     describe "Example with stubbed and then called message" do
       it "fails if the message is expected and then subsequently not called again" do
-        mock_obj = mock("mock", :msg => nil)
-        mock_obj.msg
-        mock_obj.should_receive(:msg)
-        lambda { mock_obj.rspec_verify }.should raise_error(Rspec::Mocks::MockExpectationError)
+        double = double("mock", :msg => nil)
+        double.msg
+        double.should_receive(:msg)
+        lambda { double.rspec_verify }.should raise_error(Rspec::Mocks::MockExpectationError)
       end
 
       it "outputs arguments of all similar calls" do
-        m = mock('mock', :foo => true)
-        m.should_receive(:foo).with('first')
-        m.foo('second')
-        m.foo('third')
+        double = double('double', :foo => true)
+        double.should_receive(:foo).with('first')
+        double.foo('second')
+        double.foo('third')
         lambda do
-          m.rspec_verify
-        end.should raise_error(%q|Mock 'mock' expected :foo with ("first") but received it with (["second"], ["third"])|)
-        m.rspec_reset
+          double.rspec_verify
+        end.should raise_error(%Q|Double "double" received :foo with unexpected arguments\n  expected: ("first")\n       got: ("second"), ("third")|)
+        double.rspec_reset
       end
     end
     
   end
-end
+end

data/spec/rspec/mocks/twice_counts_spec.rb

@@ -4,7 +4,7 @@ module Rspec
   module Mocks
     describe "TwiceCounts" do
       before(:each) do
-        @mock = mock("test mock")
+        @mock = double("test mock")
       end
 
       it "twice should fail when call count is higher than expected" do

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 4
-  version: 2.0.0.beta.4
+  - 5
+  version: 2.0.0.beta.5
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 -05:00
+date: 2010-04-04 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,8 +32,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 4
-        version: 2.0.0.beta.4
+        - 5
+        version: 2.0.0.beta.5
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -48,8 +48,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 4
-        version: 2.0.0.beta.4
+        - 5
+        version: 2.0.0.beta.5
   type: :development
   version_requirements: *id002
 description: Rspec's 'test double' framework, with support for stubbing and mocking
@@ -72,6 +72,7 @@ files:
 - cucumber.yml
 - features/mocks/block_local_expectations.feature
 - features/mocks/mix_stubs_and_mocks.feature
+- features/mocks/warn_when_expectation_is_set_on_nil.feature
 - features/stubs/stub_implementation.feature
 - features/support/env.rb
 - lib/rspec/mocks.rb
@@ -84,6 +85,7 @@ files:
 - lib/rspec/mocks/extensions/object.rb
 - lib/rspec/mocks/framework.rb
 - lib/rspec/mocks/message_expectation.rb
+- lib/rspec/mocks/method_double.rb
 - lib/rspec/mocks/methods.rb
 - lib/rspec/mocks/mock.rb
 - lib/rspec/mocks/order_group.rb
@@ -111,6 +113,7 @@ files:
 - 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
 - spec/rspec/mocks/failing_argument_matchers_spec.rb
 - spec/rspec/mocks/hash_including_matcher_spec.rb
 - spec/rspec/mocks/hash_not_including_matcher_spec.rb
@@ -142,7 +145,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-mocks-2.0.0.beta.4
+    Thank you for installing rspec-mocks-2.0.0.beta.5
   
     This is beta software. If you are looking
     for a supported production release, please
@@ -176,7 +179,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.0.0.beta.4
+summary: rspec-mocks-2.0.0.beta.5
 test_files: 
 - spec/rspec/mocks/and_yield_spec.rb
 - spec/rspec/mocks/any_number_of_times_spec.rb
@@ -196,6 +199,7 @@ test_files:
 - 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
 - spec/rspec/mocks/failing_argument_matchers_spec.rb
 - spec/rspec/mocks/hash_including_matcher_spec.rb
 - spec/rspec/mocks/hash_not_including_matcher_spec.rb