rspec-mocks 3.0.0.beta1 → 3.0.0.beta2

data/lib/rspec/mocks/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Mocks
     module Version
-      STRING = '3.0.0.beta1'
+      STRING = '3.0.0.beta2'
     end
   end
 end

data/spec/rspec/mocks/and_call_original_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'delegate'
 
 describe "and_call_original" do
-  context "on a partial mock object" do
+  context "on a partial double" do
     let(:klass) do
       Class.new do
         def meth_1
@@ -21,6 +21,28 @@ describe "and_call_original" do
 
     let(:instance) { klass.new }
 
+    context "when a method that exists has been stubbed previously" do
+      before { allow(instance).to receive(:meth_1).and_return(:override) }
+
+      it 'restores the original behavior' do
+        expect {
+          allow(instance).to receive(:meth_1).and_call_original
+        }.to change(instance, :meth_1).from(:override).to(:original)
+      end
+    end
+
+    context "when a non-existant method has been stubbed previously" do
+      it 'restores the original NameError behavior' do
+        expect { instance.abcd }.to raise_error(NameError).with_message(/abcd/)
+
+        allow(instance).to receive(:abcd).and_return(:override)
+        expect(instance.abcd).to eq(:override)
+
+        allow(instance).to receive(:abcd).and_call_original
+        expect { instance.abcd }.to raise_error(NameError).with_message(/abcd/)
+      end
+    end
+
     it 'passes the received message through to the original method' do
       expect(instance).to receive(:meth_1).and_call_original
       expect(instance.meth_1).to eq(:original)
@@ -47,7 +69,7 @@ describe "and_call_original" do
     end
 
     it 'warns when you override an existing implementation' do
-      expect(RSpec).to receive(:warning).with(/overriding a previous implementation/)
+      expect(RSpec).to receive(:warning).with(/overriding a previous stub implementation of `meth_1`.*#{__FILE__}:#{__LINE__ + 1}/)
       expect(instance).to receive(:meth_1) { true }.and_call_original
       instance.meth_1
     end
@@ -200,7 +222,7 @@ describe "and_call_original" do
     end
   end
 
-  context "on a partial mock object that overrides #method" do
+  context "on a partial double that overrides #method" do
     let(:request_klass) do
       Struct.new(:method, :url) do
         def perform
@@ -230,18 +252,17 @@ describe "and_call_original" do
     end
   end
 
-  context "on a pure mock object" do
+  context "on a pure test double" do
     let(:instance) { double }
 
-    it 'raises an error even if the mock object responds to the message' do
+    it 'raises an error even if the double object responds to the message' do
       expect(instance.to_s).to be_a(String)
       mock_expectation = instance.should_receive(:to_s)
       instance.to_s # to satisfy the expectation
 
       expect {
         mock_expectation.and_call_original
-      }.to raise_error(/and_call_original.*partial mock/i)
+      }.to raise_error(/pure test double.*and_call_original.*partial double/i)
     end
   end
 end
-

data/spec/rspec/mocks/and_return_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+module RSpec
+  module Mocks
+    describe 'and_return' do
+      let(:obj) { double('obj') }
+
+      context 'when a block is passed' do
+        it 'raises ArgumentError' do
+          expect {
+            obj.stub(:foo).and_return('bar') { 'baz' }
+          }.to raise_error(ArgumentError, /implementation block/i)
+        end
+      end
+
+      context 'when no argument is passed' do
+        it 'raises ArgumentError' do
+          expect { obj.stub(:foo).and_return }.to raise_error(ArgumentError)
+        end
+      end
+    end
+  end
+end

data/spec/rspec/mocks/and_yield_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe RSpec::Mocks::Mock do
+describe RSpec::Mocks::Double do
 
   let(:obj) { double }
 
@@ -124,4 +124,3 @@ describe RSpec::Mocks::Mock do
     end
   end
 end
-

data/spec/rspec/mocks/any_instance_spec.rb

@@ -97,6 +97,9 @@ module RSpec
         end
 
         context "behaves as 'every instance'" do
+          let(:super_class) { Class.new { def foo; 'bar'; end } }
+          let(:sub_class)   { Class.new(super_class) }
+
           it "stubs every instance in the spec" do
             klass.any_instance.stub(:foo).and_return(result = Object.new)
             expect(klass.new.foo).to eq(result)
@@ -115,6 +118,19 @@ module RSpec
             foo = 'foo'.freeze
             expect(foo.dup.concat 'bar').to eq 'foobar'
           end
+
+          it 'handles stubbing on super and subclasses' do
+            super_class.any_instance.stub(:foo)
+            sub_class.any_instance.stub(:foo).and_return('baz')
+            expect(sub_class.new.foo).to eq('baz')
+          end
+
+          it 'handles method restoration on subclasses' do
+            super_class.any_instance.stub(:foo)
+            sub_class.any_instance.stub(:foo)
+            sub_class.any_instance.unstub(:foo)
+            expect(sub_class.new.foo).to eq("bar")
+          end
         end
 
         context "with argument matching" do
@@ -233,10 +249,10 @@ module RSpec
 
             # Simply resetting the proxy doesn't work
             # what we need to have happen is
-            # ::RSpec::Mocks.any_instance_recorder_for(klass).stop_all_observation!
+            # ::RSpec::Mocks.space.any_instance_recorder_for(klass).stop_all_observation!
             # but that is never invoked in ::
             expect {
-              RSpec::Mocks.space.verify_all
+              verify_all
             }.to(
               change { obj.existing_method }.from("stubbed value").to(:existing_method_return_value)
             )
@@ -376,7 +392,7 @@ module RSpec
             klass.any_instance.should_receive(:foo)
             klass.any_instance.should_not_receive(:bar)
             klass.new.foo
-            RSpec::Mocks.space.verify_all
+            verify_all
           end
         end
 
@@ -401,14 +417,14 @@ module RSpec
             expect do
               klass.any_instance.should_receive(:foo)
               klass.new
-              RSpec::Mocks.space.verify_all
+              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)
-              RSpec::Mocks.space.verify_all
+              verify_all
             end.to raise_error(RSpec::Mocks::MockExpectationError, foo_expectation_error_message)
           end
 
@@ -416,7 +432,7 @@ module RSpec
             expect do
               klass.any_instance.should_receive(:foo)
               klass.any_instance.should_receive(:bar)
-              RSpec::Mocks.space.verify_all
+              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
 
@@ -454,7 +470,7 @@ module RSpec
                 klass.any_instance.should_receive(:foo)
                 klass.should_receive(:woot)
                 klass.new.foo
-                RSpec::Mocks.space.verify_all
+                verify_all
               end.to(raise_error(RSpec::Mocks::MockExpectationError) do |error|
                 expect(error.message).not_to eq(existing_method_expectation_error_message)
               end)
@@ -480,14 +496,14 @@ module RSpec
             expect do
               klass.any_instance.should_receive(:existing_method)
               klass.new
-              RSpec::Mocks.space.verify_all
+              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)
-              RSpec::Mocks.space.verify_all
+              verify_all
             end.to raise_error(RSpec::Mocks::MockExpectationError, existing_method_expectation_error_message)
           end
 
@@ -495,7 +511,7 @@ module RSpec
             expect do
               klass.any_instance.should_receive(:existing_method)
               klass.any_instance.should_receive(:another_existing_method)
-              RSpec::Mocks.space.verify_all
+              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
 
@@ -589,7 +605,7 @@ module RSpec
             it "fails when no instances are declared" do
               expect do
                 klass.any_instance.should_receive(:foo).once
-                RSpec::Mocks.space.verify_all
+                verify_all
               end.to raise_error(RSpec::Mocks::MockExpectationError, foo_expectation_error_message)
             end
 
@@ -597,7 +613,7 @@ module RSpec
               expect do
                 klass.any_instance.should_receive(:foo).once
                 klass.new
-                RSpec::Mocks.space.verify_all
+                verify_all
               end.to raise_error(RSpec::Mocks::MockExpectationError, foo_expectation_error_message)
             end
 
@@ -703,7 +719,7 @@ module RSpec
           context "the 'never' constraint" do
             it "passes for 0 invocations" do
               klass.any_instance.should_receive(:foo).never
-              RSpec::Mocks.space.verify_all
+              verify_all
             end
 
             it "fails on the first invocation" do
@@ -724,7 +740,7 @@ module RSpec
                 expect do
                   klass.any_instance.should_receive(:foo).never
                   klass.any_instance.should_receive(:existing_method).and_return(5)
-                  RSpec::Mocks.space.verify_all
+                  verify_all
                 end.to raise_error(RSpec::Mocks::MockExpectationError, existing_method_expectation_error_message)
               end
             end
@@ -858,7 +874,7 @@ module RSpec
             klass.any_instance.stub(:existing_method).and_return(false)
             klass.any_instance.stub(:existing_method).and_return(true)
 
-            RSpec::Mocks.space.verify_all
+            verify_all
             expect(klass.new).to respond_to(:existing_method)
             expect(klass.new.existing_method).to eq(existing_method_return_value)
           end
@@ -952,7 +968,7 @@ module RSpec
 
       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'
+          skip "This intermittently fails on JRuby" if RUBY_PLATFORM == 'java'
 
           Object.any_instance.stub(:some_method)
           o = Object.new
@@ -1019,7 +1035,7 @@ module RSpec
           instance = klass.new
           expect(instance.existing_method).to eq :stubbed_return_value
 
-          RSpec::Mocks.verify
+          verify_all
 
           expect(instance.existing_method).to eq :existing_method_return_value
         end

data/spec/rspec/mocks/array_including_matcher_spec.rb

@@ -10,29 +10,29 @@ module RSpec
 
         context "passing" do
           it "matches the same array" do
-            expect(array_including(1, 2, 3)).to eq([1, 2, 3])
+            expect(array_including(1, 2, 3)).to be === [1, 2, 3]
           end
 
           it "matches the same array,  specified without square brackets" do
-            expect(array_including(1, 2, 3)).to eq([1, 2, 3])
+            expect(array_including(1, 2, 3)).to be === [1, 2, 3]
           end
 
           it "matches the same array,  which includes nested arrays" do
-            expect(array_including([1, 2], 3, 4)).to eq([[1, 2], 3, 4])
+            expect(array_including([1, 2], 3, 4)).to be === [[1, 2], 3, 4]
           end
 
           it "works with duplicates in expected" do
-            expect(array_including(1, 1, 2, 3)).to eq([1, 2, 3])
+            expect(array_including(1, 1, 2, 3)).to be === [1, 2, 3]
           end
 
           it "works with duplicates in actual" do
-            expect(array_including(1, 2, 3)).to eq([1, 1, 2, 3])
+            expect(array_including(1, 2, 3)).to be === [1, 1, 2, 3]
           end
         end
 
         context "failing" do
           it "fails when not all the entries in the expected are present" do
-            expect(array_including(1,2,3,4,5)).not_to eq([1,2])
+            expect(array_including(1,2,3,4,5)).not_to be === [1,2]
           end
         end
       end

data/spec/rspec/mocks/before_all_spec.rb

@@ -0,0 +1,132 @@
+require "spec_helper"
+
+describe "Using rspec-mocks features in before(:all) blocks" do
+  shared_examples_for "fails in a before(:all) block" do
+    the_error = nil
+    before(:all) do
+      begin
+        use_rspec_mocks
+      rescue
+        the_error = $!
+      end
+    end
+
+    it "raises an error with a useful message" do
+      expect(the_error).to be_a_kind_of(RSpec::Mocks::OutsideOfExampleError)
+
+      expect(the_error.message).to match(/The use of doubles or partial doubles from rspec-mocks outside of the per-test lifecycle is not supported./)
+    end
+  end
+
+  describe "#stub_const" do
+    include_examples "fails in a before(:all) block" do
+      def use_rspec_mocks
+        stub_const("SomeNewConst", Class.new)
+      end
+
+      it 'does not stub the const' do
+        expect(defined?(SomeNewConst)).to be_falsey
+      end
+    end
+  end
+
+  describe "#hide_const(for an undefined const)" do
+    include_examples "fails in a before(:all) block" do
+      def use_rspec_mocks
+        hide_const("Foo")
+      end
+    end
+  end
+
+  describe "#hide_const(for a defined const)" do
+    include_examples "fails in a before(:all) block" do
+      def use_rspec_mocks
+        hide_const("Float")
+      end
+
+      it 'does not hide the const' do
+        expect(defined?(Float)).to be_truthy
+      end
+    end
+  end
+
+  describe "#stub" do
+    include_examples "fails in a before(:all) block" do
+      def use_rspec_mocks
+        Object.stub(:foo)
+      end
+    end
+  end
+
+  describe "#unstub" do
+    include_examples "fails in a before(:all) block" do
+      def use_rspec_mocks
+        Object.unstub(:foo)
+      end
+    end
+  end
+
+  describe "#should_receive" do
+    include_examples "fails in a before(:all) block" do
+      def use_rspec_mocks
+        Object.should_receive(:foo)
+      end
+    end
+  end
+
+  describe "#should_not_receive" do
+    include_examples "fails in a before(:all) block" do
+      def use_rspec_mocks
+        Object.should_not_receive(:foo)
+      end
+    end
+  end
+
+  describe "#any_instance" do
+    include_examples "fails in a before(:all) block" do
+      def use_rspec_mocks
+        Object.any_instance.should_receive(:foo)
+      end
+    end
+  end
+
+  describe "#stub_chain" do
+    include_examples "fails in a before(:all) block" do
+      def use_rspec_mocks
+        Object.stub_chain(:foo)
+      end
+    end
+  end
+
+  describe "#expect(...).to receive" do
+    include_examples "fails in a before(:all) block" do
+      def use_rspec_mocks
+        expect(Object).to receive(:foo)
+      end
+    end
+  end
+
+  describe "#allow(...).to receive" do
+    include_examples "fails in a before(:all) block" do
+      def use_rspec_mocks
+        allow(Object).to receive(:foo)
+      end
+    end
+  end
+
+  describe "#expect_any_instance_of(...).to receive" do
+    include_examples "fails in a before(:all) block" do
+      def use_rspec_mocks
+        expect_any_instance_of(Object).to receive(:foo)
+      end
+    end
+  end
+
+  describe "#allow_any_instance_of(...).to receive" do
+    include_examples "fails in a before(:all) block" do
+      def use_rspec_mocks
+        allow_any_instance_of(Object).to receive(:foo)
+      end
+    end
+  end
+end