rspec-mocks 2.14.6 → 2.99.0.beta1

data/spec/rspec/mocks/null_object_mock_spec.rb

@@ -92,9 +92,16 @@ module RSpec
       it "preserves its nullness to subsequent examples to " +
          "maintain compatibility with <= 2.13" do
         RSpec::Mocks.teardown
+        allow(RSpec).to receive(:deprecate)
         expect(@double).to be_null_object
         expect { @double.some.long.message.chain }.not_to raise_error
       end
+
+      it 'prints a deprecation warning when a double is re-used between examples' do
+        RSpec::Mocks.teardown
+        expect(RSpec).to receive(:deprecate).with(/null-ness/)
+        expect { @double.some.long.message.chain }.not_to raise_error
+      end
     end
 
     describe "#as_null_object" do

data/spec/rspec/mocks/passing_argument_matchers_spec.rb

@@ -85,11 +85,13 @@ module RSpec
       end
 
       context "handling block matchers" do
+        before { allow_deprecation }
+
         it "matches arguments against RSpec expectations" do
           @double.should_receive(:random_call).with {|arg1, arg2, arr, *rest|
             expect(arg1).to eq 5
-            expect(arg2).to have_at_least(3).characters
-            expect(arg2).to have_at_most(10).characters
+            expect(arg2.length).to be >= 3
+            expect(arg2.length).to be <= 10
             expect(arr.map {|i| i * 2}).to eq [2,4,6]
             expect(rest).to eq [:fee, "fi", 4]
           }

data/spec/rspec/mocks/record_messages_spec.rb

@@ -7,19 +7,19 @@ module RSpec
         @mock = double("mock").as_null_object
       end
       it "answers false for received_message? when no messages received" do
-        expect(@mock.received_message?(:message)).to be_false
+        expect(@mock.received_message?(:message)).to be false
       end
       it "answers true for received_message? when message received" do
         @mock.message
-        expect(@mock.received_message?(:message)).to be_true
+        expect(@mock.received_message?(:message)).to be true
       end
       it "answers true for received_message? when message received with correct args" do
         @mock.message 1,2,3
-        expect(@mock.received_message?(:message, 1,2,3)).to be_true
+        expect(@mock.received_message?(:message, 1,2,3)).to be true
       end
       it "answers false for received_message? when message received with incorrect args" do
         @mock.message 1,2,3
-        expect(@mock.received_message?(:message, 1,2)).to be_false
+        expect(@mock.received_message?(:message, 1,2)).to be false
       end
     end
   end

data/spec/rspec/mocks/space_spec.rb

@@ -20,7 +20,7 @@ module RSpec::Mocks
         parent      = parent_class.new
         child       = child_class.new
 
-        grandparent_proxy = space.proxy_for(grandparent)
+        _                 = space.proxy_for(grandparent)
         parent_proxy      = space.proxy_for(parent)
         child_proxy       = space.proxy_for(child)
 

data/spec/rspec/mocks/stub_chain_spec.rb

@@ -5,6 +5,14 @@ module RSpec
     describe "A chained method stub" do
       let(:object) { Object.new }
 
+      it 'does not get confused by symbol vs string usage for the messages' do
+        object.stub_chain(:foo, :bar => 1)
+        object.stub_chain("foo", :bazz => 2)
+
+        expect(object.foo.bar).to eq(1)
+        expect(object.foo.bazz).to eq(2)
+      end
+
       context "with one method in chain" do
         context "using and_return" do
           it "returns expected value from chaining only one method call" do
@@ -29,18 +37,6 @@ module RSpec
       end
 
       context "with two methods in chain" do
-        it "accepts any number of arguments to the stubbed messages" do
-          object.stub_chain(:msg1, :msg2).and_return(:return_value)
-
-          expect(object.msg1("nonsense", :value).msg2("another", :nonsense, 3.0, "value")).to eq(:return_value)
-        end
-
-        it "accepts any number of arguments to the stubbed messages with a return value from a hash" do
-          object.stub_chain(:msg1, :msg2 => :return_value)
-
-          expect(object.msg1("nonsense", :value).msg2("another", :nonsense, 3.0, "value")).to eq(:return_value)
-        end
-
         context "using and_return" do
           it "returns expected value from chaining two method calls" do
             object.stub_chain(:msg1, :msg2).and_return(:return_value)

data/spec/rspec/mocks/syntax_agnostic_message_matchers_spec.rb

@@ -35,6 +35,16 @@ module RSpec
         ::RSpec::Mocks.allow_message(subject, :message)
         expect { verify subject }.not_to raise_error
       end
+
+      it 'does not get confused when the string and symbol message form are both used' do
+        ::RSpec::Mocks.allow_message(subject, :foo).with(1) { :a }
+        ::RSpec::Mocks.allow_message(subject, "foo").with(2) { :b }
+
+        expect(subject.foo(1)).to eq(:a)
+        expect(subject.foo(2)).to eq(:b)
+
+        reset subject
+      end
     end
 
     describe ".expect_message" do
@@ -75,6 +85,16 @@ module RSpec
         verify subject
       end
 
+      it 'does not get confused when the string and symbol message form are both used' do
+        ::RSpec::Mocks.expect_message(subject, :foo).with(1)
+        ::RSpec::Mocks.expect_message(subject, "foo").with(2)
+
+        subject.foo(1)
+        subject.foo(2)
+
+        verify subject
+      end
+
     end
 
   end

data/spec/rspec/mocks/test_double_spec.rb

@@ -56,11 +56,6 @@ module RSpec
         double = Module.new { TestDouble.extend_onto(self) }
         expect { double.foo }.to raise_error(/Mock received/)
       end
-
-      it 'warns of deprecation of :null_object => true' do
-        RSpec.should_receive :deprecate
-        double = Class.new { TestDouble.extend_onto self, 'name', :null_object => true }
-      end
     end
   end
 end

data/spec/rspec/mocks_spec.rb

@@ -62,4 +62,18 @@ describe RSpec::Mocks do
       load "spec/mocks.rb"
     end
   end
+
+  def file_contents_for(lib, filename)
+    # http://rubular.com/r/HYpUMftlG2
+    path = $LOAD_PATH.find { |p| p.match(/\/rspec-#{lib}(-[a-f0-9]+)?\/lib/) }
+    file = File.join(path, filename)
+    File.read(file)
+  end
+
+  it 'has an up-to-date caller_filter file' do
+    mocks = file_contents_for("mocks", "rspec/mocks/caller_filter.rb")
+    core  = file_contents_for("core",  "rspec/core/caller_filter.rb")
+
+    expect(mocks).to eq(core)
+  end
 end

data/spec/spec_helper.rb

@@ -20,6 +20,20 @@ module VerifyAndResetHelpers
   end
 end
 
+# TODO: This is duplicated in rspec-core, should be extracted into
+# rspec-support when that project gets started.
+module HelperMethods
+  def expect_deprecation_with_call_site(file, line)
+    expect(RSpec.configuration.reporter).to receive(:deprecation) do |options|
+      expect(options[:call_site]).to include([file, line].join(':'))
+    end
+  end
+
+  def allow_deprecation
+    allow(RSpec.configuration.reporter).to receive(:deprecation)
+  end
+end
+
 RSpec.configure do |config|
   config.mock_with :rspec
   config.color_enabled = true
@@ -34,6 +48,7 @@ RSpec.configure do |config|
 
   old_verbose = nil
   config.before(:each, :silence_warnings) do
+    allow(RSpec).to receive(:deprecate)
     old_verbose = $VERBOSE
     $VERBOSE = nil
   end
@@ -43,6 +58,7 @@ RSpec.configure do |config|
   end
 
   config.include VerifyAndResetHelpers
+  config.include HelperMethods
 end
 
 shared_context "with syntax" do |syntax|
@@ -58,3 +74,14 @@ shared_context "with syntax" do |syntax|
   end
 end
 
+shared_context "with isolated configuration" do
+  orig_configuration = nil
+  before do
+    orig_configuration = RSpec::Mocks.configuration
+    RSpec::Mocks.instance_variable_set(:@configuration, RSpec::Mocks::Configuration.new)
+  end
+
+  after do
+    RSpec::Mocks.instance_variable_set(:@configuration, orig_configuration)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks
 version: !ruby/object:Gem::Version
-  version: 2.14.6
+  version: 2.99.0.beta1
 platform: ruby
 authors:
 - Steven Baker
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -68,6 +68,7 @@ files:
 - lib/rspec/mocks/any_instance/stub_chain_chain.rb
 - lib/rspec/mocks/argument_list_matcher.rb
 - lib/rspec/mocks/argument_matchers.rb
+- lib/rspec/mocks/caller_filter.rb
 - lib/rspec/mocks/configuration.rb
 - lib/rspec/mocks/deprecation.rb
 - lib/rspec/mocks/error_generator.rb
@@ -75,6 +76,7 @@ files:
 - lib/rspec/mocks/example_methods.rb
 - lib/rspec/mocks/extensions/instance_exec.rb
 - lib/rspec/mocks/extensions/marshal.rb
+- lib/rspec/mocks/extensions/proc.rb
 - lib/rspec/mocks/framework.rb
 - lib/rspec/mocks/instance_method_stasher.rb
 - lib/rspec/mocks/matchers/have_received.rb
@@ -209,15 +211,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: rspec
 rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
-summary: rspec-mocks-2.14.6
+summary: rspec-mocks-2.99.0.beta1
 test_files:
 - features/README.md
 - features/Scope.md