rspec-mocks 2.99.0.beta1 → 2.99.0.beta2

data/Changelog.md

@@ -1,7 +1,22 @@
+### 2.99.0.beta2 / 2014-02-17
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.99.0.beta1...v2.99.0.beta2)
+
+Deprecations:
+
+* Deprecate `RSpec::Mocks::Mock` in favor of `RSpec::Mocks::Double`.
+  (Myron Marston)
+* Deprecate the `host` argument of `RSpec::Mocks.setup`. Instead
+  `RSpec::Mocks::ExampleMethods` should be included directly in the scope where
+  RSpec's mocking capabilities are used. (Sam Phippen)
+* Deprecate using any of rspec-mocks' features outside the per-test
+  lifecycle (e.g. from a `before(:all)` hook). (Myron Marston)
+* Deprecate re-using a test double in another example. (Myron Marston)
+* Deprecate `and_return { value }` and `and_return` without arguments. (Yuji Nakayama)
+
 ### 2.99.0.beta1 / 2013-11-07
 [full changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.4...v2.99.0.beta1)
 
-Deprecations
+Deprecations:
 
 * Expecting to use lambdas or other strong arity implementations for stub
   methods with mis-matched arity is deprecated and support for them will be
@@ -23,6 +38,16 @@ Enhancements:
 * Add a config option to yield the receiver to `any_instance` implementation
   blocks. (Sam Phippen)
 
+### 2.14.5 / 2014-02-01
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.4...v2.14.5)
+
+Bug Fixes:
+
+* Fix regression that caused block implementations to not receive all
+  args on 1.8.7 if the block also receives a block, due to Proc#arity
+  reporting `1` no matter how many args the block receives if it
+  receives a block, too. (Myron Marston)
+
 ### 2.14.4 / 2013-10-15
 [full changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.3...v2.14.4)
 

data/features/spies/spy_pure_mock_method.feature

@@ -66,7 +66,7 @@ Feature: Spy on a stubbed method on a pure mock
     Given a file named "spy_message_spec.rb" with:
       """ruby
       describe "have_received" do
-      subject(:invitation) { double('invitation', :deliver => true) }
+        subject(:invitation) { double('invitation', :deliver => true) }
         before { invitation.deliver }
 
         it { should have_received(:deliver) }

data/lib/rspec/mocks.rb

@@ -7,11 +7,21 @@ module RSpec
     class << self
       attr_accessor :space
 
-      def setup(host)
-        (class << host; self; end).class_eval do
-          include RSpec::Mocks::ExampleMethods
+      def setup(host=nil)
+        host_is_from_rspec_core = defined?(::RSpec::Core::ExampleGroup) && host.is_a?(::RSpec::Core::ExampleGroup)
+        if host
+          unless host_is_from_rspec_core
+            RSpec.deprecate(
+              "The host argument to `RSpec::Mocks.setup`",
+              :replacement => "`include RSpec::Mocks::ExampleMethods` in #{host.inspect}"
+            )
+          end
+
+          (class << host; self; end).class_eval do
+            include RSpec::Mocks::ExampleMethods
+          end
         end
-        self.space ||= RSpec::Mocks::Space.new
+        space.outside_example = false
       end
 
       def verify
@@ -20,6 +30,7 @@ module RSpec
 
       def teardown
         space.reset_all
+        space.outside_example = true
       end
 
       def proxy_for(object)
@@ -95,6 +106,8 @@ module RSpec
 
     # @private
     IGNORED_BACKTRACE_LINE = 'this backtrace line is ignored'
+
+    self.space = RSpec::Mocks::Space.new
   end
 end
 

data/lib/rspec/mocks/caller_filter.rb

@@ -3,53 +3,58 @@ module RSpec
   # non-rspec lines. This enables errors to be reported at the call site in
   # the code using the library, which is far more useful than the particular
   # internal method that raised an error.
-  class CallerFilter
-
-    RSPEC_LIBS = %w[
-      core
-      mocks
-      expectations
-      matchers
-      rails
-    ]
-
-    ADDITIONAL_TOP_LEVEL_FILES = %w[ autorun ]
-
-    LIB_REGEX = %r{/lib/rspec/(#{(RSPEC_LIBS + ADDITIONAL_TOP_LEVEL_FILES).join('|')})(\.rb|/)}
-
-    if RUBY_VERSION >= '2.0.0'
-      def self.first_non_rspec_line
-        # `caller` is an expensive method that scales linearly with the size of
-        # the stack. The performance hit for fetching it in chunks is small,
-        # and since the target line is probably near the top of the stack, the
-        # overall improvement of a chunked search like this is significant.
-        #
-        # See benchmarks/caller.rb for measurements.
-
-        # Initial value here is mostly arbitrary, but is chosen to give good
-        # performance on the common case of creating a double.
-        increment = 5
-        i         = 1
-        line      = nil
-
-        while !line
-          stack = caller(i, increment)
-          raise "No non-lib lines in stack" unless stack
-
-          line = stack.find { |l| l !~ LIB_REGEX }
-
-          i         += increment
-          increment *= 2 # The choice of two here is arbitrary.
-        end
 
-        line
-      end
-    else
-      # Earlier rubies do not support the two argument form of `caller`. This
-      # fallback is logically the same, but slower.
-      def self.first_non_rspec_line
-        caller.find { |line| line !~ LIB_REGEX }
+  unless defined?(CallerFilter)
+
+    class CallerFilter
+
+      RSPEC_LIBS = %w[
+        core
+        mocks
+        expectations
+        matchers
+        rails
+      ]
+
+      ADDITIONAL_TOP_LEVEL_FILES = %w[ autorun ]
+
+      LIB_REGEX = %r{/lib/rspec/(#{(RSPEC_LIBS + ADDITIONAL_TOP_LEVEL_FILES).join('|')})(\.rb|/)}
+
+      if RUBY_VERSION >= '2.0.0'
+        def self.first_non_rspec_line
+          # `caller` is an expensive method that scales linearly with the size of
+          # the stack. The performance hit for fetching it in chunks is small,
+          # and since the target line is probably near the top of the stack, the
+          # overall improvement of a chunked search like this is significant.
+          #
+          # See benchmarks/caller.rb for measurements.
+
+          # Initial value here is mostly arbitrary, but is chosen to give good
+          # performance on the common case of creating a double.
+          increment = 5
+          i         = 1
+          line      = nil
+
+          while !line
+            stack = caller(i, increment)
+            return nil unless stack
+
+            line = stack.find { |l| l !~ LIB_REGEX }
+
+            i         += increment
+            increment *= 2 # The choice of two here is arbitrary.
+          end
+
+          line
+        end
+      else
+        # Earlier rubies do not support the two argument form of `caller`. This
+        # fallback is logically the same, but slower.
+        def self.first_non_rspec_line
+          caller.find { |line| line !~ LIB_REGEX }
+        end
       end
     end
+
   end
 end

data/lib/rspec/mocks/example_methods.rb

@@ -144,7 +144,7 @@ module RSpec
       def declare_double(declared_as, *args)
         args << {} unless Hash === args.last
         args.last[:__declared_as] = declared_as
-        RSpec::Mocks::Mock.new(*args)
+        RSpec::Mocks::Double.new(*args)
       end
 
       # This module exists to host the `expect` method for cases where

data/lib/rspec/mocks/matchers/have_received.rb

@@ -47,9 +47,11 @@ module RSpec
         private
 
         def expect
-          expectation = mock_proxy.build_expectation(@method_name)
-          apply_constraints_to expectation
-          expectation
+          @expect ||= begin
+            expectation = mock_proxy.build_expectation(@method_name)
+            apply_constraints_to expectation
+            expectation
+          end
         end
 
         def apply_constraints_to(expectation)

data/lib/rspec/mocks/message_expectation.rb

@@ -52,8 +52,8 @@ module RSpec
       # If the message is received more times than there are values, the last
       # value is received for every subsequent call.
       #
-      # The block format is still supported, but is unofficially deprecated in
-      # favor of just passing a block to the stub method.
+      # The block format is deprecated in favor of just passing a block to the
+      # stub method.
       #
       # @example
       #
@@ -69,11 +69,11 @@ module RSpec
       #   counter.count # => 3
       #   # etc
       #
-      #   # Supported, but ...
+      #   # Deprecated ...
       #   counter.stub(:count).and_return { 1 }
       #   counter.count # => 1
       #
-      #   # ... this is prefered
+      #   # ... use this instead
       #   counter.stub(:count) { 1 }
       #   counter.count # => 1
       def and_return(*values, &implementation)
@@ -84,9 +84,16 @@ module RSpec
         @expected_received_count = [@expected_received_count, values.size].max unless ignoring_args? || (@expected_received_count == 0 and @at_least)
 
         if implementation
-          # TODO: deprecate `and_return { value }`
+          RSpec.deprecate('`and_return { value }`',
+                          :replacement => '`and_return(value)` or an implementation block without `and_return`')
           self.inner_implementation_action = implementation
         else
+          if values.empty?
+            RSpec.warn_deprecation('`and_return` without arguments is deprecated. ' +
+                                   'Remove the `and_return`. ' +
+                                   "Called from #{CallerFilter.first_non_rspec_line}.")
+          end
+
           self.terminal_implementation_action = AndReturnImplementation.new(values)
         end
 
@@ -607,10 +614,27 @@ MSG
         end.last
       end
 
-      def arg_slice_for(args, arity)
-        if arity >= 0
-          args.slice(0, arity)
-        else
+      if RUBY_VERSION.to_f > 1.8
+        def arg_slice_for(args, arity)
+          if arity >= 0
+            args.slice(0, arity)
+          else
+            args
+          end
+        end
+      else
+        # 1.8.7's `arity` lies somtimes:
+        # Given:
+        #   def print_arity(&b) puts b.arity; end
+        #
+        # This prints 1:
+        #   print_arity { |a, b, c, &bl| }
+        #
+        # But this prints 3:
+        #   print_arity { |a, b, c| }
+        #
+        # Given that it lies, we can't trust it and we don't slice the args.
+        def arg_slice_for(args, arity)
           args
         end
       end

data/lib/rspec/mocks/mock.rb

@@ -1,7 +1,14 @@
 module RSpec
   module Mocks
-    class Mock
+    class Double
       include TestDouble
     end
+
+    def self.const_missing(name)
+      return super unless name == :Mock
+      RSpec.deprecate("RSpec::Mocks::Mock", :replacement => "RSpec::Mocks::Double")
+      Double
+    end
   end
 end
+

data/lib/rspec/mocks/mutate_const.rb

@@ -167,6 +167,9 @@ module RSpec
       #  so you can stub constants in other contexts (e.g. helper
       #  classes).
       def self.stub(constant_name, value, options = {})
+        space = RSpec::Mocks.space
+        space.print_out_of_example_deprecation if space.outside_example
+
         mutator = if recursive_const_defined?(constant_name, &raise_on_invalid_const)
           DefinedConstantReplacer
         else
@@ -187,6 +190,9 @@ module RSpec
       #  so you can hide constants in other contexts (e.g. helper
       #  classes).
       def self.hide(constant_name)
+        space = RSpec::Mocks.space
+        space.print_out_of_example_deprecation if space.outside_example
+
         return unless recursive_const_defined?(constant_name)
 
         mutate(ConstantHider.new(constant_name, nil, { }))

data/lib/rspec/mocks/proxy.rb

@@ -219,5 +219,12 @@ module RSpec
         method_double[method_name].stubs.find {|stub| stub.matches_name_but_not_args(method_name, *args)}
       end
     end
+
+    class TestDoubleProxy < Proxy
+      def reset
+        object.__warn_if_used_further!
+        super
+      end
+    end
   end
 end

data/lib/rspec/mocks/space.rb

@@ -2,11 +2,13 @@ module RSpec
   module Mocks
     # @api private
     class Space
-      attr_reader :proxies, :any_instance_recorders
+      attr_reader   :proxies, :any_instance_recorders
+      attr_accessor :outside_example
 
       def initialize
         @proxies                 = {}
         @any_instance_recorders  = {}
+        self.outside_example     = true
       end
 
       def verify_all
@@ -36,6 +38,7 @@ module RSpec
       end
 
       def any_instance_recorder_for(klass)
+        print_out_of_example_deprecation if outside_example
         id = klass.__id__
         any_instance_recorders.fetch(id) do
           any_instance_recorders[id] = AnyInstance::Recorder.new(klass)
@@ -51,6 +54,7 @@ module RSpec
       end
 
       def proxy_for(object)
+        print_out_of_example_deprecation if outside_example
         id = id_for(object)
         proxies.fetch(id) do
           proxies[id] = case object
@@ -68,6 +72,10 @@ module RSpec
         proxies.has_key?(id_for object)
       end
 
+      def print_out_of_example_deprecation
+        RSpec.deprecate("Using rspec-mocks doubles or partial doubles outside the per-test lifecycle (such as in a `before(:all)` hook)")
+      end
+
       if defined?(::BasicObject) && !::BasicObject.method_defined?(:__id__) # for 1.9.2
         require 'securerandom'
 

data/lib/rspec/mocks/stub_chain.rb

@@ -19,7 +19,7 @@ module RSpec
             chain.shift
             matching_stub.invoke(nil).stub_chain(*chain, &block)
           else
-            next_in_chain = Mock.new
+            next_in_chain = Double.new
             object.stub(chain.shift) { next_in_chain }
             StubChain.stub_chain_on(next_in_chain, *chain, &block)
           end

data/lib/rspec/mocks/test_double.rb

@@ -34,6 +34,7 @@ module RSpec
 
       # Returns true if this object has received `as_null_object`
       def null_object?
+        __warn_of_expired_use_if_expired
         @__null_object
       end
 
@@ -64,20 +65,21 @@ module RSpec
 
       # @private
       def __build_mock_proxy
-        proxy = Proxy.new(self, @name, @options || {})
-
-        if null_object?
-          proxy.as_null_object
-          RSpec.deprecate "Relying on a test double's null-ness to persist between examples"
-        end
-
+        proxy = TestDoubleProxy.new(self, @name, @options || {})
+        __warn_of_expired_use_if_expired
+        proxy.as_null_object if @__null_object
         proxy
       end
 
+      def __warn_if_used_further!
+        @__expired = true
+      end
+
     private
 
       def __initialize_as_test_double(name=nil, stubs_and_options={})
         @__null_object = false
+        @__expired     = false
 
         if name.is_a?(Hash) && stubs_and_options.empty?
           stubs_and_options = name
@@ -131,6 +133,12 @@ module RSpec
         end
       end
 
+      def __warn_of_expired_use_if_expired
+        if @__expired
+          RSpec.deprecate "Continuing to use a test double after it has been reset (e.g. in a subsequent example)"
+        end
+      end
+
     private
 
       def __mock_proxy

data/lib/rspec/mocks/version.rb

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

data/spec/rspec/mocks/and_return_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+module RSpec
+  module Mocks
+    describe 'and_return' do
+      let(:obj) { double('obj') }
+
+      context 'when no argument is passed' do
+        it 'warns of deprection' do
+          expect_warn_deprecation_with_call_site(__FILE__, __LINE__ + 1, '`and_return` without arguments')
+          obj.stub(:foo).and_return
+          expect(obj.foo).to be_nil
+        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 }
 

data/spec/rspec/mocks/any_instance_spec.rb

@@ -214,6 +214,8 @@ module RSpec
         end
 
         context "with a block" do
+          before { allow_unavoidable_1_8_deprecation }
+
           it "stubs a method" do
             klass.any_instance.stub(:foo) { 1 }
             expect(klass.new.foo).to eq(1)

data/spec/rspec/mocks/any_number_of_times_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "AnyNumberOfTimes" do
   before(:each) do
-    @mock = RSpec::Mocks::Mock.new("test mock")
+    @mock = RSpec::Mocks::Double.new("test mock")
     allow(RSpec).to receive(:deprecate)
   end
 

data/spec/rspec/mocks/before_all_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+describe "using rspec-mocks constructs in before(:all)" do
+  deprecations = []
+
+  def in_rspec_singleton_class(&block)
+    klass = class << ::RSpec; self; end
+    klass.class_eval(&block)
+  end
+
+  before(:all) do
+    in_rspec_singleton_class do
+      alias old_deprecate deprecate
+      undef deprecate
+      define_method(:deprecate) { |*args| deprecations << args.first }
+    end
+  end
+
+  after(:all) do
+    in_rspec_singleton_class do
+      undef deprecate
+      alias deprecate old_deprecate
+      undef old_deprecate
+    end
+  end
+
+  describe "a method stub" do
+    before(:all) do
+      deprecations.clear
+      Object.stub(:foo) { 13 }
+    end
+
+    it 'works in examples and prints a deprecation' do
+      expect(Object.foo).to eq(13)
+      expect(deprecations).to include(match(/outside the per-test lifecycle/))
+    end
+  end
+
+  describe "an any_instance stub" do
+    before(:all) do
+      deprecations.clear
+      Object.any_instance.stub(:foo => 13)
+    end
+
+    it 'works in examples and prints a deprecation' do
+      expect(Object.new.foo).to eq(13)
+      expect(deprecations).to include(match(/outside the per-test lifecycle/))
+    end
+  end
+
+  describe "constant stubbing" do
+    before(:all) do
+      deprecations.clear
+      RSpec::Mocks::ConstantMutator.stub("Foo23", 23)
+    end
+
+    it 'works in examples and prints a deprecation' do
+      expect(Foo23).to eq(23)
+      expect(deprecations).to include(match(/outside the per-test lifecycle/))
+    end
+  end
+
+  describe "constant hiding" do
+    before(:all) do
+      deprecations.clear
+      RSpec::Mocks::ConstantMutator.hide("SomeClass")
+    end
+
+    it 'works in examples and prints a deprecation' do
+      expect(deprecations).to include(match(/outside the per-test lifecycle/))
+    end
+  end
+end
+

data/spec/rspec/mocks/block_return_value_spec.rb

@@ -1,6 +1,17 @@
 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
@@ -83,7 +94,7 @@ describe "a double declaration with a block handed to:" do
     end
   end
 
-  %w[once twice ordered and_return].each do |method|
+  %w[once twice ordered].each do |method|
     describe method do
       it "returns the value of executing the block" do
         obj = Object.new
@@ -110,6 +121,48 @@ describe "a double declaration with a block handed to:" do
     end
   end
 
+  describe 'and_return' do
+    before do
+      allow_deprecation
+    end
+
+    it "returns the value of executing the block" do
+      obj = Object.new
+      obj.stub(:foo).and_return { 'bar' }
+      expect(obj.foo).to eq('bar')
+    end
+
+    it "does not complain if a lambda block and mismatched arguments are passed" do
+      obj = Object.new
+      obj.stub(:foo).and_return(&lambda { 'bar' })
+      expect(obj.foo(1, 2)).to eq('bar')
+    end
+
+    it 'warns of deprecation of `and_return { value }`' do
+      expect_deprecation_with_call_site(__FILE__, __LINE__ + 3, '`and_return { value }`')
+
+      obj = Object.new
+      obj.stub(:foo).and_return { 'bar' }
+      expect(obj.foo(1, 2)).to eq('bar')
+    end
+
+    it 'warns of deprection if argument counts dont match' do
+      warned = false
+
+      expect(RSpec).to receive(:deprecate).at_least(1) do |message, opts|
+        next unless message == "stubbing implementations with mismatched arity"
+        expect(opts[:call_site]).to match %r%/spec/rspec/mocks/block_return_value_spec.rb%
+        warned = true
+      end
+
+      obj = Object.new
+      obj.stub(:foo).and_return(&lambda { 'bar' })
+      expect(obj.foo(1, 2)).to eq('bar')
+
+      expect(warned).to be true
+    end
+  end
+
   describe 'any_number_of_times' do
     before do
       RSpec.stub(:deprecate)

data/spec/rspec/mocks/bug_report_10260_spec.rb

@@ -3,6 +3,6 @@ require 'spec_helper'
 describe "An RSpec Mock" do
   it "hides internals in its inspect representation" do
     m = double('cup')
-    expect(m.inspect).to match(/#<RSpec::Mocks::Mock:0x[a-f0-9.]+ @name="cup">/)
+    expect(m.inspect).to match(/#<RSpec::Mocks::Double:0x[a-f0-9.]+ @name="cup">/)
   end
 end

data/spec/rspec/mocks/combining_implementation_instructions_spec.rb

@@ -91,6 +91,8 @@ module RSpec
       end
 
       it 'can combine and_yield and and_return with a block' do
+        allow_deprecation
+
         dbl = double
         dbl.stub(:foo).and_yield(5).and_return { :return }
 

data/spec/rspec/mocks/double_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "double" do
   it "is an alias for stub and mock" do
-    expect(double()).to be_a(RSpec::Mocks::Mock)
+    expect(double()).to be_a(RSpec::Mocks::Double)
   end
 
   it "uses 'Double' in failure messages" do
@@ -28,4 +28,41 @@ describe "double" do
     expect(dbl.foo).to eq(2)
     expect { reset dbl }.not_to raise_error
   end
+
+  context "after it has been torn down" do
+    let(:dbl) { double }
+
+    before do
+      expect(dbl).to receive(:foo).at_least(:once)
+      allow(dbl).to receive(:bar)
+      dbl.foo
+
+      RSpec::Mocks.verify
+      RSpec::Mocks.teardown
+      RSpec::Mocks.setup
+    end
+
+    it 'warns when stubbing new methods (with receive)' do
+      expect_deprecation_with_call_site(__FILE__, __LINE__ + 1)
+      allow(dbl).to receive(:bazz).and_return(3)
+      expect(dbl.bazz).to eq(3)
+    end
+
+    it 'warns when mocking new methods' do
+      expect_deprecation_with_call_site(__FILE__, __LINE__ + 1)
+      expect(dbl).to receive(:bazz)
+      dbl.bazz
+    end
+
+    it 'warns when turned into a null object' do
+      expect_deprecation_with_call_site(__FILE__, __LINE__ + 1)
+      dbl.as_null_object
+      dbl.foo.bar.bazz.goo
+    end
+
+    it 'warns when checked for nullness' do
+      expect_deprecation_with_call_site(__FILE__, __LINE__ + 1)
+      dbl.null_object?
+    end
+  end
 end

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

@@ -178,6 +178,8 @@ module RSpec
       end
 
       describe "allow_any_instance_of(...).to receive" do
+        before { allow_unavoidable_1_8_deprecation }
+
         include_examples "an expect syntax allowance" do
           let(:klass)    { Class.new }
           let(:wrapped)  { allow_any_instance_of(klass) }
@@ -199,6 +201,8 @@ module RSpec
       end
 
       describe "expect_any_instance_of(...).to receive" do
+        before { allow_unavoidable_1_8_deprecation }
+
         include_examples "an expect syntax expectation", :does_not_report_line_num do
           let(:klass)    { Class.new }
           let(:wrapped)  { expect_any_instance_of(klass) }

data/spec/rspec/mocks/mock_space_spec.rb

@@ -9,6 +9,7 @@ module RSpec
       let(:dbl_2) { Object.new }
 
       before do
+        space.outside_example = false
         space.ensure_registered(dbl_1)
         space.ensure_registered(dbl_2)
       end

data/spec/rspec/mocks/mock_spec.rb

@@ -2,16 +2,35 @@ require 'spec_helper'
 
 module RSpec
   module Mocks
-    describe Mock do
+    describe "::Mock" do
+      before { allow_deprecation }
+
+      it 'returns a reference to Double' do
+        expect(RSpec::Mocks::Mock).to be(RSpec::Mocks::Double)
+      end
+
+      it 'prints a deprecation warning' do
+        expect_deprecation_with_call_site(__FILE__, __LINE__ + 1)
+        RSpec::Mocks::Mock
+      end
+
+      it 'does not clobber the normal const missing behavior' do
+        expect {
+          RSpec::Mocks::AZBYCX
+        }.to raise_error(NameError, /RSpec::Mocks::AZBYCX/)
+      end
+    end
+
+    describe Double do
       before(:each) { @double = double("test double") }
       after(:each)  { reset @double }
 
       it "has method_missing as private" do
-        expect(RSpec::Mocks::Mock.private_instance_methods).to include_method(:method_missing)
+        expect(RSpec::Mocks::Double.private_instance_methods).to include_method(:method_missing)
       end
 
       it "does not respond_to? method_missing (because it's private)" do
-        expect(RSpec::Mocks::Mock.new).not_to respond_to(:method_missing)
+        expect(RSpec::Mocks::Double.new).not_to respond_to(:method_missing)
       end
 
       it "reports line number of expectation of unreceived message" do
@@ -142,6 +161,7 @@ module RSpec
       end
 
       it "allows block to calculate return values" do
+        allow_deprecation
         @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"
         verify @double
@@ -631,7 +651,7 @@ module RSpec
       end
 
       it "assigns stub return values" do
-        double = RSpec::Mocks::Mock.new('name', :message => :response)
+        double = RSpec::Mocks::Double.new('name', :message => :response)
         expect(double.message).to eq :response
       end
 

data/spec/rspec/mocks/multiple_return_value_spec.rb

@@ -104,7 +104,7 @@ module RSpec
 
     describe "a message expectation with multiple return values with a specified count larger than the number of values" do
       before(:each) do
-        @double = RSpec::Mocks::Mock.new("double")
+        @double = RSpec::Mocks::Double.new("double")
         @double.should_receive(:do_something).exactly(3).times.and_return(11, 22)
       end
 

data/spec/rspec/mocks/null_object_mock_spec.rb

@@ -92,16 +92,11 @@ module RSpec
       it "preserves its nullness to subsequent examples to " +
          "maintain compatibility with <= 2.13" do
         RSpec::Mocks.teardown
+        RSpec::Mocks.setup
         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/options_hash_spec.rb

@@ -5,7 +5,7 @@ module RSpec
     describe "calling :should_receive with an options hash" do
       it "reports the file and line submitted with :expected_from" do
         begin
-          mock = RSpec::Mocks::Mock.new("a mock")
+          mock = RSpec::Mocks::Double.new("a mock")
           mock.should_receive(:message, :expected_from => "/path/to/blah.ext:37")
           verify mock
         rescue Exception => e
@@ -16,7 +16,7 @@ module RSpec
 
       it "uses the message supplied with :message" do
         expect {
-          m = RSpec::Mocks::Mock.new("a mock")
+          m = RSpec::Mocks::Double.new("a mock")
           m.should_receive(:message, :message => "recebi nada")
           verify m
         }.to raise_error("recebi nada")
@@ -24,7 +24,7 @@ module RSpec
 
       it "uses the message supplied with :message after a similar stub" do
         expect {
-          m = RSpec::Mocks::Mock.new("a mock")
+          m = RSpec::Mocks::Double.new("a mock")
           m.stub(:message)
           m.should_receive(:message, :message => "from mock")
           verify m

data/spec/rspec/mocks/space_spec.rb

@@ -5,6 +5,7 @@ module RSpec::Mocks
 
     describe "#proxies_of(klass)" do
       let(:space) { Space.new }
+      before { space.outside_example = false }
 
       it 'returns proxies' do
         space.proxy_for("")

data/spec/rspec/mocks/stub_chain_spec.rb

@@ -37,6 +37,18 @@ 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/stub_spec.rb

@@ -285,6 +285,7 @@ module RSpec
       end
 
       it "calculates return value by executing block passed to #and_return" do
+        allow_deprecation
         @stub.stub(:something).with("a","b","c").and_return { |a,b,c| c+b+a }
         expect(@stub.something("a","b","c")).to eq "cba"
         verify @stub

data/spec/rspec/mocks_spec.rb

@@ -2,6 +2,25 @@ require "spec_helper"
 
 describe RSpec::Mocks do
   describe "::setup" do
+    it "prints a deprecation warning when given a non-rspec host" do
+      o = Object.new
+      expect(RSpec).to receive(:deprecate).with(
+        "The host argument to `RSpec::Mocks.setup`",
+        :replacement=>"`include RSpec::Mocks::ExampleMethods` in #{o}"
+      )
+      RSpec::Mocks::setup(o)
+    end
+
+    it "prints the deprecation warning with the correct line" do
+      expect_deprecation_with_call_site(__FILE__, __LINE__ + 1)
+      RSpec::Mocks::setup(Object.new)
+    end
+
+    it "does not print a deprecation warning when self (the example group) is passed." do
+      expect(RSpec).not_to receive(:deprecate)
+      RSpec::Mocks::setup(self)
+    end
+
     context "with an existing Mock::Space" do
       before do
         @orig_space = RSpec::Mocks::space
@@ -12,20 +31,12 @@ describe RSpec::Mocks do
       end
 
       it "memoizes the space" do
-        RSpec::Mocks::setup(Object.new)
+        RSpec::Mocks::setup
         space = RSpec::Mocks::space
-        RSpec::Mocks::setup(Object.new)
+        RSpec::Mocks::setup
         expect(RSpec::Mocks::space).to equal(space)
       end
     end
-
-    context "with no pre-existing Mock::Space" do
-      it "initializes a Mock::Space" do
-        RSpec::Mocks::space = nil
-        RSpec::Mocks::setup(Object.new)
-        expect(RSpec::Mocks::space).not_to be_nil
-      end
-    end
   end
 
   describe "::verify" do
@@ -40,12 +51,11 @@ describe RSpec::Mocks do
 
   describe "::teardown" do
     it "delegates to the space" do
-      foo = double
-      foo.should_receive(:bar)
-      RSpec::Mocks::teardown
-      expect do
-        foo.bar
-      end.to raise_error(/received unexpected message/)
+      foo = "foo"
+      foo.stub(:reverse) { "reversed" }
+      RSpec::Mocks.teardown
+      RSpec::Mocks.setup
+      expect(foo.reverse).to eq("oof")
     end
   end
 

data/spec/spec_helper.rb

@@ -20,18 +20,29 @@ 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)
+  def expect_deprecation_with_call_site(file, line, snippet=//)
     expect(RSpec.configuration.reporter).to receive(:deprecation) do |options|
       expect(options[:call_site]).to include([file, line].join(':'))
+      expect(options[:deprecated]).to match(snippet)
+    end
+  end
+
+  def expect_warn_deprecation_with_call_site(file, line, snippet=//)
+    expect(RSpec.configuration.reporter).to receive(:deprecation) do |options|
+      message = options[:message]
+      expect(message).to match(snippet)
+      expect(message).to include([file, line].join(':'))
     end
   end
 
   def allow_deprecation
     allow(RSpec.configuration.reporter).to receive(:deprecation)
   end
+
+  def allow_unavoidable_1_8_deprecation
+    allow_deprecation if RUBY_VERSION.to_f < 1.9
+  end
 end
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks
 version: !ruby/object:Gem::Version
-  version: 2.99.0.beta1
+  version: 2.99.0.beta2
+  prerelease: 7
 platform: ruby
 authors:
 - Steven Baker
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -28,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -42,6 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -49,6 +55,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -140,6 +147,7 @@ files:
 - features/support/rubinius.rb
 - features/test_frameworks/test_unit.feature
 - spec/rspec/mocks/and_call_original_spec.rb
+- spec/rspec/mocks/and_return_spec.rb
 - spec/rspec/mocks/and_yield_spec.rb
 - spec/rspec/mocks/any_instance/message_chains_spec.rb
 - spec/rspec/mocks/any_instance_spec.rb
@@ -147,6 +155,7 @@ files:
 - spec/rspec/mocks/argument_expectation_spec.rb
 - spec/rspec/mocks/at_least_spec.rb
 - spec/rspec/mocks/at_most_spec.rb
+- spec/rspec/mocks/before_all_spec.rb
 - spec/rspec/mocks/block_return_value_spec.rb
 - spec/rspec/mocks/bug_report_10260_spec.rb
 - spec/rspec/mocks/bug_report_10263_spec.rb
@@ -198,28 +207,32 @@ files:
 homepage: http://github.com/rspec/rspec-mocks
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1858263502933685358
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: rspec
-rubygems_version: 2.0.7
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
-summary: rspec-mocks-2.99.0.beta1
+specification_version: 3
+summary: rspec-mocks-2.99.0.beta2
 test_files:
 - features/README.md
 - features/Scope.md
@@ -260,6 +273,7 @@ test_files:
 - features/support/rubinius.rb
 - features/test_frameworks/test_unit.feature
 - spec/rspec/mocks/and_call_original_spec.rb
+- spec/rspec/mocks/and_return_spec.rb
 - spec/rspec/mocks/and_yield_spec.rb
 - spec/rspec/mocks/any_instance/message_chains_spec.rb
 - spec/rspec/mocks/any_instance_spec.rb
@@ -267,6 +281,7 @@ test_files:
 - spec/rspec/mocks/argument_expectation_spec.rb
 - spec/rspec/mocks/at_least_spec.rb
 - spec/rspec/mocks/at_most_spec.rb
+- spec/rspec/mocks/before_all_spec.rb
 - spec/rspec/mocks/block_return_value_spec.rb
 - spec/rspec/mocks/bug_report_10260_spec.rb
 - spec/rspec/mocks/bug_report_10263_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OThjNzA2ZTdkZmU2MWE5OWVhMzIzMjI4NjZkNGNlY2QwZTY1ZDMyYQ==
-  data.tar.gz: !binary |-
-    OGY4OTQwMGY4NTZhMGEzMmVhY2NlODAzZTYxMWMyNWFmZjVjMWIwYg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    Njc3ODhhZTYxMzMyNWU3MzIxM2MzMTdjNWQ0N2Q4MWNiNTIyZDYwNGIzZjI4
-    NzRmZjk1YjYzNDExMmZkYWNiM2E4NjQ0ZWVkOWM4MGU2NzNiMjNlYjY4ZWEw
-    Zjg5ZDNkOTY0NGNkOTUxZjc1NWM3MDcyM2Y1NThjNDgwNDI1YjQ=
-  data.tar.gz: !binary |-
-    MGIzMGMxYzg2OTE4NzY1NzA5ZTM4MDIxZmRhZDQ1NjM0OWE0YjIwOWQ3MTFj
-    YWFiYzQwNGRhMDEzNTc2YWVlNzYyMDcwNTNiZGU5MWE4NmZiMzc4MGYzNzQ5
-    NWM1YjA3OTBmMzg5Njk1MWZkZDFjNmUxNDc4ODA5Y2NiMTAyNGQ=