rspec-mocks 2.14.6 → 2.99.0.beta1

data/spec/rspec/mocks/argument_expectation_spec.rb

@@ -9,23 +9,23 @@ module RSpec
       it "considers an object that responds to #matches? and #failure_message_for_should to be a matcher" do
         obj.stub(:matches?)
         obj.stub(:failure_message_for_should)
-        expect(argument_expectation.send(:is_matcher?, obj)).to be_true
+        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
         obj.stub(:matches?)
         obj.stub(:failure_message)
-        expect(argument_expectation.send(:is_matcher?, obj)).to be_true
+        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
         obj.stub(:matches?)
-        expect(argument_expectation.send(:is_matcher?, obj)).to be_false
+        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
+        expect(argument_expectation.send(:is_matcher?, obj)).to be false
       end
     end
   end

data/spec/rspec/mocks/block_return_value_spec.rb

@@ -1,17 +1,6 @@
 require "spec_helper"
 
 describe "a double declaration with a block handed to:" do
-  # The "receives a block" part is important: 1.8.7 has a bug that reports the
-  # wrong arity when a block receives a block.
-  it 'forwards all given args to the block, even when it receives a block', :unless => RUBY_VERSION.to_s == '1.8.6' do
-    obj = Object.new
-    yielded_args = []
-    eval("obj.stub(:foo) { |*args, &bl| yielded_args << args }")
-    obj.foo(1, 2, 3)
-
-    expect(yielded_args).to eq([[1, 2, 3]])
-  end
-
   describe "should_receive" do
     it "returns the value of executing the block" do
       obj = Object.new
@@ -36,6 +25,17 @@ describe "a double declaration with a block handed to:" do
     end
 
     it "does not complain if a lambda block and mismatched arguments are passed" do
+      RSpec.stub :deprecate
+      obj = Object.new
+      obj.stub(:foo, &lambda { 'bar' })
+      expect(obj.foo(1, 2)).to eq('bar')
+    end
+
+    it 'warns of deprection if argument counts dont match' do
+      expect(RSpec).to receive(:deprecate) do |message, opts|
+        expect(message).to eq "stubbing implementations with mismatched arity"
+        expect(opts[:call_site]).to match %r%/spec/rspec/mocks/block_return_value_spec.rb%
+      end
       obj = Object.new
       obj.stub(:foo, &lambda { 'bar' })
       expect(obj.foo(1, 2)).to eq('bar')
@@ -50,10 +50,37 @@ describe "a double declaration with a block handed to:" do
     end
 
     it "does not complain if a lambda block and mismatched arguments are passed" do
+      RSpec.stub :deprecate
+      obj = Object.new
+      obj.stub(:foo).with(1, 2, &lambda { 'bar' })
+      expect(obj.foo(1, 2)).to eq('bar')
+    end
+
+    it 'warns of deprection if argument counts dont match' do
+      expect(RSpec).to receive(:deprecate) do |message, opts|
+        expect(message).to eq "stubbing implementations with mismatched arity"
+        expect(opts[:call_site]).to match %r%/spec/rspec/mocks/block_return_value_spec.rb%
+      end
       obj = Object.new
       obj.stub(:foo).with(1, 2, &lambda { 'bar' })
       expect(obj.foo(1, 2)).to eq('bar')
     end
+
+    it 'warns of deprecation when provided block but no arguments' do
+      expect(RSpec).to receive(:deprecate) do |message, opts|
+        expect(message).to match(/Using the return value of a `with` block/)
+      end
+      obj = Object.new
+      obj.stub(:foo).with {|x| 'baz' }.and_return('bar')
+      expect(obj.foo(1)).to eq('bar')
+    end
+
+    it 'includes callsite in deprecation of provided block but no arguments' do
+      obj = Object.new
+      expect_deprecation_with_call_site __FILE__, __LINE__ + 1
+      obj.stub(:foo).with {|x| 'baz' }.and_return('bar')
+      expect(obj.foo(1)).to eq('bar')
+    end
   end
 
   %w[once twice ordered and_return].each do |method|
@@ -65,6 +92,17 @@ describe "a double declaration with a block handed to:" do
       end
 
       it "does not complain if a lambda block and mismatched arguments are passed" do
+        RSpec.stub :deprecate
+        obj = Object.new
+        obj.stub(:foo).send(method, &lambda { 'bar' })
+        expect(obj.foo(1, 2)).to eq('bar')
+      end
+
+      it 'warns of deprection if argument counts dont match' do
+        expect(RSpec).to receive(:deprecate) do |message, opts|
+          expect(message).to eq "stubbing implementations with mismatched arity"
+          expect(opts[:call_site]).to match %r%/spec/rspec/mocks/block_return_value_spec.rb%
+        end
         obj = Object.new
         obj.stub(:foo).send(method, &lambda { 'bar' })
         expect(obj.foo(1, 2)).to eq('bar')

data/spec/rspec/mocks/bug_report_10263_spec.rb

@@ -5,7 +5,7 @@ describe "Double" do
 
   specify "when one example has an expectation inside the block passed to should_receive" do
     test_double.should_receive(:msg) do |arg|
-      expect(arg).to be_true #this call exposes the problem
+      expect(arg).to be true #this call exposes the problem
     end
     begin
       test_double.msg(false)

data/spec/rspec/mocks/bug_report_8165_spec.rb

@@ -16,7 +16,7 @@ describe "An object where respond_to? is true and does not have method" do
     obj = Object.new
     obj.should_receive(:respond_to?).with(:foobar).and_return(true)
     obj.should_receive(:foobar).and_return(:baz)
-    expect(obj.respond_to?(:foobar)).to be_true
+    expect(obj.respond_to?(:foobar)).to be true
     expect(obj.foobar).to eq :baz
   end
 
@@ -24,7 +24,7 @@ describe "An object where respond_to? is true and does not have method" do
     obj = double("obj")
     obj.should_receive(:respond_to?).with(:foobar).and_return(true)
     obj.should_receive(:foobar).and_return(:baz)
-    expect(obj.respond_to?(:foobar)).to be_true
+    expect(obj.respond_to?(:foobar)).to be true
     expect(obj.foobar).to eq :baz
   end
 

data/spec/rspec/mocks/combining_implementation_instructions_spec.rb

@@ -21,7 +21,7 @@ module RSpec
             expect(dbl.foo(:arg, &b)).to eq(3)
           }.to yield_with_args(5)
 
-          expect(@block_called).to be_true
+          expect(@block_called).to be true
         end
 
         it 'works when passing a block to `stub`' do
@@ -60,7 +60,7 @@ module RSpec
           end
         end
 
-        it 'works when passing a block to `any_number_of_times`' do
+        it 'works when passing a block to `any_number_of_times`', :silence_warnings do
           verify_combined_implementation do |dbl|
             dbl.should_receive(:foo).any_number_of_times { @block_called = true }
           end
@@ -117,7 +117,7 @@ module RSpec
           expect { dbl.foo(&b) }.to raise_error("boom")
         }.to yield_with_args(5)
 
-        expect(block_called).to be_true
+        expect(block_called).to be true
       end
 
       it 'can combine and_yield and and_throw' do
@@ -138,7 +138,7 @@ module RSpec
           expect { dbl.foo(&b) }.to throw_symbol(:bar)
         }.to yield_with_args(5)
 
-        expect(block_called).to be_true
+        expect(block_called).to be true
       end
 
       it 'returns `nil` from all terminal actions to discourage further configuration' do

data/spec/rspec/mocks/double_spec.rb

@@ -21,4 +21,11 @@ describe "double" do
       mock("TestDouble")
     end
   end
+
+  it 'does not get string vs symbol messages confused' do
+    dbl = double("foo" => 1)
+    allow(dbl).to receive(:foo).and_return(2)
+    expect(dbl.foo).to eq(2)
+    expect { reset dbl }.not_to raise_error
+  end
 end

data/spec/rspec/mocks/failing_argument_matchers_spec.rb

@@ -84,6 +84,7 @@ module RSpec
       end
 
       it "fails with block matchers" do
+        allow_deprecation
         expect do
           @double.should_receive(:msg).with {|arg| expect(arg).to eq :received }
           @double.msg :no_msg_for_you

data/spec/rspec/mocks/matchers/receive_spec.rb

@@ -9,10 +9,6 @@ module RSpec
         ::RSpec::Mocks.space.verify_all
       end
 
-      def reset_all
-        ::RSpec::Mocks.space.reset_all
-      end
-
       shared_examples_for "a receive matcher" do |*options|
         it 'allows the caller to configure how the subject responds' do
           wrapped.to receive(:foo).and_return(5)
@@ -63,6 +59,14 @@ module RSpec
             wrapped.to eq(3)
           }.to raise_error(UnsupportedMatcherError)
         end
+
+        it 'does not get confused by messages being passed as strings and symbols' do
+          wrapped.to receive(:foo).with(1) { :a }
+          wrapped.to receive("foo").with(2) { :b }
+
+          expect(receiver.foo(1)).to eq(:a)
+          expect(receiver.foo(2)).to eq(:b)
+        end
       end
 
       shared_examples_for "an expect syntax allowance" do |*options|
@@ -101,8 +105,6 @@ module RSpec
           expect {
             verify_all
           }.to raise_error(RSpec::Mocks::MockExpectationError)
-
-          reset_all
         end
 
         it "reports the line number of expectation of unreceived message", :pending => options.include?(:does_not_report_line_num) do
@@ -296,7 +298,7 @@ module RSpec
       context "when rspec-expectations is included in the test framework first" do
         before do
           # the examples here assume `expect` is define in RSpec::Matchers...
-          expect(RSpec::Matchers.method_defined?(:expect)).to be_true
+          expect(RSpec::Matchers.method_defined?(:expect)).to be true
         end
 
         let(:framework) do
@@ -318,7 +320,7 @@ module RSpec
       context "when rspec-expectations is included in the test framework last" do
         before do
           # the examples here assume `expect` is define in RSpec::Matchers...
-          expect(RSpec::Matchers.method_defined?(:expect)).to be_true
+          expect(RSpec::Matchers.method_defined?(:expect)).to be true
         end
 
         let(:framework) do

data/spec/rspec/mocks/mock_space_spec.rb

@@ -97,6 +97,16 @@ module RSpec
         expect(r1).to be(r2)
         expect(r1).not_to be(r3)
       end
+
+      it 'removes an any_instance_recorder when requested' do
+        klass = Class.new
+
+        space.any_instance_recorder_for(klass)
+
+        expect {
+          space.remove_any_instance_recorder_for(klass)
+        }.to change { space.any_instance_recorders.size }.by(-1)
+      end
     end
   end
 end

data/spec/rspec/mocks/mock_spec.rb

@@ -122,6 +122,25 @@ module RSpec
         verify @double
       end
 
+      it 'does not get confused when `should_not_received` is used with a string and symbol message' do
+        @double.stub(:foo) { 3 }
+        @double.should_not_receive(:foo).with(1)
+        @double.should_not_receive("foo").with(2)
+
+        expect(@double.foo).to eq(3)
+        verify @double
+      end
+
+      it 'does not get confused when `should_received` is used with a string and symbol message' do
+        @double.should_receive(:foo).with(1)
+        @double.should_receive("foo").with(2)
+
+        @double.foo(1)
+        @double.foo(2)
+
+        verify @double
+      end
+
       it "allows block to calculate return values" do
         @double.should_receive(:something).with("a","b","c").and_return { |a,b,c| c+b+a }
         expect(@double.something("a","b","c")).to eq "cba"
@@ -215,7 +234,7 @@ module RSpec
 
       it "fails if expectation block fails" do
         @double.should_receive(:something) do |bool|
-          expect(bool).to be_true
+          expect(bool).to be true
         end
 
         expect {

data/spec/rspec/mocks/mutate_const_spec.rb

@@ -78,18 +78,18 @@ module RSpec
 
       shared_examples_for "loaded constant hiding" do |const_name|
         before do
-          expect(recursive_const_defined?(const_name)).to be_true
+          expect(recursive_const_defined?(const_name)).to be_truthy
         end
 
         it 'allows it to be hidden' do
           hide_const(const_name)
-          expect(recursive_const_defined?(const_name)).to be_false
+          expect(recursive_const_defined?(const_name)).to be_falsey
         end
 
         it 'resets the constant when rspec clear its mocks' do
           hide_const(const_name)
           reset_rspec_mocks
-          expect(recursive_const_defined?(const_name)).to be_true
+          expect(recursive_const_defined?(const_name)).to be_truthy
         end
 
         it 'returns nil' do
@@ -101,7 +101,7 @@ module RSpec
         include_context "constant example methods", const_name
 
         before do
-          expect(recursive_const_defined?(const_name)).to be_false
+          expect(recursive_const_defined?(const_name)).to be_falsey
         end
 
         it 'allows it to be stubbed' do
@@ -112,7 +112,7 @@ module RSpec
         it 'removes the constant when rspec clears its mocks' do
           stub_const(const_name, 7)
           reset_rspec_mocks
-          expect(recursive_const_defined?(const_name)).to be_false
+          expect(recursive_const_defined?(const_name)).to be_falsey
         end
 
         it 'returns the stubbed value' do
@@ -130,18 +130,18 @@ module RSpec
         include_context "constant example methods", const_name
 
         before do
-          expect(recursive_const_defined?(const_name)).to be_false
+          expect(recursive_const_defined?(const_name)).to be_falsey
         end
 
         it 'allows it to be hidden, though the operation has no effect' do
           hide_const(const_name)
-          expect(recursive_const_defined?(const_name)).to be_false
+          expect(recursive_const_defined?(const_name)).to be_falsey
         end
 
         it 'remains undefined after rspec clears its mocks' do
           hide_const(const_name)
           reset_rspec_mocks
-          expect(recursive_const_defined?(const_name)).to be_false
+          expect(recursive_const_defined?(const_name)).to be_falsey
         end
 
         it 'returns nil' do
@@ -206,7 +206,7 @@ module RSpec
           orig_value = TOP_LEVEL_VALUE_CONST
 
           hide_const("TOP_LEVEL_VALUE_CONST")
-          expect(recursive_const_defined?("TOP_LEVEL_VALUE_CONST")).to be_false
+          expect(recursive_const_defined?("TOP_LEVEL_VALUE_CONST")).to be_falsey
 
           stub_const("TOP_LEVEL_VALUE_CONST", 12345)
           expect(TOP_LEVEL_VALUE_CONST).to eq 12345
@@ -247,8 +247,8 @@ module RSpec
             stub = Module.new
             stub_const("TestSubClass", stub, :transfer_nested_constants => true)
             expect(stub::P).to eq(:p)
-            expect(defined?(stub::M)).to be_false
-            expect(defined?(stub::N)).to be_false
+            expect(defined?(stub::M)).to be_falsey
+            expect(defined?(stub::N)).to be_falsey
           end
 
           it 'raises an error when asked to transfer a nested inherited constant' do
@@ -266,7 +266,7 @@ module RSpec
             stub_const("TestClass", stub, :transfer_nested_constants => [:M, :N])
             expect(stub::M).to eq(:m)
             expect(stub::N).to eq(:n)
-            expect(defined?(stub::Nested)).to be_false
+            expect(defined?(stub::Nested)).to be_falsey
           end
 
           it 'raises an error if asked to transfer nested constants but given an object that does not support them' do
@@ -302,7 +302,7 @@ module RSpec
 
           it 'raises an error if asked to transfer a nested constant that is not defined' do
             original_tc = TestClass
-            expect(defined?(TestClass::V)).to be_false
+            expect(defined?(TestClass::V)).to be_falsey
             stub = Module.new
 
             expect {
@@ -345,10 +345,10 @@ module RSpec
           it_behaves_like "unloaded constant stubbing", "X::Y"
 
           it 'removes the root constant when rspec clears its mocks' do
-            expect(defined?(X)).to be_false
+            expect(defined?(X)).to be_falsey
             stub_const("X::Y", 7)
             reset_rspec_mocks
-            expect(defined?(X)).to be_false
+            expect(defined?(X)).to be_falsey
           end
         end
 
@@ -356,10 +356,10 @@ module RSpec
           it_behaves_like "unloaded constant stubbing", "X::Y::Z"
 
           it 'removes the root constant when rspec clears its mocks' do
-            expect(defined?(X)).to be_false
+            expect(defined?(X)).to be_falsey
             stub_const("X::Y::Z", 7)
             reset_rspec_mocks
-            expect(defined?(X)).to be_false
+            expect(defined?(X)).to be_falsey
           end
         end
 
@@ -367,12 +367,12 @@ module RSpec
           it_behaves_like "unloaded constant stubbing", "TestClass::X"
 
           it 'removes the unloaded constant but leaves the loaded constant when rspec resets its mocks' do
-            expect(defined?(TestClass)).to be_true
-            expect(defined?(TestClass::X)).to be_false
+            expect(defined?(TestClass)).to be_truthy
+            expect(defined?(TestClass::X)).to be_falsey
             stub_const("TestClass::X", 7)
             reset_rspec_mocks
-            expect(defined?(TestClass)).to be_true
-            expect(defined?(TestClass::X)).to be_false
+            expect(defined?(TestClass)).to be_truthy
+            expect(defined?(TestClass::X)).to be_falsey
           end
 
           it 'raises a helpful error if it cannot be stubbed due to an intermediary constant that is not a module' do
@@ -385,12 +385,12 @@ module RSpec
           it_behaves_like "unloaded constant stubbing", "TestClass::Nested::NestedEvenMore::X::Y::Z"
 
           it 'removes the first unloaded constant but leaves the loaded nested constant when rspec resets its mocks' do
-            expect(defined?(TestClass::Nested::NestedEvenMore)).to be_true
-            expect(defined?(TestClass::Nested::NestedEvenMore::X)).to be_false
+            expect(defined?(TestClass::Nested::NestedEvenMore)).to be_truthy
+            expect(defined?(TestClass::Nested::NestedEvenMore::X)).to be_falsey
             stub_const("TestClass::Nested::NestedEvenMore::X::Y::Z", 7)
             reset_rspec_mocks
-            expect(defined?(TestClass::Nested::NestedEvenMore)).to be_true
-            expect(defined?(TestClass::Nested::NestedEvenMore::X)).to be_false
+            expect(defined?(TestClass::Nested::NestedEvenMore)).to be_truthy
+            expect(defined?(TestClass::Nested::NestedEvenMore::X)).to be_falsey
           end
         end
       end