rspec-expectations 3.0.0.beta1 → 3.0.0.beta2

data/spec/rspec/matchers/legacy_spec.rb

@@ -0,0 +1,101 @@
+require 'spec_helper'
+
+module RSpec
+  module Matchers
+    describe "Legacy matchers" do
+      shared_examples_for "a matcher written against a legacy protocol" do |matcher_class|
+        matcher = matcher_class.new
+        before { allow_deprecation }
+
+        backwards_compat_matcher = Class.new(matcher_class) do
+          def failure_message; "failure when positive"; end
+          def failure_message_when_negated; "failure when negative"; end
+        end.new
+
+        it 'is still considered to be a matcher' do
+          expect(Matchers.is_a_matcher?(matcher)).to be true
+        end
+
+        context 'when matched positively' do
+          it 'returns the positive expectation failure message' do
+            expect {
+              expect(false).to matcher
+            }.to fail_with("failure when positive")
+          end
+
+          it 'warns about the deprecated protocol' do
+            expect_warn_deprecation_with_call_site(__FILE__, __LINE__ + 1, /legacy\s+RSpec\s+matcher/)
+            expect(true).to matcher
+          end
+
+          it 'does not warn when it also defines the current methods (i.e. to be compatible on multiple RSpec versions)' do
+            expect_no_deprecations
+
+            expect {
+              expect(false).to backwards_compat_matcher
+            }.to fail_with("failure when positive")
+          end
+        end
+
+        context 'when matched negatively' do
+          it 'returns the negative expectation failure message' do
+            expect {
+              expect(true).not_to matcher
+            }.to fail_with("failure when negative")
+          end
+
+          it 'warns about the deprecated protocol' do
+            expect_warn_deprecation_with_call_site(__FILE__, __LINE__ + 1, /legacy\s+RSpec\s+matcher/)
+            expect(false).not_to matcher
+          end
+
+          it 'does not warn when it also defines the current methods (i.e. to be compatible on multiple RSpec versions)' do
+            expect_no_deprecations
+
+            expect {
+              expect(true).not_to backwards_compat_matcher
+            }.to fail_with("failure when negative")
+          end
+
+          def pending_on_rbx
+            return unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+            pending "intermittently fails on RBX due to https://github.com/rubinius/rubinius/issues/2845"
+          end
+
+          it 'calls `does_not_match?` if it is defined on the matcher' do
+            pending_on_rbx
+
+            called = false
+            with_does_not_match = Class.new(matcher_class) do
+              define_method(:does_not_match?) { |actual| called = true; !actual }
+            end.new
+
+            expect(false).not_to with_does_not_match
+            expect(called).to be true
+          end
+        end
+      end
+
+      context "written using the RSpec 2.x `failure_message_for_should` and `failure_message_for_should_not` protocol" do
+        matcher_class = Class.new do
+          def matches?(actual); actual; end
+          def failure_message_for_should; "failure when positive"; end
+          def failure_message_for_should_not; "failure when negative"; end
+        end
+
+        it_behaves_like "a matcher written against a legacy protocol", matcher_class
+      end
+
+      context "written using the older `failure_message` and `negative_failure_message` protocol" do
+        matcher_class = Class.new do
+          def matches?(actual); actual; end
+          def failure_message; "failure when positive"; end
+          def negative_failure_message; "failure when negative"; end
+        end
+
+        it_behaves_like "a matcher written against a legacy protocol", matcher_class
+      end
+    end
+  end
+end
+

data/spec/rspec/matchers_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+main = self
+describe RSpec::Matchers do
+  include ::RSpec::Support::InSubProcess
+
+  it 'can be mixed into `main`' do
+    in_sub_process do
+      main.instance_eval do
+        include RSpec::Matchers
+        expect(3).to eq(3)
+        expect(3).to be_odd
+
+        expect {
+          expect(4).to be_zero
+        }.to fail_with("expected zero? to return true, got false")
+      end
+    end
+  end
+end
+
+module RSpec
+  module Matchers
+    describe "built in matchers" do
+      let(:matchers) do
+        BuiltIn.constants.map { |n| BuiltIn.const_get(n) }.select do |m|
+          m.method_defined?(:matches?) && m.method_defined?(:failure_message)
+        end
+      end
+
+      specify "they all have defined #=== so they can be composable" do
+        missing_threequals = matchers.select do |m|
+          m.instance_method(:===).owner == ::Kernel
+        end
+
+        # This spec is merely to make sure we don't forget to make
+        # a built-in matcher implement `===`. It doesn't check the
+        # semantics of that. Use the "an RSpec matcher" shared
+        # example group to actually check the semantics.
+        expect(missing_threequals).to eq([])
+      end
+
+      specify "they all have defined #and and #or so they support compound expectations" do
+        noncompound_matchers = matchers.reject do |m|
+          m.method_defined?(:and) || m.method_defined?(:or)
+        end
+
+        expect(noncompound_matchers).to eq([])
+      end
+
+      shared_examples_for "a well-behaved method_missing hook" do
+        include MinitestIntegration
+
+        it "raises a NoMethodError (and not SystemStackError) for an undefined method" do
+          with_minitest_loaded do
+            expect { subject.some_undefined_method }.to raise_error(NoMethodError)
+          end
+        end
+      end
+
+      describe "RSpec::Matchers method_missing hook" do
+        subject { self }
+
+        it_behaves_like "a well-behaved method_missing hook"
+
+        context 'when invoked in a Minitest::Test' do
+          subject { Minitest::Test.allocate }
+          it_behaves_like "a well-behaved method_missing hook"
+        end
+      end
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -1,34 +1,31 @@
-unless ENV['NO_COVERALLS']
-  require 'simplecov' if RUBY_VERSION.to_f >= 1.9
-  require 'coveralls'
-  Coveralls.wear! do
-    add_filter '/bundle/'
-    add_filter '/spec/'
-    add_filter '/tmp/'
-  end
+require 'rspec/support/spec'
+
+RSpec::Support::Spec.setup_simplecov do
+  minimum_coverage 97
 end
 
 Dir['./spec/support/**/*'].each {|f| require f}
 
-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
+module FormattingSupport
+  def dedent(string)
+    string.gsub(/^\s+\|/, '').chomp
   end
 end
 
 RSpec::configure do |config|
-  config.include DeprecationHelpers
   config.color_enabled = true
-  config.filter_run :focused
-  config.run_all_when_everything_filtered = true
   config.order = :random
 
+  config.include FormattingSupport
+
   config.expect_with :rspec do |expectations|
     $default_expectation_syntax = expectations.syntax
     expectations.syntax = :expect
   end
+
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = :expect
+  end
 end
 
 shared_context "with #should enabled", :uses_should do
@@ -44,6 +41,19 @@ shared_context "with #should enabled", :uses_should do
   end
 end
 
+shared_context "with the default expectation syntax" do
+  orig_syntax = nil
+
+  before(:all) do
+    orig_syntax = RSpec::Matchers.configuration.syntax
+    RSpec::Matchers.configuration.reset_syntaxes_to_default
+  end
+
+  after(:all) do
+    RSpec::Matchers.configuration.syntax = orig_syntax
+  end
+
+end
 
 shared_context "with #should exclusively enabled", :uses_only_should do
   orig_syntax = nil
@@ -58,13 +68,17 @@ shared_context "with #should exclusively enabled", :uses_only_should do
   end
 end
 
-module TestUnitIntegrationSupport
-  include InSubProcess
+require 'rspec/support/spec/in_sub_process'
+module MinitestIntegration
+  include ::RSpec::Support::InSubProcess
 
-  def with_test_unit_loaded
+  def with_minitest_loaded
     in_sub_process do
-      require 'test/unit'
-      load 'rspec/matchers/test_unit_integration.rb'
+      with_isolated_stderr do
+        require 'minitest/autorun'
+      end
+
+      require 'rspec/expectations/minitest_integration'
       yield
     end
   end

data/spec/support/shared_examples.rb

@@ -2,12 +2,34 @@ shared_examples_for "an RSpec matcher" do |options|
   let(:valid_value)   { options.fetch(:valid_value) }
   let(:invalid_value) { options.fetch(:invalid_value) }
 
-  it 'matches a valid value when using #== so it can be composed' do
-    expect(matcher).to eq(valid_value)
+  it 'preserves the symmetric property of `==`' do
+    expect(matcher).to eq(matcher)
+    expect(matcher).not_to eq(valid_value)
+    expect(valid_value).not_to eq(matcher)
   end
 
-  it 'does not match an invalid value when using #== so it can be composed' do
-    expect(matcher).not_to eq(invalid_value)
+  it 'matches a valid value when using #=== so it can be composed' do
+    expect(matcher).to be === valid_value
+  end
+
+  it 'does not match an invalid value when using #=== so it can be composed' do
+    expect(matcher).not_to be === invalid_value
+  end
+
+  matcher :always_passes do
+    match { true }
+  end
+
+  matcher :always_fails do
+    match { false }
+  end
+
+  it 'supports compound expectations by chaining `and`' do
+    expect(valid_value).to matcher.and always_passes
+  end
+
+  it 'supports compound expectations by chaining `or`' do
+    expect(valid_value).to matcher.or always_fails
   end
 end
 

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta1
+  version: 3.0.0.beta2
+  prerelease: 6
 platform: ruby
 authors:
 - Steven Baker
@@ -10,75 +11,95 @@ 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: diff-lcs
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.2.0
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.2.0
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,6 +107,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -93,20 +115,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -114,11 +139,29 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
-description: rspec expectations (should[_not] and matchers)
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.2'
+description: rspec-expectations provides a simple, readable API to express expected
+  outcomes of a code example.
 email: rspec@googlegroups.com
 executables: []
 extensions: []
@@ -126,23 +169,27 @@ extra_rdoc_files: []
 files:
 - lib/rspec-expectations.rb
 - lib/rspec/expectations.rb
+- lib/rspec/expectations/diff_presenter.rb
 - lib/rspec/expectations/differ.rb
-- lib/rspec/expectations/errors.rb
+- lib/rspec/expectations/encoded_string.rb
 - lib/rspec/expectations/expectation_target.rb
-- lib/rspec/expectations/extensions.rb
-- lib/rspec/expectations/extensions/object.rb
 - lib/rspec/expectations/fail_with.rb
 - lib/rspec/expectations/handler.rb
+- lib/rspec/expectations/minitest_integration.rb
 - lib/rspec/expectations/syntax.rb
 - lib/rspec/expectations/version.rb
 - lib/rspec/matchers.rb
+- lib/rspec/matchers/aliased_matcher.rb
 - lib/rspec/matchers/built_in.rb
 - lib/rspec/matchers/built_in/base_matcher.rb
 - lib/rspec/matchers/built_in/be.rb
+- lib/rspec/matchers/built_in/be_between.rb
 - lib/rspec/matchers/built_in/be_instance_of.rb
 - lib/rspec/matchers/built_in/be_kind_of.rb
 - lib/rspec/matchers/built_in/be_within.rb
 - lib/rspec/matchers/built_in/change.rb
+- lib/rspec/matchers/built_in/compound.rb
+- lib/rspec/matchers/built_in/contain_exactly.rb
 - lib/rspec/matchers/built_in/cover.rb
 - lib/rspec/matchers/built_in/eq.rb
 - lib/rspec/matchers/built_in/eql.rb
@@ -151,22 +198,20 @@ files:
 - lib/rspec/matchers/built_in/has.rb
 - lib/rspec/matchers/built_in/include.rb
 - lib/rspec/matchers/built_in/match.rb
-- lib/rspec/matchers/built_in/match_array.rb
+- lib/rspec/matchers/built_in/operators.rb
+- lib/rspec/matchers/built_in/output.rb
 - lib/rspec/matchers/built_in/raise_error.rb
 - lib/rspec/matchers/built_in/respond_to.rb
 - lib/rspec/matchers/built_in/satisfy.rb
 - lib/rspec/matchers/built_in/start_and_end_with.rb
 - lib/rspec/matchers/built_in/throw_symbol.rb
 - lib/rspec/matchers/built_in/yield.rb
-- lib/rspec/matchers/compatibility.rb
+- lib/rspec/matchers/composable.rb
 - lib/rspec/matchers/configuration.rb
 - lib/rspec/matchers/dsl.rb
 - lib/rspec/matchers/generated_descriptions.rb
-- lib/rspec/matchers/matcher.rb
-- lib/rspec/matchers/method_missing.rb
-- lib/rspec/matchers/operator_matcher.rb
+- lib/rspec/matchers/matcher_delegator.rb
 - lib/rspec/matchers/pretty.rb
-- lib/rspec/matchers/test_unit_integration.rb
 - README.md
 - License.txt
 - Changelog.md
@@ -178,6 +223,7 @@ files:
 - features/built_in_matchers/be.feature
 - features/built_in_matchers/be_within.feature
 - features/built_in_matchers/comparisons.feature
+- features/built_in_matchers/contain_exactly.feature
 - features/built_in_matchers/cover.feature
 - features/built_in_matchers/end_with.feature
 - features/built_in_matchers/equality.feature
@@ -186,7 +232,7 @@ files:
 - features/built_in_matchers/expect_error.feature
 - features/built_in_matchers/include.feature
 - features/built_in_matchers/match.feature
-- features/built_in_matchers/match_array.feature
+- features/built_in_matchers/output.feature
 - features/built_in_matchers/predicates.feature
 - features/built_in_matchers/respond_to.feature
 - features/built_in_matchers/satisfy.feature
@@ -194,6 +240,8 @@ files:
 - features/built_in_matchers/throw_symbol.feature
 - features/built_in_matchers/types.feature
 - features/built_in_matchers/yield.feature
+- features/composing_matchers.feature
+- features/compound_expectations.feature
 - features/custom_matchers/access_running_example.feature
 - features/custom_matchers/define_diffable_matcher.feature
 - features/custom_matchers/define_matcher.feature
@@ -206,74 +254,77 @@ files:
 - features/support/env.rb
 - features/support/rubinius.rb
 - features/syntax_configuration.feature
-- features/test_frameworks/test_unit.feature
-- spec/rspec/expectations/differ_spec.rb
+- features/test_frameworks/minitest.feature
+- spec/rspec/expectations/diff_presenter_spec.rb
+- spec/rspec/expectations/encoded_string_spec.rb
 - spec/rspec/expectations/expectation_target_spec.rb
 - spec/rspec/expectations/extensions/kernel_spec.rb
 - spec/rspec/expectations/fail_with_spec.rb
 - spec/rspec/expectations/handler_spec.rb
+- spec/rspec/expectations/minitest_integration_spec.rb
 - spec/rspec/expectations/syntax_spec.rb
 - spec/rspec/expectations_spec.rb
-- spec/rspec/matchers/base_matcher_spec.rb
-- spec/rspec/matchers/be_instance_of_spec.rb
-- spec/rspec/matchers/be_kind_of_spec.rb
-- spec/rspec/matchers/be_spec.rb
-- spec/rspec/matchers/be_within_spec.rb
-- spec/rspec/matchers/change_spec.rb
+- spec/rspec/matchers/aliased_matcher_spec.rb
+- spec/rspec/matchers/aliases_spec.rb
+- spec/rspec/matchers/built_in/base_matcher_spec.rb
+- spec/rspec/matchers/built_in/be_between_spec.rb
+- spec/rspec/matchers/built_in/be_instance_of_spec.rb
+- spec/rspec/matchers/built_in/be_kind_of_spec.rb
+- spec/rspec/matchers/built_in/be_spec.rb
+- spec/rspec/matchers/built_in/be_within_spec.rb
+- spec/rspec/matchers/built_in/change_spec.rb
+- spec/rspec/matchers/built_in/compound_spec.rb
+- spec/rspec/matchers/built_in/contain_exactly_spec.rb
+- spec/rspec/matchers/built_in/cover_spec.rb
+- spec/rspec/matchers/built_in/eq_spec.rb
+- spec/rspec/matchers/built_in/eql_spec.rb
+- spec/rspec/matchers/built_in/equal_spec.rb
+- spec/rspec/matchers/built_in/exist_spec.rb
+- spec/rspec/matchers/built_in/has_spec.rb
+- spec/rspec/matchers/built_in/include_spec.rb
+- spec/rspec/matchers/built_in/match_spec.rb
+- spec/rspec/matchers/built_in/operators_spec.rb
+- spec/rspec/matchers/built_in/output_spec.rb
+- spec/rspec/matchers/built_in/raise_error_spec.rb
+- spec/rspec/matchers/built_in/respond_to_spec.rb
+- spec/rspec/matchers/built_in/satisfy_spec.rb
+- spec/rspec/matchers/built_in/start_and_end_with_spec.rb
+- spec/rspec/matchers/built_in/throw_symbol_spec.rb
+- spec/rspec/matchers/built_in/yield_spec.rb
 - spec/rspec/matchers/configuration_spec.rb
-- spec/rspec/matchers/cover_spec.rb
 - spec/rspec/matchers/description_generation_spec.rb
 - spec/rspec/matchers/dsl_spec.rb
-- spec/rspec/matchers/eq_spec.rb
-- spec/rspec/matchers/eql_spec.rb
-- spec/rspec/matchers/equal_spec.rb
-- spec/rspec/matchers/exist_spec.rb
-- spec/rspec/matchers/has_spec.rb
-- spec/rspec/matchers/include_matcher_integration_spec.rb
-- spec/rspec/matchers/include_spec.rb
-- spec/rspec/matchers/match_array_spec.rb
-- spec/rspec/matchers/match_spec.rb
-- spec/rspec/matchers/matcher_spec.rb
-- spec/rspec/matchers/matchers_spec.rb
-- spec/rspec/matchers/method_missing_spec.rb
-- spec/rspec/matchers/operator_matcher_spec.rb
-- spec/rspec/matchers/raise_error_spec.rb
-- spec/rspec/matchers/respond_to_spec.rb
-- spec/rspec/matchers/satisfy_spec.rb
-- spec/rspec/matchers/start_with_end_with_spec.rb
-- spec/rspec/matchers/throw_symbol_spec.rb
-- spec/rspec/matchers/yield_spec.rb
+- spec/rspec/matchers/legacy_spec.rb
+- spec/rspec/matchers_spec.rb
 - spec/spec_helper.rb
-- spec/support/classes.rb
-- spec/support/in_sub_process.rb
 - spec/support/matchers.rb
-- spec/support/ruby_version.rb
 - spec/support/shared_examples.rb
 homepage: http://github.com/rspec/rspec-expectations
 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-expectations-3.0.0.beta1
+specification_version: 3
+summary: rspec-expectations-3.0.0.beta2
 test_files:
 - features/README.md
 - features/Upgrade.md
@@ -281,6 +332,7 @@ test_files:
 - features/built_in_matchers/be.feature
 - features/built_in_matchers/be_within.feature
 - features/built_in_matchers/comparisons.feature
+- features/built_in_matchers/contain_exactly.feature
 - features/built_in_matchers/cover.feature
 - features/built_in_matchers/end_with.feature
 - features/built_in_matchers/equality.feature
@@ -289,7 +341,7 @@ test_files:
 - features/built_in_matchers/expect_error.feature
 - features/built_in_matchers/include.feature
 - features/built_in_matchers/match.feature
-- features/built_in_matchers/match_array.feature
+- features/built_in_matchers/output.feature
 - features/built_in_matchers/predicates.feature
 - features/built_in_matchers/respond_to.feature
 - features/built_in_matchers/satisfy.feature
@@ -297,6 +349,8 @@ test_files:
 - features/built_in_matchers/throw_symbol.feature
 - features/built_in_matchers/types.feature
 - features/built_in_matchers/yield.feature
+- features/composing_matchers.feature
+- features/compound_expectations.feature
 - features/custom_matchers/access_running_example.feature
 - features/custom_matchers/define_diffable_matcher.feature
 - features/custom_matchers/define_matcher.feature
@@ -309,47 +363,49 @@ test_files:
 - features/support/env.rb
 - features/support/rubinius.rb
 - features/syntax_configuration.feature
-- features/test_frameworks/test_unit.feature
-- spec/rspec/expectations/differ_spec.rb
+- features/test_frameworks/minitest.feature
+- spec/rspec/expectations/diff_presenter_spec.rb
+- spec/rspec/expectations/encoded_string_spec.rb
 - spec/rspec/expectations/expectation_target_spec.rb
 - spec/rspec/expectations/extensions/kernel_spec.rb
 - spec/rspec/expectations/fail_with_spec.rb
 - spec/rspec/expectations/handler_spec.rb
+- spec/rspec/expectations/minitest_integration_spec.rb
 - spec/rspec/expectations/syntax_spec.rb
 - spec/rspec/expectations_spec.rb
-- spec/rspec/matchers/base_matcher_spec.rb
-- spec/rspec/matchers/be_instance_of_spec.rb
-- spec/rspec/matchers/be_kind_of_spec.rb
-- spec/rspec/matchers/be_spec.rb
-- spec/rspec/matchers/be_within_spec.rb
-- spec/rspec/matchers/change_spec.rb
+- spec/rspec/matchers/aliased_matcher_spec.rb
+- spec/rspec/matchers/aliases_spec.rb
+- spec/rspec/matchers/built_in/base_matcher_spec.rb
+- spec/rspec/matchers/built_in/be_between_spec.rb
+- spec/rspec/matchers/built_in/be_instance_of_spec.rb
+- spec/rspec/matchers/built_in/be_kind_of_spec.rb
+- spec/rspec/matchers/built_in/be_spec.rb
+- spec/rspec/matchers/built_in/be_within_spec.rb
+- spec/rspec/matchers/built_in/change_spec.rb
+- spec/rspec/matchers/built_in/compound_spec.rb
+- spec/rspec/matchers/built_in/contain_exactly_spec.rb
+- spec/rspec/matchers/built_in/cover_spec.rb
+- spec/rspec/matchers/built_in/eq_spec.rb
+- spec/rspec/matchers/built_in/eql_spec.rb
+- spec/rspec/matchers/built_in/equal_spec.rb
+- spec/rspec/matchers/built_in/exist_spec.rb
+- spec/rspec/matchers/built_in/has_spec.rb
+- spec/rspec/matchers/built_in/include_spec.rb
+- spec/rspec/matchers/built_in/match_spec.rb
+- spec/rspec/matchers/built_in/operators_spec.rb
+- spec/rspec/matchers/built_in/output_spec.rb
+- spec/rspec/matchers/built_in/raise_error_spec.rb
+- spec/rspec/matchers/built_in/respond_to_spec.rb
+- spec/rspec/matchers/built_in/satisfy_spec.rb
+- spec/rspec/matchers/built_in/start_and_end_with_spec.rb
+- spec/rspec/matchers/built_in/throw_symbol_spec.rb
+- spec/rspec/matchers/built_in/yield_spec.rb
 - spec/rspec/matchers/configuration_spec.rb
-- spec/rspec/matchers/cover_spec.rb
 - spec/rspec/matchers/description_generation_spec.rb
 - spec/rspec/matchers/dsl_spec.rb
-- spec/rspec/matchers/eq_spec.rb
-- spec/rspec/matchers/eql_spec.rb
-- spec/rspec/matchers/equal_spec.rb
-- spec/rspec/matchers/exist_spec.rb
-- spec/rspec/matchers/has_spec.rb
-- spec/rspec/matchers/include_matcher_integration_spec.rb
-- spec/rspec/matchers/include_spec.rb
-- spec/rspec/matchers/match_array_spec.rb
-- spec/rspec/matchers/match_spec.rb
-- spec/rspec/matchers/matcher_spec.rb
-- spec/rspec/matchers/matchers_spec.rb
-- spec/rspec/matchers/method_missing_spec.rb
-- spec/rspec/matchers/operator_matcher_spec.rb
-- spec/rspec/matchers/raise_error_spec.rb
-- spec/rspec/matchers/respond_to_spec.rb
-- spec/rspec/matchers/satisfy_spec.rb
-- spec/rspec/matchers/start_with_end_with_spec.rb
-- spec/rspec/matchers/throw_symbol_spec.rb
-- spec/rspec/matchers/yield_spec.rb
+- spec/rspec/matchers/legacy_spec.rb
+- spec/rspec/matchers_spec.rb
 - spec/spec_helper.rb
-- spec/support/classes.rb
-- spec/support/in_sub_process.rb
 - spec/support/matchers.rb
-- spec/support/ruby_version.rb
 - spec/support/shared_examples.rb
 has_rdoc: