rspec-mocks 2.13.1 → 2.14.0.rc1

data/spec/rspec/mocks/multiple_return_value_spec.rb

@@ -26,7 +26,7 @@ module RSpec
         expect(@double.do_something).to eq @return_values[0]
         expect(@double.do_something).to eq @return_values[1]
         expect(@double.do_something).to eq @return_values[2]
-        @double.rspec_verify
+        verify @double
       end
 
       it "falls back to a previously stubbed value" do
@@ -40,7 +40,7 @@ module RSpec
       it "fails when there are too few calls (if there is no stub)" do
         @double.do_something
         @double.do_something
-        expect { @double.rspec_verify }.to raise_error
+        expect { verify @double }.to raise_error
       end
 
       it "fails when there are too many calls (if there is no stub)" do
@@ -48,7 +48,7 @@ module RSpec
         @double.do_something
         @double.do_something
         @double.do_something
-        expect { @double.rspec_verify }.to raise_error
+        expect { verify @double }.to raise_error
       end
     end
 
@@ -63,7 +63,7 @@ module RSpec
         expect(@double.do_something).to eq @return_values[0]
         expect(@double.do_something).to eq @return_values[1]
         expect(@double.do_something).to eq @return_values[2]
-        @double.rspec_verify
+        verify @double
       end
     end
 
@@ -77,12 +77,12 @@ module RSpec
         expect(@double.do_something).to equal(11)
         expect(@double.do_something).to equal(22)
         expect(@double.do_something).to equal(22)
-        @double.rspec_verify
+        verify @double
       end
 
       it "fails when called less than the specified number" do
         expect(@double.do_something).to equal(11)
-        expect { @double.rspec_verify }.to raise_error(RSpec::Mocks::MockExpectationError)
+        expect { verify @double }.to raise_error(RSpec::Mocks::MockExpectationError)
       end
 
       context "when method is stubbed too" do
@@ -92,12 +92,12 @@ module RSpec
           expect(@double.do_something).to equal(11)
           expect(@double.do_something).to equal(22)
           expect(@double.do_something).to equal(22)
-          @double.rspec_verify
+          verify @double
         end
 
         it "fails when called less than the specified number" do
           expect(@double.do_something).to equal(11)
-          expect { @double.rspec_verify }.to raise_error(RSpec::Mocks::MockExpectationError)
+          expect { verify @double }.to raise_error(RSpec::Mocks::MockExpectationError)
         end
       end
     end
@@ -112,13 +112,13 @@ module RSpec
         expect(@double.do_something).to equal(11)
         expect(@double.do_something).to equal(22)
         expect(@double.do_something).to equal(22)
-        @double.rspec_verify
+        verify @double
       end
 
       it "fails when called less than the specified number" do
         @double.do_something
         @double.do_something
-        expect { @double.rspec_verify }.to raise_error
+        expect { verify @double }.to raise_error
       end
 
       it "fails fast when called greater than the specified number" do

data/spec/rspec/mocks/mutate_const_spec.rb

@@ -12,6 +12,13 @@ class TestClass
   end
 end
 
+class TestClassThatDefinesSend
+  C = :c
+
+  def self.send
+  end
+end
+
 class TestSubClass < TestClass
   P = :p
 end
@@ -46,7 +53,7 @@ module RSpec
         after { change_const_value_to(original_const_value) }
 
         def change_const_value_to(value)
-          parent_const.send(:remove_const, last_const_part)
+          parent_const.__send__(:remove_const, last_const_part)
           parent_const.const_set(last_const_part, value)
         end
 
@@ -143,6 +150,11 @@ module RSpec
       end
 
       describe "#hide_const" do
+        context "for a loaded constant nested in a module that redefines `send`" do
+          it_behaves_like "loaded constant hiding", "TestClassThatDefinesSend::C"
+        end
+
+
         context 'for a loaded nested constant' do
           it_behaves_like "loaded constant hiding", "TestClass::Nested"
         end
@@ -205,6 +217,10 @@ module RSpec
       end
 
       describe "#stub_const" do
+        context "for a loaded constant nested in a module that redefines `send`" do
+          it_behaves_like "loaded constant stubbing", "TestClassThatDefinesSend::C"
+        end
+
         context 'for a loaded unnested constant' do
           it_behaves_like "loaded constant stubbing", "TestClass"
 
@@ -309,6 +325,10 @@ module RSpec
           it_behaves_like 'unloaded constant stubbing', "::SomeUndefinedConst"
         end
 
+        context "for an unloaded constant nested in a module that redefines `send`" do
+          it_behaves_like 'unloaded constant stubbing', "TestClassThatDefinesSend::SomeUndefinedConst"
+        end
+
         context 'for an unloaded constant with nested name that matches a top-level constant' do
           it_behaves_like "unloaded constant stubbing", "TestClass::Hash"
         end

data/spec/rspec/mocks/nil_expectation_warning_spec.rb

@@ -43,18 +43,24 @@ module RSpec
     end
 
     describe "#allow_message_expectations_on_nil" do
-      it "does not effect subsequent examples" do
-        example_group = empty_example_group
+      it "does not affect subsequent examples" do
+        example_group = ::RSpec::Core::ExampleGroup.describe
+        reporter      = ::RSpec.configuration.reporter
         example_group.it("when called in one example that doesn't end up setting an expectation on nil") do
                         allow_message_expectations_on_nil
                       end
-        example_group.it("should not effect the next exapmle ran") do
+        example_group.it("should not effect the next example ran") do
                         Kernel.should_receive(:warn)
                         nil.should_receive(:foo)
                         nil.foo
                       end
 
-        example_group
+        expect(example_group.run reporter).to eq true
+      end
+
+      it 'doesnt error when marshalled' do
+        allow_message_expectations_on_nil
+        expect(Marshal.dump(nil)).to eq Marshal.dump_without_mocks(nil)
       end
     end
   end

data/spec/rspec/mocks/null_object_mock_spec.rb

@@ -60,13 +60,13 @@ module RSpec
       it "fails verification when explicit exception not met" do
         expect {
           @double.should_receive(:something)
-          @double.rspec_verify
+          verify @double
         }.to raise_error(RSpec::Mocks::MockExpectationError)
       end
 
       it "ignores unexpected methods" do
         @double.random_call("a", "d", "c")
-        @double.rspec_verify
+        verify @double
       end
 
       it "allows expected message with different args first" do
@@ -103,5 +103,14 @@ module RSpec
         expect(obj).not_to be_null_object
       end
     end
+
+    describe "when using the :expect syntax" do
+      include_context "with syntax", :expect
+
+      it 'still supports null object doubles' do
+        obj = double("foo").as_null_object
+        expect(obj.foo.bar.bazz).to be(obj)
+      end
+    end
   end
 end

data/spec/rspec/mocks/once_counts_spec.rb

@@ -10,19 +10,19 @@ module RSpec
       it "passes when called once" do
         @double.should_receive(:do_something).once
         @double.do_something
-        @double.rspec_verify
+        verify @double
       end
 
       it "passes when called once with specified args" do
         @double.should_receive(:do_something).once.with("a", "b", "c")
         @double.do_something("a", "b", "c")
-        @double.rspec_verify
+        verify @double
       end
 
       it "passes when called once with unspecified args" do
         @double.should_receive(:do_something).once
         @double.do_something("a", "b", "c")
-        @double.rspec_verify
+        verify @double
       end
 
       it "fails when called with wrong args" do
@@ -30,7 +30,7 @@ module RSpec
         expect {
           @double.do_something("d", "e", "f")
         }.to raise_error(RSpec::Mocks::MockExpectationError)
-        @double.rspec_reset
+        reset @double
       end
 
       it "fails fast when called twice" do
@@ -44,7 +44,7 @@ module RSpec
       it "fails when not called" do
         @double.should_receive(:do_something).once
         expect {
-          @double.rspec_verify
+          verify @double
         }.to raise_error(RSpec::Mocks::MockExpectationError)
       end
     end

data/spec/rspec/mocks/options_hash_spec.rb

@@ -7,10 +7,10 @@ module RSpec
         begin
           mock = RSpec::Mocks::Mock.new("a mock")
           mock.should_receive(:message, :expected_from => "/path/to/blah.ext:37")
-          mock.rspec_verify
+          verify mock
         rescue Exception => e
         ensure
-          expect(e.backtrace.to_s).to match /\/path\/to\/blah.ext:37/m
+          expect(e.backtrace.to_s).to match(/\/path\/to\/blah.ext:37/m)
         end
       end
 
@@ -18,7 +18,7 @@ module RSpec
         expect {
           m = RSpec::Mocks::Mock.new("a mock")
           m.should_receive(:message, :message => "recebi nada")
-          m.rspec_verify
+          verify m
         }.to raise_error("recebi nada")
       end
 
@@ -27,7 +27,7 @@ module RSpec
           m = RSpec::Mocks::Mock.new("a mock")
           m.stub(:message)
           m.should_receive(:message, :message => "from mock")
-          m.rspec_verify
+          verify m
         }.to raise_error("from mock")
       end
     end

data/spec/rspec/mocks/partial_mock_spec.rb

@@ -8,14 +8,14 @@ module RSpec
       it "names the class in the failure message" do
         object.should_receive(:foo)
         expect do
-          object.rspec_verify
+          verify object
         end.to raise_error(RSpec::Mocks::MockExpectationError, /\(#<Object:.*>\).foo/)
       end
 
       it "names the class in the failure message when expectation is on class" do
         Object.should_receive(:foo)
         expect {
-          Object.rspec_verify
+          verify Object
         }.to raise_error(RSpec::Mocks::MockExpectationError, /<Object \(class\)>/)
       end
 
@@ -31,7 +31,7 @@ module RSpec
           object.fuhbar
         }.to raise_error(
           RSpec::Mocks::MockExpectationError,
-          /expected\: 0 times\n    received\: 1 time/
+          /expected\: 0 times with any arguments\n    received\: 1 time/
         )
       end
 
@@ -63,7 +63,7 @@ module RSpec
       it "should_receive verifies method was called" do
         object.should_receive(:foobar).with(:test_param).and_return(1)
         expect {
-          object.rspec_verify
+          verify object
         }.to raise_error(RSpec::Mocks::MockExpectationError)
       end
 
@@ -85,10 +85,10 @@ module RSpec
         _nil = nil
         _nil.should_receive(:foobar)
         expect {
-          _nil.rspec_verify
+          verify _nil
         }.to raise_error(
           RSpec::Mocks::MockExpectationError,
-          %Q|(nil).foobar(any args)\n    expected: 1 time\n    received: 0 times|
+          %Q|(nil).foobar(any args)\n    expected: 1 time with any arguments\n    received: 0 times with any arguments|
         )
       end
 
@@ -125,17 +125,26 @@ module RSpec
         end
       end
 
-      let(:instance) { proxy_class.new(Object.new) }
+      let(:wrapped_object) { Object.new }
+      let(:proxy) { proxy_class.new(wrapped_object) }
 
       it 'works properly' do
-        instance.should_receive(:proxied?).and_return(false)
-        expect(instance).not_to be_proxied
+        proxy.should_receive(:proxied?).and_return(false)
+        expect(proxy).not_to be_proxied
+      end
+
+      it 'does not confuse the proxy and the proxied object' do
+        proxy.stub(:foo).and_return(:proxy_foo)
+        wrapped_object.stub(:foo).and_return(:wrapped_foo)
+
+        expect(proxy.foo).to eq(:proxy_foo)
+        expect(wrapped_object.foo).to eq(:wrapped_foo)
       end
     end
 
     describe "Partially mocking an object that defines ==, after another mock has been defined" do
       before(:each) do
-        stub("existing mock", :foo => :foo)
+        double("existing mock", :foo => :foo)
       end
 
       let(:klass) do
@@ -153,7 +162,7 @@ module RSpec
 
       it "does not raise an error when stubbing the object" do
         o = klass.new :foo
-        expect { o.stub(:bar) }.not_to raise_error(NoMethodError)
+        expect { o.stub(:bar) }.not_to raise_error
       end
     end
 

data/spec/rspec/mocks/partial_mock_using_mocks_directly_spec.rb

@@ -31,7 +31,7 @@ module RSpec::Mocks
     # specify "should clear expectations on verify" do
     #     obj.should_receive(:msg)
     #     obj.msg
-    #     obj.rspec_verify
+    #     verify obj
     #     expect {
     #       obj.msg
     #     }.to raise_error(NoMethodError)
@@ -40,7 +40,7 @@ module RSpec::Mocks
     it "fails when expected message is not received" do
       obj.should_receive(:msg)
       expect {
-        obj.rspec_verify
+        verify obj
       }.to raise_error(RSpec::Mocks::MockExpectationError)
     end
 
@@ -55,20 +55,20 @@ module RSpec::Mocks
     it "passes when expected message is received" do
       obj.should_receive(:msg)
       obj.msg
-      obj.rspec_verify
+      verify obj
     end
 
     it "passes when message is received with correct args" do
       obj.should_receive(:msg).with(:correct_arg)
       obj.msg(:correct_arg)
-      obj.rspec_verify
+      verify obj
     end
 
     it "restores the original method if it existed" do
       expect(obj.existing_method).to equal(:original_value)
       obj.should_receive(:existing_method).and_return(:mock_value)
       expect(obj.existing_method).to equal(:mock_value)
-      obj.rspec_verify
+      verify obj
       expect(obj.existing_method).to equal(:original_value)
     end
 
@@ -77,7 +77,7 @@ module RSpec::Mocks
         expect(obj.captured_by_method_missing).to eq("response generated by method missing")
         obj.stub(:captured_by_method_missing) { "foo" }
         expect(obj.captured_by_method_missing).to eq("foo")
-        obj.rspec_reset
+        reset obj
         expect(obj.captured_by_method_missing).to eq("response generated by method missing")
       end
     end
@@ -87,7 +87,7 @@ module RSpec::Mocks
         expect(klass.captured_by_method_missing).to eq("response generated by method missing")
         klass.stub(:captured_by_method_missing) { "foo" }
         expect(klass.captured_by_method_missing).to eq("foo")
-        klass.rspec_reset
+        reset klass
         expect(klass.captured_by_method_missing).to eq("response generated by method missing")
       end
     end

data/spec/rspec/mocks/passing_argument_matchers_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 module RSpec
   module Mocks
-    describe Methods do
+    describe "Passing argument matchers" do
       before(:each) do
         @double = double('double')
         Kernel.stub(:warn)
       end
 
       after(:each) do
-        @double.rspec_verify
+        verify @double
       end
 
       context "handling argument matchers" do

data/spec/rspec/mocks/precise_counts_spec.rb

@@ -12,7 +12,7 @@ module RSpec
         @double.do_something
         @double.do_something
         expect {
-          @double.rspec_verify
+          verify @double
         }.to raise_error(RSpec::Mocks::MockExpectationError)
       end
 
@@ -29,7 +29,7 @@ module RSpec
       it "fails when exactly n times method is never called" do
         @double.should_receive(:do_something).exactly(3).times
         expect {
-          @double.rspec_verify
+          verify @double
         }.to raise_error(RSpec::Mocks::MockExpectationError)
       end
 
@@ -38,13 +38,13 @@ module RSpec
         @double.do_something
         @double.do_something
         @double.do_something
-        @double.rspec_verify
+        verify @double
       end
 
       it "returns the value given by a block when the exactly once method is called" do
         @double.should_receive(:to_s).exactly(:once) { "testing" }
         expect(@double.to_s).to eq "testing"
-        @double.rspec_verify
+        verify @double
       end
 
       it "passes mutiple calls with different args" do
@@ -52,7 +52,7 @@ module RSpec
         @double.should_receive(:do_something).once.with(2)
         @double.do_something(1)
         @double.do_something(2)
-        @double.rspec_verify
+        verify @double
       end
 
       it "passes multiple calls with different args and counts" do
@@ -61,7 +61,7 @@ module RSpec
         @double.do_something(1)
         @double.do_something(2)
         @double.do_something(1)
-        @double.rspec_verify
+        verify @double
       end
     end
   end