rspec-mocks 2.13.1 → 2.14.0.rc1

data/lib/rspec/mocks/test_double.rb

@@ -4,8 +4,6 @@ module RSpec
     # includes this module, and it is provided for cases where you want a
     # pure test double without subclassing RSpec::Mocks::Mock.
     module TestDouble
-      include Methods
-
       # Extends the TestDouble module onto the given object and
       # initializes it as a test double.
       #
@@ -25,6 +23,18 @@ module RSpec
         __initialize_as_test_double(name, stubs_and_options)
       end
 
+      # Tells the object to respond to all messages. If specific stub values
+      # are declared, they'll work as expected. If not, the receiver is
+      # returned.
+      def as_null_object
+        __mock_proxy.as_null_object
+      end
+
+      # Returns true if this object has received `as_null_object`
+      def null_object?
+        __mock_proxy.null_object?
+      end
+
       # This allows for comparing the mock to other objects that proxy such as
       # ActiveRecords belongs_to proxy objects. By making the other object run
       # the comparison, we're sure the call gets delegated to the proxy
@@ -50,6 +60,11 @@ module RSpec
         __mock_proxy.null_object? && message != :to_ary ? true : super
       end
 
+      # @private
+      def __build_mock_proxy
+        Proxy.new(self, @name, @options)
+      end
+
     private
 
       def __initialize_as_test_double(name=nil, stubs_and_options={})
@@ -64,7 +79,7 @@ module RSpec
       end
 
       def method_missing(message, *args, &block)
-        raise NoMethodError if message == :to_ary
+        raise NoMethodError if message == :to_ary || message == :to_a
         return 0 if message == :to_int && __mock_proxy.null_object?
         __mock_proxy.record_message_received(message, *args, &block)
 
@@ -78,7 +93,7 @@ module RSpec
       def extract_options(stubs_and_options)
         if stubs_and_options[:null_object]
           @null_object = stubs_and_options.delete(:null_object)
-          RSpec.deprecate(%Q["double('name', :null_object => true)"], %Q["double('name').as_null_object"])
+          RSpec.deprecate("double('name', :null_object => true)", :replacement => "double('name').as_null_object")
         end
         options = {}
         extract_option(stubs_and_options, options, :__declared_as, 'Mock')
@@ -98,6 +113,12 @@ module RSpec
           stub(message).and_return(response)
         end
       end
+
+    private
+
+      def __mock_proxy
+        ::RSpec::Mocks.proxy_for(self)
+      end
     end
   end
 end

data/lib/rspec/mocks/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Mocks
     module Version
-      STRING = '2.13.1'
+      STRING = '2.14.0.rc1'
     end
   end
 end

data/lib/spec/mocks.rb

@@ -1,6 +1,4 @@
 # For backward compatibility with rspec-1
 require 'rspec/mocks'
 
-RSpec::Mocks.warn_deprecation "\nDEPRECATION: `require 'spec/mocks' " +
- " is deprecated. Please require 'rspec/mocks' instead."
-
+RSpec.deprecate "require 'spec/mocks'", :replacement => "require 'rspec/mocks'"

data/spec/rspec/mocks/and_call_original_spec.rb

@@ -32,6 +32,14 @@ describe "and_call_original" do
       expect(value).to eq([:submitted_arg, :additional_yielded_arg])
     end
 
+    it 'errors when you pass through the wrong number of args' do
+      instance.stub(:meth_1).and_call_original
+      instance.stub(:meth_2).and_call_original
+      expect { instance.meth_1 :a }.to raise_error ArgumentError
+      expect { instance.meth_2 {} }.to raise_error ArgumentError
+      expect { instance.meth_2(:a, :b) {}  }.to raise_error ArgumentError
+    end
+
     context "for singleton methods" do
       it 'works' do
         def instance.foo; :bar; end

data/spec/rspec/mocks/and_yield_spec.rb

@@ -62,7 +62,7 @@ describe RSpec::Mocks::Mock do
             foo
           end
 
-          configured_eval_context.rspec_verify
+          verify configured_eval_context
         end
 
         it "fails when expectations set on the eval context are not met" do
@@ -76,7 +76,7 @@ describe RSpec::Mocks::Mock do
             # foo is not called here
           end
 
-          expect { configured_eval_context.rspec_verify }.to raise_error(RSpec::Mocks::MockExpectationError)
+          expect { verify configured_eval_context }.to raise_error(RSpec::Mocks::MockExpectationError)
         end
 
       end
@@ -97,8 +97,8 @@ describe RSpec::Mocks::Mock do
             foo
           end
 
-          configured_eval_context.rspec_verify
-          yielded_arg.rspec_verify
+          verify configured_eval_context
+          verify yielded_arg
         end
 
         it "fails when expectations set on the eval context and yielded arguments are not met" do
@@ -115,8 +115,8 @@ describe RSpec::Mocks::Mock do
             # foo is not called here
           end
 
-          expect { configured_eval_context.rspec_verify }.to raise_error(RSpec::Mocks::MockExpectationError)
-          expect { yielded_arg.rspec_verify }.to raise_error(RSpec::Mocks::MockExpectationError)
+          expect { verify configured_eval_context }.to raise_error(RSpec::Mocks::MockExpectationError)
+          expect { verify yielded_arg }.to raise_error(RSpec::Mocks::MockExpectationError)
         end
 
       end

data/spec/rspec/mocks/any_instance_spec.rb

@@ -108,6 +108,13 @@ module RSpec
             klass.any_instance.stub(:foo).and_return(result = Object.new)
             expect(instance.foo).to eq(result)
           end
+
+          it 'handles freeze and duplication correctly' do
+            String.any_instance.stub(:any_method)
+
+            foo = 'foo'.freeze
+            expect(foo.dup.concat 'bar').to eq 'foobar'
+          end
         end
 
         context "with argument matching" do
@@ -317,7 +324,7 @@ module RSpec
             klass.any_instance.should_receive(:foo)
             klass.any_instance.should_not_receive(:bar)
             klass.new.foo
-            klass.rspec_verify
+            RSpec::Mocks.space.verify_all
           end
         end
       end
@@ -336,14 +343,14 @@ module RSpec
             expect do
               klass.any_instance.should_receive(:foo)
               klass.new
-              klass.rspec_verify
+              RSpec::Mocks.space.verify_all
             end.to raise_error(RSpec::Mocks::MockExpectationError, foo_expectation_error_message)
           end
 
           it "fails if no instance is created" do
             expect do
               klass.any_instance.should_receive(:foo).and_return(1)
-              klass.rspec_verify
+              RSpec::Mocks.space.verify_all
             end.to raise_error(RSpec::Mocks::MockExpectationError, foo_expectation_error_message)
           end
 
@@ -351,7 +358,7 @@ module RSpec
             expect do
               klass.any_instance.should_receive(:foo)
               klass.any_instance.should_receive(:bar)
-              klass.rspec_verify
+              RSpec::Mocks.space.verify_all
             end.to raise_error(RSpec::Mocks::MockExpectationError, 'Exactly one instance should have received the following message(s) but didn\'t: bar, foo')
           end
 
@@ -389,7 +396,7 @@ module RSpec
                 klass.any_instance.should_receive(:foo)
                 klass.should_receive(:woot)
                 klass.new.foo
-                klass.rspec_verify
+                RSpec::Mocks.space.verify_all
               end.to(raise_error(RSpec::Mocks::MockExpectationError) do |error|
                 expect(error.message).not_to eq(existing_method_expectation_error_message)
               end)
@@ -415,14 +422,14 @@ module RSpec
             expect do
               klass.any_instance.should_receive(:existing_method)
               klass.new
-              klass.rspec_verify
+              RSpec::Mocks.space.verify_all
             end.to raise_error(RSpec::Mocks::MockExpectationError, existing_method_expectation_error_message)
           end
 
           it "fails if no instance is created" do
             expect do
               klass.any_instance.should_receive(:existing_method)
-              klass.rspec_verify
+              RSpec::Mocks.space.verify_all
             end.to raise_error(RSpec::Mocks::MockExpectationError, existing_method_expectation_error_message)
           end
 
@@ -430,7 +437,7 @@ module RSpec
             expect do
               klass.any_instance.should_receive(:existing_method)
               klass.any_instance.should_receive(:another_existing_method)
-              klass.rspec_verify
+              RSpec::Mocks.space.verify_all
             end.to raise_error(RSpec::Mocks::MockExpectationError, 'Exactly one instance should have received the following message(s) but didn\'t: another_existing_method, existing_method')
           end
 
@@ -493,7 +500,7 @@ module RSpec
             end.to raise_error(RSpec::Mocks::MockExpectationError)
 
             # ignore the fact that should_receive expectations were not met
-            instances.each { |instance| instance.rspec_reset }
+            instances.each { |instance| reset instance }
           end
 
           it "is not affected by the invocation of existing methods on other instances" do
@@ -510,7 +517,7 @@ module RSpec
             end.to raise_error(RSpec::Mocks::MockExpectationError)
 
             # ignore the fact that should_receive expectations were not met
-            instance.rspec_reset
+            reset instance
           end
         end
 
@@ -524,7 +531,7 @@ module RSpec
             it "fails when no instances are declared" do
               expect do
                 klass.any_instance.should_receive(:foo).once
-                klass.rspec_verify
+                RSpec::Mocks.space.verify_all
               end.to raise_error(RSpec::Mocks::MockExpectationError, foo_expectation_error_message)
             end
 
@@ -532,7 +539,7 @@ module RSpec
               expect do
                 klass.any_instance.should_receive(:foo).once
                 klass.new
-                klass.rspec_verify
+                RSpec::Mocks.space.verify_all
               end.to raise_error(RSpec::Mocks::MockExpectationError, foo_expectation_error_message)
             end
 
@@ -541,7 +548,7 @@ module RSpec
                 klass.any_instance.should_receive(:foo).once
                 instance = klass.new
                 2.times { instance.foo }
-                instance.rspec_verify
+                verify instance
               end.to raise_error(RSpec::Mocks::MockExpectationError)
             end
           end
@@ -558,7 +565,7 @@ module RSpec
                 klass.any_instance.should_receive(:foo).twice
                 instance = klass.new
                 3.times { instance.foo }
-                instance.rspec_verify
+                verify instance
               end.to raise_error(RSpec::Mocks::MockExpectationError)
             end
           end
@@ -575,7 +582,7 @@ module RSpec
                 klass.any_instance.should_receive(:foo).exactly(3).times
                 instance = klass.new
                 2.times { instance.foo }
-                instance.rspec_verify
+                verify instance
               end.to raise_error(RSpec::Mocks::MockExpectationError)
             end
 
@@ -584,7 +591,7 @@ module RSpec
                 klass.any_instance.should_receive(:foo).exactly(3).times
                 instance = klass.new
                 4.times { instance.foo }
-                instance.rspec_verify
+                verify instance
               end.to raise_error(RSpec::Mocks::MockExpectationError)
             end
           end
@@ -601,7 +608,7 @@ module RSpec
                 klass.any_instance.should_receive(:foo).at_least(3).times
                 instance = klass.new
                 2.times { instance.foo }
-                instance.rspec_verify
+                verify instance
               end.to raise_error(RSpec::Mocks::MockExpectationError)
             end
 
@@ -630,7 +637,7 @@ module RSpec
                 klass.any_instance.should_receive(:foo).at_most(3).times
                 instance = klass.new
                 4.times { instance.foo }
-                instance.rspec_verify
+                verify instance
               end.to raise_error(RSpec::Mocks::MockExpectationError)
             end
           end
@@ -638,7 +645,7 @@ module RSpec
           context "the 'never' constraint" do
             it "passes for 0 invocations" do
               klass.any_instance.should_receive(:foo).never
-              klass.rspec_verify
+              RSpec::Mocks.space.verify_all
             end
 
             it "fails on the first invocation" do
@@ -659,7 +666,7 @@ module RSpec
                 expect do
                   klass.any_instance.should_receive(:foo).never
                   klass.any_instance.should_receive(:existing_method).and_return(5)
-                  klass.rspec_verify
+                  RSpec::Mocks.space.verify_all
                 end.to raise_error(RSpec::Mocks::MockExpectationError, existing_method_expectation_error_message)
               end
             end
@@ -668,14 +675,16 @@ module RSpec
           context "the 'any_number_of_times' constraint" do
             it "passes for 0 invocations" do
               klass.any_instance.should_receive(:foo).any_number_of_times
-              klass.new.rspec_verify
+              verify klass.new
             end
 
             it "passes for a non-zero number of invocations" do
+              allow(RSpec).to receive(:deprecate).with("any_number_of_times", :replacement => "stub")
+
               klass.any_instance.should_receive(:foo).any_number_of_times
               instance = klass.new
               instance.foo
-              instance.rspec_verify
+              verify instance
             end
 
             it "does not interfere with other expectations" do
@@ -695,7 +704,7 @@ module RSpec
                 expect do
                   klass.any_instance.should_receive(:foo).any_number_of_times
                   klass.any_instance.should_receive(:existing_method).and_return(5)
-                  klass.rspec_verify
+                  RSpec::Mocks.space.verify_all
                 end.to raise_error(RSpec::Mocks::MockExpectationError, existing_method_expectation_error_message)
               end
             end
@@ -704,11 +713,11 @@ module RSpec
       end
 
       context "when resetting post-verification" do
-        let(:space) { RSpec::Mocks::Space.new }
+        let(:space) { RSpec::Mocks.space }
 
         context "existing method" do
           before(:each) do
-            space.add(klass)
+            klass.any_instance # to force it to be tracked
           end
 
           context "with stubbing" do
@@ -829,31 +838,34 @@ module RSpec
             klass.any_instance.stub(:existing_method).and_return(false)
             klass.any_instance.stub(:existing_method).and_return(true)
 
-            klass.rspec_verify
+            RSpec::Mocks.space.verify_all
             expect(klass.new).to respond_to(:existing_method)
             expect(klass.new.existing_method).to eq(existing_method_return_value)
           end
         end
 
         it "adds an class to the current space when #any_instance is invoked" do
-          klass.any_instance
-          expect(RSpec::Mocks::space.send(:receivers)).to include(klass)
+          expect {
+            klass.any_instance
+          }.to change { space.any_instance_recorders.size }.by(1)
         end
 
         it "adds an instance to the current space when stubbed method is invoked" do
           klass.any_instance.stub(:foo)
           instance = klass.new
           instance.foo
-          expect(RSpec::Mocks::space.send(:receivers)).to include(instance)
+          expect(RSpec::Mocks.space.proxies.keys).to include(instance.object_id)
         end
       end
 
       context 'when used in conjunction with a `dup`' do
         it "doesn't cause an infinite loop" do
+          pending "This intermittently fails on JRuby" if RUBY_PLATFORM == 'java'
+
           Object.any_instance.stub(:some_method)
           o = Object.new
           o.some_method
-          expect { o.dup.some_method }.to_not raise_error(SystemStackError)
+          expect { o.dup.some_method }.to_not raise_error
         end
 
         it "doesn't bomb if the object doesn't support `dup`" do
@@ -871,7 +883,7 @@ module RSpec
 
           klass.any_instance
 
-          expect { klass.new.dup('Dup dup dup') }.to_not raise_error(ArgumentError)
+          expect { klass.new.dup('Dup dup dup') }.to_not raise_error
         end
       end
 

data/spec/rspec/mocks/any_number_of_times_spec.rb

@@ -3,6 +3,12 @@ require 'spec_helper'
 describe "AnyNumberOfTimes" do
   before(:each) do
     @mock = RSpec::Mocks::Mock.new("test mock")
+    allow(RSpec).to receive(:deprecate)
+  end
+
+  it "is deprecated" do
+    expect(RSpec).to receive(:deprecate).with("any_number_of_times", :replacement => "stub")
+    expect(@mock).to receive(:random_call).any_number_of_times
   end
 
   it "passes if any number of times method is called many times" do

data/spec/rspec/mocks/argument_expectation_spec.rb

@@ -3,30 +3,28 @@ require 'spec_helper'
 module RSpec
   module Mocks
     describe ArgumentListMatcher do
+      let(:argument_expectation) { RSpec::Mocks::ArgumentListMatcher.new }
+      let(:obj) { double("matcher") }
 
       it "considers an object that responds to #matches? and #failure_message_for_should to be a matcher" do
-        argument_expectation = RSpec::Mocks::ArgumentListMatcher.new
-        obj = double("matcher")
-        obj.stub(:respond_to?).with(:matches?).and_return(true)
-        obj.stub(:respond_to?).with(:failure_message_for_should).and_return(true)
+        obj.stub(:matches?)
+        obj.stub(:failure_message_for_should)
         expect(argument_expectation.send(:is_matcher?, obj)).to be_true
       end
 
       it "considers an object that responds to #matches? and #failure_message to be a matcher for backward compatibility" do
-        argument_expectation = RSpec::Mocks::ArgumentListMatcher.new
-        obj = double("matcher")
-        obj.stub(:respond_to?).with(:matches?).and_return(true)
-        obj.stub(:respond_to?).with(:failure_message_for_should).and_return(false)
-        obj.stub(:respond_to?).with(:failure_message).and_return(true)
+        obj.stub(:matches?)
+        obj.stub(:failure_message)
         expect(argument_expectation.send(:is_matcher?, obj)).to be_true
       end
 
       it "does NOT consider an object that only responds to #matches? to be a matcher" do
-        argument_expectation = RSpec::Mocks::ArgumentListMatcher.new
-        obj = double("matcher")
-        obj.stub(:respond_to?).with(:matches?).and_return(true)
-        obj.stub(:respond_to?).with(:failure_message_for_should).and_return(false)
-        obj.stub(:respond_to?).with(:failure_message).and_return(false)
+        obj.stub(:matches?)
+        expect(argument_expectation.send(:is_matcher?, obj)).to be_false
+      end
+
+      it "does not consider a null object to be a matcher" do
+        obj.as_null_object
         expect(argument_expectation.send(:is_matcher?, obj)).to be_false
       end
     end