rspec-mocks 3.0.0.beta1 → 3.0.0.beta2

data/spec/rspec/mocks/verifying_message_expecation_spec.rb

@@ -21,18 +21,19 @@ module RSpec
 
         describe 'when arity match fails' do
           it 'raises error' do
+            args = ["abc123", "xyz987"]
             subject.method_reference = InstanceMethodReference.new(string_module_reference, :replace)
-            expect(error_generator).to receive(:raise_arity_error).
-              with(instance_of(ArityCalculator), 2)
+            expect(error_generator).to receive(:raise_invalid_arguments_error).
+              with(instance_of(MethodSignatureVerifier))
 
-            subject.with("abc123", "xyz987")
+            subject.with(*args)
           end
         end
 
         describe 'when called with arguments' do
           it 'matches arity against the number of arguments' do
             subject.method_reference = InstanceMethodReference.new(string_module_reference, :replace)
-            expect(error_generator).not_to receive(:raise_arity_error)
+            expect(error_generator).not_to receive(:raise_invalid_arguments_error)
 
             subject.with("abc123")
           end
@@ -48,8 +49,8 @@ module RSpec
         describe 'when called with no arguments matcher' do
           it 'matches arity to 0' do
             subject.method_reference = InstanceMethodReference.new(string_module_reference, :replace)
-            expect(error_generator).to receive(:raise_arity_error).
-              with(instance_of(ArityCalculator), 0)
+            expect(error_generator).to receive(:raise_invalid_arguments_error).
+              with(instance_of(MethodSignatureVerifier))
 
             subject.with(no_args)
           end

data/spec/rspec/mocks_spec.rb

@@ -1,51 +1,50 @@
 require "spec_helper"
 
 describe RSpec::Mocks do
-  describe "::setup" do
-    context "with an existing Mock::Space" do
-      before do
-        @orig_space = RSpec::Mocks::space
-      end
-
-      after do
-        RSpec::Mocks::space = @orig_space
-      end
-
-      it "memoizes the space" do
-        RSpec::Mocks::setup(Object.new)
-        space = RSpec::Mocks::space
-        RSpec::Mocks::setup(Object.new)
-        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
+  describe ".verify" do
     it "delegates to the space" do
       foo = double
       foo.should_receive(:bar)
       expect do
-        RSpec::Mocks::verify
+        RSpec::Mocks.verify
       end.to raise_error(RSpec::Mocks::MockExpectationError)
+
+      RSpec::Mocks.teardown # so the mocks aren't re-verified after this example
     end
   end
 
-  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/)
+  describe ".teardown" do
+    it "resets method stubs" do
+      string = "foo"
+      allow(string).to receive(:bar)
+      RSpec::Mocks.teardown
+      expect { string.bar }.to raise_error(NoMethodError)
+    end
+
+    it "does not put rspec-mocks into an inconsistent state when called extra times" do
+      RSpec::Mocks.teardown
+      RSpec::Mocks.teardown
+      RSpec::Mocks.teardown
+
+      string = "foo"
+      expect { allow(string).to receive(:bar) }.to raise_error(RSpec::Mocks::OutsideOfExampleError)
+
+      RSpec::Mocks.setup
+      allow(string).to receive(:bar).and_return(:baz)
+      expect(string.bar).to eq(:baz)
+    end
+  end
+
+  describe ".setup" do
+    it 'starts a new space scope that is later removed by .teardown' do
+      old_space = RSpec::Mocks.space
+      RSpec::Mocks.setup
+
+      new_space = RSpec::Mocks.space
+      expect(new_space).not_to equal(old_space)
+
+      RSpec::Mocks.teardown
+      expect(RSpec::Mocks.space).to equal(old_space)
     end
   end
 
@@ -56,11 +55,138 @@ describe RSpec::Mocks do
     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)
+  describe ".with_temporary_scope" do
+    context "in a before(:all) with a stubbed double" do
+      before(:all) do
+        RSpec::Mocks.with_temporary_scope do
+          @calculator = double
+          allow(@calculator).to receive(:add) { |a, b| a + b }
+          @sum = @calculator.add(3, 4)
+        end
+
+        capture_error { @calculator.add(1, 10) }
+      end
+
+      it 'allows the stubbed double to be used' do
+        expect(@sum).to eq(7)
+      end
+
+      it 'does not allow the double to be used in the examples' do
+        expect {
+          @calculator.add(1, 2)
+        }.to raise_error(RSpec::Mocks::ExpiredTestDoubleError)
+      end
+
+      it 'does not allow the double to be used after the scope in before(:all)' do
+        expect(@error).to be_a(RSpec::Mocks::OutsideOfExampleError)
+      end
+    end
+
+    context "in a before(:all) with a stubbed const" do
+      before(:all) do
+        RSpec::Mocks.with_temporary_scope do
+          stub_const("ValueX", 3)
+          stub_const("ValueY", 4)
+          @sum = ValueX + ValueY
+        end
+
+        capture_error { ValueX + ValueY }
+      end
+
+      it 'allows the stubbed constants to be used' do
+        expect(@sum).to eq(7)
+      end
+
+      it 'does not allow the stubbed constants to be used in the examples' do
+        expect(defined?(ValueX)).to be_falsey
+        expect(defined?(ValueY)).to be_falsey
+      end
+
+      it 'does not allow the stubbed constants to be used after the scope in before(:all)' do
+        expect(@error).to be_a(NameError)
+        expect(@error.message).to include("ValueX")
+      end
+    end
+
+    context "in a before(:all) with a unmet mock expectation" do
+      before(:all) do
+        capture_error do
+          RSpec::Mocks.with_temporary_scope do
+            calculator = double
+            expect(calculator).to receive(:add)
+          end
+        end
+      end
+
+      it 'fails with a mock expectation error' do
+        expect(@error).to be_a(RSpec::Mocks::MockExpectationError)
+      end
+    end
+
+    context "in a before(:all) with an any_instance stub" do
+      before(:all) do
+        RSpec::Mocks.with_temporary_scope do
+          allow_any_instance_of(String).to receive(:sum_with) { |val, x| val + x }
+          @sum = "foo".sum_with("bar")
+        end
+
+        capture_error { "you".sum_with("me") }
+      end
+
+      it 'allows the stub to be used' do
+        expect(@sum).to eq("foobar")
+      end
+
+      it 'does not allow the double to be used in the examples' do
+        expect {
+          "foo".sum_with("baz")
+        }.to raise_error(NameError, /sum_with/)
+      end
+
+      it 'does not allow the double to be used after the scope in before(:all)' do
+        expect(@error).to be_a(NameError)
+        expect(@error.message).to include("sum_with")
+      end
+    end
+
+    it 'tears down even if an error occurs' do
+      foo = Object.new
+
+      expect {
+        RSpec::Mocks.with_temporary_scope do
+          allow(foo).to receive(:bar)
+          raise "boom"
+        end
+      }.to raise_error("boom")
+
+      expect(foo).not_to respond_to(:bar)
+    end
+
+    it 'does not verify if an error occurs before the block completes' do
+      expect {
+        RSpec::Mocks.with_temporary_scope do
+          foo   = Object.new
+          expect(foo).to receive(:bar)
+          raise "boom"
+        end
+      }.to raise_error("boom") # rather than MockExpectationError
+    end
+
+    def capture_error
+      yield
+    rescue Exception => @error
+    end
   end
 
+  context "when there is a `let` declaration that overrides an argument matcher" do
+    let(:boolean) { :from_let }
+
+    before do
+      expect(RSpec::Mocks::ArgumentMatchers.method_defined?(:boolean)).to be true
+    end
+
+    it 'allows the `let` definition to win' do
+      expect(boolean).to eq(:from_let)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,18 +1,16 @@
+require 'rspec/support/spec'
+require 'rspec/mocks/ruby_features'
+
+RSpec::Support::Spec.setup_simplecov do
+  minimum_coverage 96
+end
+
 require 'yaml'
 begin
   require 'psych'
 rescue LoadError
 end
 
-begin
-  require 'simplecov'
-
-  SimpleCov.start do
-    add_filter "bundle"
-  end
-rescue LoadError
-end unless ENV['NO_COVERAGE'] || RUBY_VERSION < '1.9.3'
-
 RSpec::Matchers.define :include_method do |expected|
   match do |actual|
     actual.map { |m| m.to_s }.include?(expected.to_s)
@@ -21,23 +19,24 @@ end
 
 module VerifyAndResetHelpers
   def verify(object)
-    RSpec::Mocks.proxy_for(object).verify
+    proxy = RSpec::Mocks.space.proxy_for(object)
+    proxy.verify
+  ensure
+    proxy.reset # so it doesn't fail the verify after the example completes
   end
 
   def reset(object)
-    RSpec::Mocks.proxy_for(object).reset
+    RSpec::Mocks.space.proxy_for(object).reset
   end
-end
 
-module DeprecationHelpers
-  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
+  def verify_all
+    RSpec::Mocks.space.verify_all
+  ensure
+    reset_all
   end
 
-  def expect_warning_with_call_site(file, line)
-    expect(Kernel).to receive(:warn).with(/Called from #{file}:#{line}/)
+  def reset_all
+    RSpec::Mocks.space.reset_all
   end
 end
 
@@ -48,12 +47,12 @@ module VerificationHelpers
   end
 end
 
+require 'rspec/support/spec'
+
 RSpec.configure do |config|
   config.mock_with :rspec
   config.color_enabled = true
   config.order = :random
-  config.run_all_when_everything_filtered = true
-  config.filter_run_including :focus
 
   config.expect_with :rspec do |expectations|
     expectations.syntax = :expect
@@ -77,8 +76,9 @@ RSpec.configure do |config|
   end
 
   config.include VerifyAndResetHelpers
-  config.include DeprecationHelpers
   config.include VerificationHelpers
+  config.extend RSpec::Mocks::RubyFeatures
+  config.include RSpec::Mocks::RubyFeatures
 end
 
 shared_context "with syntax" do |syntax|
@@ -107,3 +107,15 @@ shared_context "with isolated configuration" do
   end
 end
 
+shared_context "with the default mocks syntax" do
+  orig_syntax = nil
+
+  before(:all) do
+    orig_syntax = RSpec::Mocks.configuration.syntax
+    RSpec::Mocks.configuration.reset_syntaxes_to_default
+  end
+
+  after(:all) do
+    RSpec::Mocks.configuration.syntax = orig_syntax
+  end
+end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta1
+  version: 3.0.0.beta2
+  prerelease: 6
 platform: ruby
 authors:
 - Steven Baker
@@ -10,55 +11,73 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURqakNDQW5hZ0F3SUJB
-  Z0lCQVRBTkJna3Foa2lHOXcwQkFRVUZBREJHTVJJd0VBWURWUVFEREFseWMz
-  QmwKWXkxa1pYWXhHekFaQmdvSmtpYUprL0lzWkFFWkZndG5iMjluYkdWbmIz
-  VndjekVUTUJFR0NnbVNKb21UOGl4awpBUmtXQTJOdmJUQWVGdzB4TXpFeE1E
-  Y3hPVFF5TlRsYUZ3MHhOREV4TURjeE9UUXlOVGxhTUVZeEVqQVFCZ05WCkJB
-  TU1DWEp6Y0dWakxXUmxkakViTUJrR0NnbVNKb21UOGl4a0FSa1dDMmR2YjJk
-  c1pXZHZkWEJ6TVJNd0VRWUsKQ1pJbWlaUHlMR1FCR1JZRFkyOXRNSUlCSWpB
-  TkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQQpuaENlWm91
-  RExYV081NW5vK0VkWk5DdGpYamZKUTFYOVRiUGN2QkREMjlPeXBJVWNlMmgv
-  VmRLWEIyZ0k3WkhzCkY1TmtQZ2dzbFRFckdGbVdBdElpdXI3dTk0M1JWcUhP
-  c3lvSXN5MDY1RjlmQ3RyeWtrQSsyMmVsdlREaGE0SXoKUlVDdnVoUTNrbGF0
-  WWs0akYrY0d0MWpOT05OVmRMT2l5MGJNeW52Y003aG9WUTJBb213R3MrY0VP
-  V1EvNGRrRApKY05WM3FmekY1UUJjVEQyMzcyWE5NNTNiMjVuWVZRU1gyS0g1
-  RkY3QmhsS3lvdjMzYk9tMmdBOU0rbVdJdWpXCnFna3l4VmxmcmxFK1pCZ1Yz
-  d1huMUNvamcxTHBUcTM1eU9Bcmd3aW95cnd3bFpaSlI5am9OOXMvbkRrbGZy
-  NUEKK2R5RVRqRmM2Y21FUFdacnQyY0pCUUlEQVFBQm80R0dNSUdETUFrR0Ex
-  VWRFd1FDTUFBd0N3WURWUjBQQkFRRApBZ1N3TUIwR0ExVWREZ1FXQkJTVytX
-  RDdobjFzd0oxQTdpOHRidUZldU5DSkNqQWtCZ05WSFJFRUhUQWJnUmx5CmMz
-  QmxZeTFrWlhaQVoyOXZaMnhsWjI5MWNITXVZMjl0TUNRR0ExVWRFZ1FkTUJ1
-  QkdYSnpjR1ZqTFdSbGRrQm4KYjI5bmJHVm5iM1Z3Y3k1amIyMHdEUVlKS29a
-  SWh2Y05BUUVGQlFBRGdnRUJBSDI3akFaOHNEN3ZuWHVwajZZKwpCYUJkZkh0
-  Q2tGYXNsTEowYUt1TURJVlh3WXVLZnFvVzE1Y1pQRExtU0lFQnVRRk0zbHc2
-  ZC9oRUVMNFVvMmpaCkZ2dG1INU94aWZQRHpGeVV0Q0w0eXA2cWdOZS9YZjZz
-  RHNSZzZGbUtjcGdxQ3dOT21zVmlhZjBMUFNVSC9HWVEKM1Rlb3o4UUNhRGJE
-  N0FLc2ZmVDdlRHJuYkhuS3dlTzFYZGVtUkpDOTh1L3lZeG5Hek1TV0tFc24w
-  OWV0QmxaOQo3SDY3azVaM3VmNmNmTFpnVG9XTDZ6U2h6WlkzTnVuNXI3M1lz
-  TmYyL1FaT2U0VVplNHZmR3ZuNmJhdzUzeXM5CjF5SEMxQWNTWXB2aTJkQWJP
-  aUhUNWlRRitrcm00d3NlOEtjdFhnVE5uak1zSEVvR0t1bEpTMi9zWmw5MGpj
-  Q3oKbXVBPQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2013-11-08 00:00:00.000000000 Z
+- ! '-----BEGIN CERTIFICATE-----
+
+  MIIDjjCCAnagAwIBAgIBATANBgkqhkiG9w0BAQUFADBGMRIwEAYDVQQDDAlyc3Bl
+
+  Yy1kZXYxGzAZBgoJkiaJk/IsZAEZFgtnb29nbGVnb3VwczETMBEGCgmSJomT8ixk
+
+  ARkWA2NvbTAeFw0xMzExMDcxOTQyNTlaFw0xNDExMDcxOTQyNTlaMEYxEjAQBgNV
+
+  BAMMCXJzcGVjLWRldjEbMBkGCgmSJomT8ixkARkWC2dvb2dsZWdvdXBzMRMwEQYK
+
+  CZImiZPyLGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+
+  nhCeZouDLXWO55no+EdZNCtjXjfJQ1X9TbPcvBDD29OypIUce2h/VdKXB2gI7ZHs
+
+  F5NkPggslTErGFmWAtIiur7u943RVqHOsyoIsy065F9fCtrykkA+22elvTDha4Iz
+
+  RUCvuhQ3klatYk4jF+cGt1jNONNVdLOiy0bMynvcM7hoVQ2AomwGs+cEOWQ/4dkD
+
+  JcNV3qfzF5QBcTD2372XNM53b25nYVQSX2KH5FF7BhlKyov33bOm2gA9M+mWIujW
+
+  qgkyxVlfrlE+ZBgV3wXn1Cojg1LpTq35yOArgwioyrwwlZZJR9joN9s/nDklfr5A
+
+  +dyETjFc6cmEPWZrt2cJBQIDAQABo4GGMIGDMAkGA1UdEwQCMAAwCwYDVR0PBAQD
+
+  AgSwMB0GA1UdDgQWBBSW+WD7hn1swJ1A7i8tbuFeuNCJCjAkBgNVHREEHTAbgRly
+
+  c3BlYy1kZXZAZ29vZ2xlZ291cHMuY29tMCQGA1UdEgQdMBuBGXJzcGVjLWRldkBn
+
+  b29nbGVnb3Vwcy5jb20wDQYJKoZIhvcNAQEFBQADggEBAH27jAZ8sD7vnXupj6Y+
+
+  BaBdfHtCkFaslLJ0aKuMDIVXwYuKfqoW15cZPDLmSIEBuQFM3lw6d/hEEL4Uo2jZ
+
+  FvtmH5OxifPDzFyUtCL4yp6qgNe/Xf6sDsRg6FmKcpgqCwNOmsViaf0LPSUH/GYQ
+
+  3Teoz8QCaDbD7AKsffT7eDrnbHnKweO1XdemRJC98u/yYxnGzMSWKEsn09etBlZ9
+
+  7H67k5Z3uf6cfLZgToWL6zShzZY3Nun5r73YsNf2/QZOe4UZe4vfGvn6baw53ys9
+
+  1yHC1AcSYpvi2dAbOiHT5iQF+krm4wse8KctXgTNnjMsHEoGKulJS2/sZl90jcCz
+
+  muA=
+
+  -----END CERTIFICATE-----
+
+'
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.0.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -66,6 +85,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -73,6 +93,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -80,6 +101,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -87,6 +109,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,6 +117,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -106,6 +130,7 @@ extra_rdoc_files: []
 files:
 - lib/rspec/mocks.rb
 - lib/rspec/mocks/any_instance/chain.rb
+- lib/rspec/mocks/any_instance/expect_chain_chain.rb
 - lib/rspec/mocks/any_instance/expectation_chain.rb
 - lib/rspec/mocks/any_instance/message_chains.rb
 - lib/rspec/mocks/any_instance/recorder.rb
@@ -113,29 +138,28 @@ 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/arity_calculator.rb
 - lib/rspec/mocks/configuration.rb
 - lib/rspec/mocks/error_generator.rb
-- lib/rspec/mocks/errors.rb
 - lib/rspec/mocks/example_methods.rb
 - lib/rspec/mocks/extensions/marshal.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/matchers/receive_message_chain.rb
 - lib/rspec/mocks/matchers/receive_messages.rb
+- lib/rspec/mocks/message_chain.rb
 - lib/rspec/mocks/message_expectation.rb
 - lib/rspec/mocks/method_double.rb
 - lib/rspec/mocks/method_reference.rb
-- lib/rspec/mocks/mock.rb
+- lib/rspec/mocks/method_signature_verifier.rb
 - lib/rspec/mocks/mutate_const.rb
 - lib/rspec/mocks/object_reference.rb
 - lib/rspec/mocks/order_group.rb
 - lib/rspec/mocks/proxy.rb
-- lib/rspec/mocks/proxy_for_nil.rb
+- lib/rspec/mocks/ruby_features.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
@@ -162,21 +186,21 @@ files:
 - features/message_expectations/call_original.feature
 - features/message_expectations/expect_message_using_expect.feature
 - features/message_expectations/expect_message_using_should_receive.feature
+- features/message_expectations/message_chains_using_expect.feature
 - features/message_expectations/receive_counts.feature
 - features/message_expectations/warn_when_expectation_is_set_on_nil.feature
 - features/method_stubs/README.md
-- features/method_stubs/any_instance.feature
+- features/method_stubs/allow_any_instance_of.feature
 - features/method_stubs/as_null_object.feature
+- features/method_stubs/receive_message_chain.feature
 - features/method_stubs/simple_return_value_with_allow.feature
 - features/method_stubs/simple_return_value_with_stub.feature
-- features/method_stubs/stub_chain.feature
 - features/method_stubs/stub_implementation.feature
 - features/method_stubs/to_ary.feature
 - features/mutating_constants/README.md
 - features/mutating_constants/hiding_defined_constant.feature
 - features/mutating_constants/stub_defined_constant.feature
 - 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
@@ -185,37 +209,39 @@ files:
 - features/support/env.rb
 - features/support/rubinius.rb
 - features/test_frameworks/test_unit.feature
+- features/verifying_doubles/README.md
 - features/verifying_doubles/class_doubles.feature
 - features/verifying_doubles/dynamic_classes.feature
-- features/verifying_doubles/introduction.feature
+- features/verifying_doubles/instance_doubles.feature
 - features/verifying_doubles/object_doubles.feature
 - features/verifying_doubles/partial_doubles.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
-- spec/rspec/mocks/argument_expectation_spec.rb
-- spec/rspec/mocks/arity_calculator_spec.rb
 - spec/rspec/mocks/array_including_matcher_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/combining_implementation_instructions_spec.rb
 - spec/rspec/mocks/configuration_spec.rb
 - spec/rspec/mocks/double_spec.rb
+- spec/rspec/mocks/example_methods_spec.rb
 - spec/rspec/mocks/extensions/marshal_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_message_chain_spec.rb
 - spec/rspec/mocks/matchers/receive_messages_spec.rb
 - spec/rspec/mocks/matchers/receive_spec.rb
+- spec/rspec/mocks/method_signature_verifier_spec.rb
 - spec/rspec/mocks/methods_spec.rb
 - spec/rspec/mocks/mock_expectation_error_spec.rb
 - spec/rspec/mocks/mock_ordering_spec.rb
-- spec/rspec/mocks/mock_space_spec.rb
-- spec/rspec/mocks/mock_spec.rb
 - spec/rspec/mocks/multiple_return_value_spec.rb
 - spec/rspec/mocks/mutate_const_spec.rb
 - spec/rspec/mocks/nil_expectation_warning_spec.rb
@@ -223,8 +249,8 @@ files:
 - spec/rspec/mocks/once_counts_spec.rb
 - spec/rspec/mocks/options_hash_spec.rb
 - spec/rspec/mocks/order_group_spec.rb
-- spec/rspec/mocks/partial_mock_spec.rb
-- spec/rspec/mocks/partial_mock_using_mocks_directly_spec.rb
+- spec/rspec/mocks/partial_double_spec.rb
+- spec/rspec/mocks/partial_double_using_mocks_directly_spec.rb
 - spec/rspec/mocks/passing_argument_matchers_spec.rb
 - spec/rspec/mocks/precise_counts_spec.rb
 - spec/rspec/mocks/record_messages_spec.rb
@@ -236,6 +262,7 @@ files:
 - spec/rspec/mocks/stub_spec.rb
 - spec/rspec/mocks/stubbed_message_expectations_spec.rb
 - spec/rspec/mocks/syntax_agnostic_message_matchers_spec.rb
+- spec/rspec/mocks/syntax_spec.rb
 - spec/rspec/mocks/test_double_spec.rb
 - spec/rspec/mocks/to_ary_spec.rb
 - spec/rspec/mocks/twice_counts_spec.rb
@@ -246,28 +273,29 @@ 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: 1.8.7
 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-3.0.0.beta1
+specification_version: 3
+summary: rspec-mocks-3.0.0.beta2
 test_files:
 - features/README.md
 - features/Scope.md
@@ -283,21 +311,21 @@ test_files:
 - features/message_expectations/call_original.feature
 - features/message_expectations/expect_message_using_expect.feature
 - features/message_expectations/expect_message_using_should_receive.feature
+- features/message_expectations/message_chains_using_expect.feature
 - features/message_expectations/receive_counts.feature
 - features/message_expectations/warn_when_expectation_is_set_on_nil.feature
 - features/method_stubs/README.md
-- features/method_stubs/any_instance.feature
+- features/method_stubs/allow_any_instance_of.feature
 - features/method_stubs/as_null_object.feature
+- features/method_stubs/receive_message_chain.feature
 - features/method_stubs/simple_return_value_with_allow.feature
 - features/method_stubs/simple_return_value_with_stub.feature
-- features/method_stubs/stub_chain.feature
 - features/method_stubs/stub_implementation.feature
 - features/method_stubs/to_ary.feature
 - features/mutating_constants/README.md
 - features/mutating_constants/hiding_defined_constant.feature
 - features/mutating_constants/stub_defined_constant.feature
 - 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
@@ -306,37 +334,39 @@ test_files:
 - features/support/env.rb
 - features/support/rubinius.rb
 - features/test_frameworks/test_unit.feature
+- features/verifying_doubles/README.md
 - features/verifying_doubles/class_doubles.feature
 - features/verifying_doubles/dynamic_classes.feature
-- features/verifying_doubles/introduction.feature
+- features/verifying_doubles/instance_doubles.feature
 - features/verifying_doubles/object_doubles.feature
 - features/verifying_doubles/partial_doubles.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
-- spec/rspec/mocks/argument_expectation_spec.rb
-- spec/rspec/mocks/arity_calculator_spec.rb
 - spec/rspec/mocks/array_including_matcher_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/combining_implementation_instructions_spec.rb
 - spec/rspec/mocks/configuration_spec.rb
 - spec/rspec/mocks/double_spec.rb
+- spec/rspec/mocks/example_methods_spec.rb
 - spec/rspec/mocks/extensions/marshal_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_message_chain_spec.rb
 - spec/rspec/mocks/matchers/receive_messages_spec.rb
 - spec/rspec/mocks/matchers/receive_spec.rb
+- spec/rspec/mocks/method_signature_verifier_spec.rb
 - spec/rspec/mocks/methods_spec.rb
 - spec/rspec/mocks/mock_expectation_error_spec.rb
 - spec/rspec/mocks/mock_ordering_spec.rb
-- spec/rspec/mocks/mock_space_spec.rb
-- spec/rspec/mocks/mock_spec.rb
 - spec/rspec/mocks/multiple_return_value_spec.rb
 - spec/rspec/mocks/mutate_const_spec.rb
 - spec/rspec/mocks/nil_expectation_warning_spec.rb
@@ -344,8 +374,8 @@ test_files:
 - spec/rspec/mocks/once_counts_spec.rb
 - spec/rspec/mocks/options_hash_spec.rb
 - spec/rspec/mocks/order_group_spec.rb
-- spec/rspec/mocks/partial_mock_spec.rb
-- spec/rspec/mocks/partial_mock_using_mocks_directly_spec.rb
+- spec/rspec/mocks/partial_double_spec.rb
+- spec/rspec/mocks/partial_double_using_mocks_directly_spec.rb
 - spec/rspec/mocks/passing_argument_matchers_spec.rb
 - spec/rspec/mocks/precise_counts_spec.rb
 - spec/rspec/mocks/record_messages_spec.rb
@@ -357,6 +387,7 @@ test_files:
 - spec/rspec/mocks/stub_spec.rb
 - spec/rspec/mocks/stubbed_message_expectations_spec.rb
 - spec/rspec/mocks/syntax_agnostic_message_matchers_spec.rb
+- spec/rspec/mocks/syntax_spec.rb
 - spec/rspec/mocks/test_double_spec.rb
 - spec/rspec/mocks/to_ary_spec.rb
 - spec/rspec/mocks/twice_counts_spec.rb