rspec-mocks 2.13.1 → 2.14.0.rc1

data/spec/rspec/mocks/serialization_spec.rb

@@ -2,22 +2,10 @@ require 'spec_helper'
 
 module RSpec
   module Mocks
-    describe Serialization do
+    describe "Serialization of mocked objects" do
 
       class SerializableObject < Struct.new(:foo, :bar); end
 
-      class SerializableMockProxy
-        attr_reader :mock_proxy
-
-        def initialize(mock_proxy)
-          @mock_proxy = mock_proxy
-        end
-
-        def ==(other)
-          other.class == self.class && other.mock_proxy == mock_proxy
-        end
-      end
-
       def self.with_yaml_loaded(&block)
         context 'with YAML loaded' do
           module_eval(&block)
@@ -96,15 +84,6 @@ module RSpec
       it 'marshals the same with and without stubbing' do
         expect { set_stub }.to_not change { Marshal.dump(serializable_object) }
       end
-
-      describe "an object that has its own mock_proxy instance variable" do
-        let(:serializable_object) { RSpec::Mocks::SerializableMockProxy.new(:my_mock_proxy) }
-
-        it 'does not interfere with its marshalling' do
-          marshalled_copy = Marshal.load(Marshal.dump(serializable_object))
-          expect(marshalled_copy).to eq serializable_object
-        end
-      end
     end
   end
 end

data/spec/rspec/mocks/stash_spec.rb

@@ -18,22 +18,14 @@ module RSpec
 
         klass.foo(:fizbaz)
         klass.foo(:bazbar)
-        klass.rspec_verify
+        verify klass
 
-        klass.rspec_reset
+        reset klass
         expect(klass.foo(:yeah)).to equal(:original_value)
       end
     end
 
     describe "when a class method is aliased on a subclass and the method is mocked" do
-      let(:klass) do
-        Class.new do
-          class << self
-            alias alternate_new new
-          end
-        end
-      end
-
       it "restores the original aliased public method" do
         klass = Class.new do
           class << self
@@ -44,9 +36,9 @@ module RSpec
         klass.should_receive(:alternate_new)
         expect(klass.alternate_new).to be_nil
 
-        klass.rspec_verify
+        verify klass
 
-        klass.rspec_reset
+        reset klass
         expect(klass.alternate_new).to be_an_instance_of(klass)
       end
     end

data/spec/rspec/mocks/stub_implementation_spec.rb

@@ -5,7 +5,7 @@ module RSpec
     describe "stub implementation" do
       describe "with no args" do
         it "execs the block when called" do
-          obj = stub()
+          obj = double()
           obj.stub(:foo) { :bar }
           expect(obj.foo).to eq :bar
         end
@@ -13,7 +13,7 @@ module RSpec
 
       describe "with one arg" do
         it "execs the block with that arg when called" do
-          obj = stub()
+          obj = double()
           obj.stub(:foo) {|given| given}
           expect(obj.foo(:bar)).to eq :bar
         end
@@ -21,7 +21,7 @@ module RSpec
 
       describe "with variable args" do
         it "execs the block when called" do
-          obj = stub()
+          obj = double()
           obj.stub(:foo) {|*given| given.first}
           expect(obj.foo(:bar)).to eq :bar
         end

data/spec/rspec/mocks/stub_spec.rb

@@ -29,13 +29,37 @@ module RSpec
         @stub = Object.new
       end
 
-      [:stub!, :stub].each do |method|
-        describe "using #{method}" do
-          it "returns declared value when message is received" do
-            @instance.send(method, :msg).and_return(:return_value)
-            expect(@instance.msg).to equal(:return_value)
-            @instance.rspec_verify
-          end
+      describe "using stub" do
+        it "returns declared value when message is received" do
+          @instance.stub(:msg).and_return(:return_value)
+          expect(@instance.msg).to equal(:return_value)
+          verify @instance
+        end
+      end
+
+      describe "using stub!" do
+        it "warns of deprecation but still returns the declared value when message is received" do
+          expect(RSpec).to receive(:deprecate).with("stub!", :replacement => "stub")
+          @instance.stub!(:msg).and_return(:return_value)
+          expect(@instance.msg).to equal(:return_value)
+          verify @instance
+        end
+      end
+
+      describe 'using unstub' do
+        it 'removes the message stub' do
+          @instance.stub(:msg)
+          @instance.unstub(:msg)
+          expect { @instance.msg }.to raise_error NoMethodError
+        end
+      end
+
+      describe 'using unstub!' do
+        it 'removes the message stub but warns about deprecation' do
+          @instance.stub(:msg)
+          RSpec.should_receive(:deprecate).with("unstub!", :replacement => "unstub")
+          @instance.unstub!(:msg)
+          expect { @instance.msg }.to raise_error NoMethodError
         end
       end
 
@@ -53,7 +77,7 @@ module RSpec
         @instance.stub(:msg)
         @instance.msg
         expect do
-          @instance.rspec_verify
+          verify @instance
         end.not_to raise_error
       end
 
@@ -61,14 +85,14 @@ module RSpec
         @instance.stub(:msg)
         @instance.msg(:an_arg)
         expect do
-          @instance.rspec_verify
+          verify @instance
         end.not_to raise_error
       end
 
       it "ignores when expected message is not received" do
         @instance.stub(:msg)
         expect do
-          @instance.rspec_verify
+          verify @instance
         end.not_to raise_error
       end
 
@@ -81,35 +105,35 @@ module RSpec
       describe "#rspec_reset" do
         it "removes stubbed methods that didn't exist" do
           @instance.stub(:non_existent_method)
-          @instance.rspec_reset
+          reset @instance
           expect(@instance).not_to respond_to(:non_existent_method)
         end
 
         it "restores existing instance methods" do
           # See bug reports 8302 adn 7805
           @instance.stub(:existing_instance_method) { :stub_value }
-          @instance.rspec_reset
+          reset @instance
           expect(@instance.existing_instance_method).to eq(:original_value)
         end
 
         it "restores existing private instance methods" do
           # See bug reports 8302 adn 7805
           @instance.stub(:existing_private_instance_method) { :stub_value }
-          @instance.rspec_reset
+          reset @instance
           expect(@instance.send(:existing_private_instance_method)).to eq(:original_value)
         end
 
         it "restores existing class methods" do
           # See bug reports 8302 adn 7805
           @class.stub(:existing_class_method) { :stub_value }
-          @class.rspec_reset
+          reset @class
           expect(@class.existing_class_method).to eq(:original_value)
         end
 
         it "restores existing private class methods" do
           # See bug reports 8302 adn 7805
           @class.stub(:existing_private_class_method) { :stub_value }
-          @class.rspec_reset
+          reset @class
           expect(@class.send(:existing_private_class_method)).to eq(:original_value)
         end
 
@@ -117,7 +141,7 @@ module RSpec
           @instance.stub(:existing_instance_method)
           @instance.stub(:existing_instance_method)
 
-          @instance.rspec_reset
+          reset @instance
 
           expect(@instance.existing_instance_method).to eq(:original_value)
         end
@@ -136,7 +160,7 @@ module RSpec
           expect(mod.hello).to eq(:hello)
 
           mod.stub(:hello) { :stub }
-          mod.rspec_reset
+          reset mod
 
           expect(mod.hello).to eq(:hello)
         end
@@ -163,7 +187,7 @@ module RSpec
         current_value = :value_before
         @instance.method_that_yields {|val| current_value = val}
         expect(current_value).to eq :yielded_obj
-        @instance.rspec_verify
+        verify @instance
       end
 
       it "yields multiple times with multiple calls to and_yield" do
@@ -172,7 +196,7 @@ module RSpec
         current_value = []
         @instance.method_that_yields_multiple_times {|val| current_value << val}
         expect(current_value).to eq [:yielded_value, :another_value]
-        @instance.rspec_verify
+        verify @instance
       end
 
       it "yields a specified object and return another specified object" do
@@ -213,7 +237,7 @@ module RSpec
       it "calculates return value by executing block passed to #and_return" do
         @stub.stub(:something).with("a","b","c").and_return { |a,b,c| c+b+a }
         expect(@stub.something("a","b","c")).to eq "cba"
-        @stub.rspec_verify
+        verify @stub
       end
     end
 

data/spec/rspec/mocks/stubbed_message_expectations_spec.rb

@@ -5,7 +5,7 @@ describe "expection set on previously stubbed method" do
     double = double(:msg => nil)
     double.msg
     double.should_receive(:msg)
-    expect { double.rspec_verify }.to raise_error(RSpec::Mocks::MockExpectationError)
+    expect { verify double }.to raise_error(RSpec::Mocks::MockExpectationError)
   end
 
   it "outputs arguments of similar calls" do
@@ -14,9 +14,9 @@ describe "expection set on previously stubbed method" do
     double.foo('second')
     double.foo('third')
     expect {
-      double.rspec_verify
+      verify double
     }.to raise_error(%Q|Double "double" received :foo with unexpected arguments\n  expected: ("first")\n       got: ("second"), ("third")|)
-    double.rspec_reset
+    reset double
   end
 
   context "with argument constraint on stub" do
@@ -25,7 +25,7 @@ describe "expection set on previously stubbed method" do
       double.stub(:foo).with(3).and_return("stub")
       double.should_receive(:foo).at_least(:once).and_return("expectation")
       double.foo
-      double.rspec_verify
+      verify double
     end
 
     it "matches specific args set on expectation" do
@@ -33,7 +33,7 @@ describe "expection set on previously stubbed method" do
       double.stub(:foo).with(3).and_return("stub")
       double.should_receive(:foo).at_least(:once).with(4).and_return("expectation")
       double.foo(4)
-      double.rspec_verify
+      verify double
     end
 
     it "fails if expectation's arg constraint is not met" do
@@ -41,7 +41,7 @@ describe "expection set on previously stubbed method" do
       double.stub(:foo).with(3).and_return("stub")
       double.should_receive(:foo).at_least(:once).with(4).and_return("expectation")
       double.foo(3)
-      expect { double.rspec_verify }.to raise_error(/expected: \(4\)\s+got: \(3\)/)
+      expect { verify double }.to raise_error(/expected: \(4\)\s+got: \(3\)/)
     end
 
     it 'distinguishes between individual values and arrays properly' do

data/spec/rspec/mocks/twice_counts_spec.rb

@@ -11,21 +11,21 @@ module RSpec
         @double.should_receive(:do_something).twice
         @double.do_something
         @double.do_something
-        @double.rspec_verify
+        verify @double
       end
 
       it "passes when called twice with specified args" do
         @double.should_receive(:do_something).twice.with("1", 1)
         @double.do_something("1", 1)
         @double.do_something("1", 1)
-        @double.rspec_verify
+        verify @double
       end
 
       it "passes when called twice with unspecified args" do
         @double.should_receive(:do_something).twice
         @double.do_something("1")
         @double.do_something(1)
-        @double.rspec_verify
+        verify @double
       end
 
       it "fails fast when call count is higher than expected" do
@@ -41,7 +41,7 @@ module RSpec
         @double.should_receive(:do_something).twice
         @double.do_something
         expect {
-          @double.rspec_verify
+          verify @double
         }.to raise_error(RSpec::Mocks::MockExpectationError)
       end
 
@@ -50,7 +50,7 @@ module RSpec
         expect {
           @double.do_something(1, "1")
         }.to raise_error(RSpec::Mocks::MockExpectationError)
-        @double.rspec_reset
+        reset @double
       end
 
       it "fails when called with wrong args on the second call" do
@@ -59,7 +59,7 @@ module RSpec
         expect {
           @double.do_something(1, "1")
         }.to raise_error(RSpec::Mocks::MockExpectationError)
-        @double.rspec_reset
+        reset @double
       end
     end
   end

data/spec/rspec/mocks_spec.rb

@@ -58,9 +58,7 @@ describe RSpec::Mocks do
 
   context 'when requiring spec/mocks (as was valid for rspec 1)' do
     it 'prints a deprecation warning' do
-      ::RSpec::Mocks.should_receive(:warn_deprecation).
-        with(%r|spec/mocks|)
-
+      expect(::RSpec).to receive(:deprecate).with("require 'spec/mocks'", :replacement => "require 'rspec/mocks'")
       load "spec/mocks.rb"
     end
   end

data/spec/spec_helper.rb

@@ -10,11 +10,20 @@ RSpec::Matchers.define :include_method do |expected|
   end
 end
 
+module VerifyAndResetHelpers
+  def verify(object)
+    RSpec::Mocks.proxy_for(object).verify
+  end
+
+  def reset(object)
+    RSpec::Mocks.proxy_for(object).reset
+  end
+end
+
 RSpec.configure do |config|
   config.mock_with :rspec
   config.color_enabled = true
   config.order = :random
-  config.include(RSpec::Mocks::Methods)
   config.run_all_when_everything_filtered = true
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.filter_run_including :focus
@@ -32,5 +41,20 @@ RSpec.configure do |config|
   config.after(:each, :silence_warnings) do
     $VERBOSE = old_verbose
   end
+
+  config.include VerifyAndResetHelpers
+end
+
+shared_context "with syntax" do |syntax|
+  orig_syntax = nil
+
+  before(:all) do
+    orig_syntax = RSpec::Mocks.configuration.syntax
+    RSpec::Mocks.configuration.syntax = syntax
+  end
+
+  after(:all) do
+    RSpec::Mocks.configuration.syntax = orig_syntax
+  end
 end
 

metadata

@@ -1,81 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rspec-mocks
-version: !ruby/object:Gem::Version 
-  hash: 57
-  prerelease: 
-  segments: 
-  - 2
-  - 13
-  - 1
-  version: 2.13.1
+version: !ruby/object:Gem::Version
+  prerelease: 7
+  version: 2.14.0.rc1
 platform: ruby
-authors: 
+authors:
 - Steven Baker
 - David Chelimsky
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+date: 2013-05-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 79
-        segments: 
-        - 10
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 10.0.0
+    none: false
   prerelease: false
-  type: :development
   name: rake
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.0
     none: false
-    requirements: 
+  type: :development
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 1
-        - 9
+      - !ruby/object:Gem::Version
         version: 1.1.9
+    none: false
   prerelease: false
-  type: :development
   name: cucumber
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.9
     none: false
-    requirements: 
+  type: :development
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 5
-        version: "0.5"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    none: false
   prerelease: false
-  type: :development
   name: aruba
-  requirement: *id003
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    none: false
+  type: :development
 description: RSpec's 'test double' framework, with support for stubbing and mocking
 email: rspec-users@rubyforge.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/rspec/mocks.rb
-- lib/rspec/mocks/any_instance.rb
 - lib/rspec/mocks/any_instance/chain.rb
 - lib/rspec/mocks/any_instance/expectation_chain.rb
 - lib/rspec/mocks/any_instance/message_chains.rb
@@ -85,24 +76,28 @@ files:
 - lib/rspec/mocks/argument_list_matcher.rb
 - lib/rspec/mocks/argument_matchers.rb
 - lib/rspec/mocks/configuration.rb
+- lib/rspec/mocks/deprecation.rb
 - lib/rspec/mocks/error_generator.rb
 - lib/rspec/mocks/errors.rb
 - lib/rspec/mocks/example_methods.rb
 - lib/rspec/mocks/extensions/instance_exec.rb
 - lib/rspec/mocks/extensions/marshal.rb
-- lib/rspec/mocks/extensions/psych.rb
 - lib/rspec/mocks/framework.rb
 - lib/rspec/mocks/instance_method_stasher.rb
+- lib/rspec/mocks/matchers/have_received.rb
+- lib/rspec/mocks/matchers/receive.rb
 - lib/rspec/mocks/message_expectation.rb
 - lib/rspec/mocks/method_double.rb
-- lib/rspec/mocks/methods.rb
 - lib/rspec/mocks/mock.rb
 - lib/rspec/mocks/mutate_const.rb
 - lib/rspec/mocks/order_group.rb
 - lib/rspec/mocks/proxy.rb
-- lib/rspec/mocks/serialization.rb
+- lib/rspec/mocks/proxy_for_nil.rb
 - lib/rspec/mocks/space.rb
 - lib/rspec/mocks/standalone.rb
+- lib/rspec/mocks/stub_chain.rb
+- lib/rspec/mocks/syntax.rb
+- lib/rspec/mocks/targets.rb
 - lib/rspec/mocks/test_double.rb
 - lib/rspec/mocks/version.rb
 - lib/spec/mocks.rb
@@ -122,7 +117,8 @@ files:
 - features/message_expectations/any_instance.feature
 - features/message_expectations/block_local_expectations.feature.pending
 - features/message_expectations/call_original.feature
-- features/message_expectations/expect_message.feature
+- features/message_expectations/expect_message_using_expect.feature
+- features/message_expectations/expect_message_using_should_receive.feature
 - features/message_expectations/receive_counts.feature
 - features/message_expectations/warn_when_expectation_is_set_on_nil.feature
 - features/method_stubs/README.md
@@ -138,8 +134,12 @@ files:
 - features/mutating_constants/stub_undefined_constant.feature
 - features/outside_rspec/configuration.feature
 - features/outside_rspec/standalone.feature
+- features/spies/spy_partial_mock_method.feature
+- features/spies/spy_pure_mock_method.feature
+- features/spies/spy_unstubbed_method.feature
 - features/step_definitions/additional_cli_steps.rb
 - features/support/env.rb
+- features/test_frameworks/test_unit.feature
 - spec/rspec/mocks/and_call_original_spec.rb
 - spec/rspec/mocks/and_yield_spec.rb
 - spec/rspec/mocks/any_instance/message_chains_spec.rb
@@ -158,13 +158,15 @@ files:
 - spec/rspec/mocks/bug_report_8165_spec.rb
 - spec/rspec/mocks/bug_report_830_spec.rb
 - spec/rspec/mocks/bug_report_957_spec.rb
-- spec/rspec/mocks/combining_implementation_instructions_spec.rb
 - spec/rspec/mocks/configuration_spec.rb
 - spec/rspec/mocks/double_spec.rb
 - spec/rspec/mocks/failing_argument_matchers_spec.rb
 - spec/rspec/mocks/hash_excluding_matcher_spec.rb
 - spec/rspec/mocks/hash_including_matcher_spec.rb
 - spec/rspec/mocks/instance_method_stasher_spec.rb
+- spec/rspec/mocks/matchers/have_received_spec.rb
+- spec/rspec/mocks/matchers/receive_spec.rb
+- spec/rspec/mocks/methods_spec.rb
 - spec/rspec/mocks/mock_ordering_spec.rb
 - spec/rspec/mocks/mock_space_spec.rb
 - spec/rspec/mocks/mock_spec.rb
@@ -191,39 +193,35 @@ files:
 - spec/rspec/mocks_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/rspec/rspec-mocks
-licenses: 
+licenses:
 - MIT
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1552323332526866969
+  none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
 requirements: []
-
 rubyforge_project: rspec
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.13.1
-test_files: 
+summary: rspec-mocks-2.14.0.rc1
+test_files:
 - features/README.md
 - features/Scope.md
 - features/Upgrade.md
@@ -235,7 +233,8 @@ test_files:
 - features/message_expectations/any_instance.feature
 - features/message_expectations/block_local_expectations.feature.pending
 - features/message_expectations/call_original.feature
-- features/message_expectations/expect_message.feature
+- features/message_expectations/expect_message_using_expect.feature
+- features/message_expectations/expect_message_using_should_receive.feature
 - features/message_expectations/receive_counts.feature
 - features/message_expectations/warn_when_expectation_is_set_on_nil.feature
 - features/method_stubs/README.md
@@ -251,8 +250,12 @@ test_files:
 - features/mutating_constants/stub_undefined_constant.feature
 - features/outside_rspec/configuration.feature
 - features/outside_rspec/standalone.feature
+- features/spies/spy_partial_mock_method.feature
+- features/spies/spy_pure_mock_method.feature
+- features/spies/spy_unstubbed_method.feature
 - features/step_definitions/additional_cli_steps.rb
 - features/support/env.rb
+- features/test_frameworks/test_unit.feature
 - spec/rspec/mocks/and_call_original_spec.rb
 - spec/rspec/mocks/and_yield_spec.rb
 - spec/rspec/mocks/any_instance/message_chains_spec.rb
@@ -271,13 +274,15 @@ test_files:
 - spec/rspec/mocks/bug_report_8165_spec.rb
 - spec/rspec/mocks/bug_report_830_spec.rb
 - spec/rspec/mocks/bug_report_957_spec.rb
-- spec/rspec/mocks/combining_implementation_instructions_spec.rb
 - spec/rspec/mocks/configuration_spec.rb
 - spec/rspec/mocks/double_spec.rb
 - spec/rspec/mocks/failing_argument_matchers_spec.rb
 - spec/rspec/mocks/hash_excluding_matcher_spec.rb
 - spec/rspec/mocks/hash_including_matcher_spec.rb
 - spec/rspec/mocks/instance_method_stasher_spec.rb
+- spec/rspec/mocks/matchers/have_received_spec.rb
+- spec/rspec/mocks/matchers/receive_spec.rb
+- spec/rspec/mocks/methods_spec.rb
 - spec/rspec/mocks/mock_ordering_spec.rb
 - spec/rspec/mocks/mock_space_spec.rb
 - spec/rspec/mocks/mock_spec.rb