rspec-expectations 2.99.0.beta2 → 2.99.0.rc1

data/lib/rspec/matchers/pretty.rb

@@ -21,6 +21,8 @@ module RSpec
       end
 
       def _pretty_print(array)
+        RSpec.deprecate("`RSpec::Matchers::Pretty#_pretty_print`",
+                        :replacement => "`RSpec::Matchers::Pretty#to_sentence`")
         result = ""
         array.each_with_index do |item, index|
           if index < (array.length - 2)
@@ -43,6 +45,8 @@ module RSpec
       end
 
       def expected_to_sentence
+        RSpec.deprecate("`RSpec::Matchers::Pretty#expected_to_sentence`",
+                        :replacement => "`RSpec::Matchers::Pretty#to_sentence(expected)`")
         to_sentence(@expected) if defined?(@expected)
       end
 

data/spec/rspec/{matchers → expectations}/configuration_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 require 'delegate'
 
 module RSpec
-  module Matchers
+  module Expectations
     describe "RSpec::Matchers.configuration" do
       it 'returns a memoized configuration instance' do
-        expect(RSpec::Matchers.configuration).to be_a(RSpec::Matchers::Configuration)
+        expect(RSpec::Matchers.configuration).to be_a(RSpec::Expectations::Configuration)
         expect(RSpec::Matchers.configuration).to be(RSpec::Matchers.configuration)
       end
     end
@@ -13,6 +13,25 @@ module RSpec
     describe Configuration do
       let(:config) { Configuration.new }
 
+      context "when accessing it using the old 2.x const name" do
+        it 'returns the new constant' do
+          allow_deprecation
+          expect(RSpec::Matchers::Configuration).to be(RSpec::Expectations::Configuration)
+        end
+
+        it 'issues a deprecation warning' do
+          expect_deprecation_with_call_site(__FILE__, __LINE__ + 1, /RSpec::Matchers::Configuration/)
+          RSpec::Matchers::Configuration
+        end
+
+        it 'allows other undefined constant to raise errors like normal' do
+          expect_no_deprecation
+          expect {
+            RSpec::Matchers::FooBarBazz
+          }.to raise_error(NameError, /RSpec::Matchers::FooBarBazz/)
+        end
+      end
+
       describe "#backtrace_formatter" do
         let(:original_backtrace) { %w[ clean-me/a.rb other/file.rb clean-me/b.rb ] }
         let(:cleaned_backtrace)  { %w[ other/file.rb ] }

data/spec/rspec/expectations/expectation_target_spec.rb

@@ -22,6 +22,12 @@ module RSpec
           }.to raise_error(ArgumentError)
         end
 
+        it 'raises a wrong number of args ArgumentError when given two args' do
+          expect {
+            expect(1, 2)
+          }.to raise_error(ArgumentError, /wrong number of arg/)
+        end
+
         it 'raises an ArgumentError when given neither an argument nor a block' do
           expect {
             expect
@@ -76,6 +82,62 @@ module RSpec
           }.to raise_error(ArgumentError)
         end
       end
+
+      context "when passed a block" do
+        it 'can be used with a block matcher' do
+          expect { }.not_to raise_error
+        end
+
+        context 'when passed a value matcher' do
+          it 'issues a warning to instruct the user to use a value expression or fix the matcher (for `to`)' do
+            expect_deprecation_with_call_site(__FILE__, __LINE__ + 1, /block expectation/)
+            expect { }.to be_an(Object)
+          end
+
+          it 'issues a warning to instruct the user to use a value expression or fix the matcher (for `not_to`)' do
+            expect_deprecation_with_call_site(__FILE__, __LINE__ + 1, /block expectation/)
+            expect { }.not_to be_an(String)
+          end
+
+          it 'issues a warning to instruct the user to use a value expression or fix the matcher (for `to_not`)' do
+            expect_deprecation_with_call_site(__FILE__, __LINE__ + 1, /block expectation/)
+            expect { }.to_not be_an(String)
+          end
+
+          it 'assumes a custom matcher that does not define `supports_block_expectations?` is not a block matcher (since it is relatively rare)' do
+            custom_matcher = Module.new do
+              def self.matches?(value); true; end
+              def self.description; "foo"; end
+            end
+
+            expect_deprecation_with_call_site(__FILE__, __LINE__ + 2, /block expectation/)
+            expect(3).to custom_matcher # to show the custom matcher can be used as a matcher
+            expect { 3 }.to custom_matcher
+          end
+
+          it "uses the matcher's `description` in the warning" do
+            custom_matcher = Module.new do
+              def self.matches?(value); true; end
+              def self.description; "matcher-description"; end
+            end
+
+            expect_deprecation_with_replacement(/\(matcher-description\)/)
+            expect { }.to custom_matcher
+          end
+
+          context 'when the matcher does not define `description` (since it is an optional part of the protocol)' do
+            it 'uses `inspect` in the warning instead' do
+              custom_matcher = Module.new do
+                def self.matches?(value); true; end
+                def self.inspect; "matcher-inspect"; end
+              end
+
+              expect_deprecation_with_replacement(/\(matcher-inspect\)/)
+              expect { }.to custom_matcher
+            end
+          end
+        end
+      end
     end
   end
 end

data/spec/rspec/expectations/extensions/kernel_spec.rb

@@ -32,6 +32,10 @@ describe Object, "#should" do
           true
         end
 
+        def respond_to?(name, include_all=false)
+          super || name == :proxied? || @target.respond_to?(name, include_all)
+        end
+
         def method_missing(name, *args)
           @target.send(name, *args)
         end

data/spec/rspec/expectations_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 module RSpec
   describe Expectations do
     def file_contents_for(lib, filename)
@@ -14,6 +16,11 @@ module RSpec
       expect(expectations).to eq(core)
     end
 
+    it 'prints a deprecation warning when the root file is loaded' do
+      expect_deprecation_with_call_site(__FILE__, __LINE__ + 1, /rspec-expectations/)
+      load "rspec-expectations.rb"
+    end
+
     describe '.method_handle_for(object, method_name)' do
 
       class UntamperedClass

data/spec/rspec/matchers/be_spec.rb

@@ -38,6 +38,7 @@ describe "expect(...).to be_predicate" do
           true
         end
     end
+    allow(RSpec).to receive(:deprecate)
     expect(RSpec).to receive(:deprecate).with(
       "matching with be_happy on private method happy?",
       :replacement => "`expect(object.send(:happy?)).to be_true` or change the method's visibility to public",
@@ -67,6 +68,26 @@ describe "expect(...).to be_predicate" do
     value = double(:happy? => false)
     expect(matcher == value).to be false
   end
+
+  it 'warns of deprecation when actual does not respond to :predicate?' do
+    oddly_happy_class = Class.new do
+      def method_missing(method)
+        return true if method == :happy?
+      end
+    end
+    expect_deprecation_with_call_site(__FILE__, __LINE__ + 1, /Matching with be_happy on an object that doesn't respond to `happy\?`/)
+    expect(oddly_happy_class.new).to be_happy
+  end
+
+  it 'does not warn of deprecation when actual responds to present tense predicate' do
+    present_happy_class = Class.new do
+      def exists?
+        true
+      end
+    end
+    expect_no_deprecation
+    expect(present_happy_class.new).to be_exist
+  end
 end
 
 describe "expect(...).not_to be_predicate" do

data/spec/rspec/matchers/description_generation_spec.rb

@@ -132,7 +132,7 @@ describe "Matchers should be able to generate their own descriptions" do
 
   it "expect(array).not_to match_array [1,2,3]" do
     expect([1,2,3]).to match_array [1,2,3]
-    expect(RSpec::Matchers.generated_description).to eq "should contain exactly 1, 2 and 3"
+    expect(RSpec::Matchers.generated_description).to eq "should contain exactly 1, 2, and 3"
   end
 
   it "expect(...).to match" do

data/spec/rspec/matchers/has_spec.rb

@@ -48,6 +48,20 @@ describe "expect(...).to have_sym(*args)" do
     }.to raise_error(NoMethodError)
   end
 
+  it "warns of deprecation if #has_sym?(*args) is private" do
+    klass = Class.new do
+      def has_foo?
+        true
+      end
+      private :has_foo?
+
+      # prevents double deprecation
+      def respond_to?(_); true; end
+    end
+    expect_deprecation_with_call_site(__FILE__, __LINE__ + 1, /matching with have_foo on private method/)
+    expect(klass.new).to have_foo
+  end
+
   it "reraises an exception thrown in #has_sym?(*args)" do
     o = Object.new
     def o.has_sym?(*args)
@@ -57,6 +71,16 @@ describe "expect(...).to have_sym(*args)" do
       expect(o).to have_sym(:foo)
     }.to raise_error("Funky exception")
   end
+
+  it 'warns of deprecation when actual does not respond to #has_sym?' do
+    foo_class = Class.new do
+      def method_missing(method)
+        return true if method == :has_foo?
+      end
+    end
+    expect_deprecation_with_call_site(__FILE__, __LINE__ + 1, /Matching with have_foo on an object that doesn't respond to `has_foo\?`/)
+    expect(foo_class.new).to have_foo
+  end
 end
 
 describe "expect(...).not_to have_sym(*args)" do

data/spec/rspec/matchers/matcher_spec.rb

@@ -66,6 +66,29 @@ module RSpec::Matchers::DSL
       end
     end
 
+    context "matching blocks" do
+      it 'warns when matching blocks by default' do
+        matcher = RSpec::Matchers::DSL::Matcher.new(:not_supporting_blocks) do
+          match { true }
+        end.for_expected
+
+        expect_deprecation_with_call_site(__FILE__, __LINE__ + 2, /block expectation/)
+        expect(3).to matcher
+        expect { 3 }.to matcher
+      end
+
+      it 'does not when if it declares `supports_block_expectations`' do
+        matcher = RSpec::Matchers::DSL::Matcher.new(:supporting_blocks) do
+          match { true }
+          supports_block_expectations
+        end.for_expected
+
+        expect_no_deprecation
+        expect(3).to matcher
+        expect { 3 }.to matcher
+      end
+    end
+
     context "without overrides" do
       before(:each) do
         @matcher = RSpec::Matchers::DSL::Matcher.new(:be_a_multiple_of) do |multiple|
@@ -604,5 +627,34 @@ module RSpec::Matchers::DSL
       end
     end
 
+    describe "#matcher_execution_context" do
+      before { allow_deprecation }
+
+      let(:matcher) do
+        RSpec::Matchers::DSL::Matcher.new :foo do |expected|
+        end.for_expected(:bar)
+      end
+
+      it 'can be set' do
+        expect {
+          matcher.matcher_execution_context = :the_context
+        }.to change(matcher, :matcher_execution_context).to(:the_context)
+      end
+
+      it 'is the target of method_missing delegation' do
+        matcher.matcher_execution_context = double(:abcd => "efg")
+        expect(matcher.abcd).to eq("efg")
+      end
+
+      specify "the writer is deprecated" do
+        expect_deprecation_with_call_site(__FILE__, __LINE__ + 1, /matcher_execution_context/)
+        matcher.matcher_execution_context = :the_context
+      end
+
+      specify "the reader is deprecated" do
+        expect_deprecation_with_call_site(__FILE__, __LINE__ + 1, /matcher_execution_context/)
+        matcher.matcher_execution_context
+      end
+    end
   end
 end

data/spec/rspec/matchers/pretty_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+module RSpec
+  module Matchers
+    describe Pretty do
+      include Pretty
+
+      describe "#_pretty_print" do
+        it 'is deprecated' do
+          expect_deprecation_with_call_site(__FILE__, __LINE__ + 1, /_pretty_print/)
+          _pretty_print([1, 2])
+        end
+      end
+
+      describe "#expected_to_sentence" do
+        it 'is deprecated' do
+          expect_deprecation_with_call_site(__FILE__, __LINE__ + 1, /expected_to_sentence/)
+          expected_to_sentence
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -2,8 +2,8 @@ Dir['./spec/support/**/*'].each {|f| require f}
 
 RSpec::configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.color_enabled = true
-  config.filter_run :focused
+  config.color = true
+  config.filter_run :focus
   config.run_all_when_everything_filtered = true
   config.order = :random
 

data/spec/support/helper_methods.rb

@@ -26,6 +26,12 @@ module DeprecationHelpers
     )
   end
 
+  def expect_deprecation_with_replacement(snippet)
+    expect(RSpec).to receive(:deprecate) do |_, options|
+      expect(options[:replacement]).to match(snippet)
+    end
+  end
+
   def allow_deprecation
     allow(RSpec.configuration.reporter).to receive(:deprecation)
   end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  version: 2.99.0.beta2
-  prerelease: 7
+  version: 2.99.0.rc1
 platform: ruby
 authors:
 - Steven Baker
@@ -10,76 +9,68 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.3
-    - - <
+    - - "<"
       - !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
-    - - <
+    - - "<"
       - !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
         version: 10.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.9
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   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)
@@ -88,9 +79,50 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".document"
+- ".yardopts"
+- Changelog.md
+- License.txt
+- README.md
+- features/README.md
+- features/Upgrade.md
+- features/built_in_matchers/README.md
+- features/built_in_matchers/be.feature
+- features/built_in_matchers/be_within.feature
+- features/built_in_matchers/cover.feature
+- features/built_in_matchers/end_with.feature
+- features/built_in_matchers/equality.feature
+- features/built_in_matchers/exist.feature
+- features/built_in_matchers/expect_change.feature
+- features/built_in_matchers/expect_error.feature
+- features/built_in_matchers/have.feature
+- features/built_in_matchers/include.feature
+- features/built_in_matchers/match.feature
+- features/built_in_matchers/operators.feature
+- features/built_in_matchers/predicates.feature
+- features/built_in_matchers/respond_to.feature
+- features/built_in_matchers/satisfy.feature
+- features/built_in_matchers/start_with.feature
+- features/built_in_matchers/throw_symbol.feature
+- features/built_in_matchers/types.feature
+- features/built_in_matchers/yield.feature
+- features/custom_matchers/access_running_example.feature
+- features/custom_matchers/define_diffable_matcher.feature
+- features/custom_matchers/define_matcher.feature
+- features/custom_matchers/define_matcher_outside_rspec.feature
+- features/custom_matchers/define_matcher_with_fluent_interface.feature
+- features/customized_message.feature
+- features/diffing.feature
+- features/implicit_docstrings.feature
+- features/step_definitions/additional_cli_steps.rb
+- features/support/env.rb
+- features/support/rubinius.rb
+- features/syntax_configuration.feature
+- features/test_frameworks/test_unit.feature
 - lib/rspec-expectations.rb
 - lib/rspec/expectations.rb
 - lib/rspec/expectations/caller_filter.rb
+- lib/rspec/expectations/configuration.rb
 - lib/rspec/expectations/deprecation.rb
 - lib/rspec/expectations/differ.rb
 - lib/rspec/expectations/errors.rb
@@ -128,7 +160,6 @@ files:
 - lib/rspec/matchers/built_in/throw_symbol.rb
 - lib/rspec/matchers/built_in/yield.rb
 - lib/rspec/matchers/compatibility.rb
-- lib/rspec/matchers/configuration.rb
 - lib/rspec/matchers/differentiate_block_method_types.rb
 - lib/rspec/matchers/dsl.rb
 - lib/rspec/matchers/extensions/instance_eval_with_args.rb
@@ -139,46 +170,7 @@ files:
 - lib/rspec/matchers/operator_matcher.rb
 - lib/rspec/matchers/pretty.rb
 - lib/rspec/matchers/test_unit_integration.rb
-- README.md
-- License.txt
-- Changelog.md
-- .yardopts
-- .document
-- features/README.md
-- features/Upgrade.md
-- features/built_in_matchers/README.md
-- features/built_in_matchers/be.feature
-- features/built_in_matchers/be_within.feature
-- features/built_in_matchers/cover.feature
-- features/built_in_matchers/end_with.feature
-- features/built_in_matchers/equality.feature
-- features/built_in_matchers/exist.feature
-- features/built_in_matchers/expect_change.feature
-- features/built_in_matchers/expect_error.feature
-- features/built_in_matchers/have.feature
-- features/built_in_matchers/include.feature
-- features/built_in_matchers/match.feature
-- features/built_in_matchers/operators.feature
-- features/built_in_matchers/predicates.feature
-- features/built_in_matchers/respond_to.feature
-- features/built_in_matchers/satisfy.feature
-- features/built_in_matchers/start_with.feature
-- features/built_in_matchers/throw_symbol.feature
-- features/built_in_matchers/types.feature
-- features/built_in_matchers/yield.feature
-- features/custom_matchers/access_running_example.feature
-- features/custom_matchers/define_diffable_matcher.feature
-- features/custom_matchers/define_matcher.feature
-- features/custom_matchers/define_matcher_outside_rspec.feature
-- features/custom_matchers/define_matcher_with_fluent_interface.feature
-- features/customized_message.feature
-- features/diffing.feature
-- features/implicit_docstrings.feature
-- features/step_definitions/additional_cli_steps.rb
-- features/support/env.rb
-- features/support/rubinius.rb
-- features/syntax_configuration.feature
-- features/test_frameworks/test_unit.feature
+- spec/rspec/expectations/configuration_spec.rb
 - spec/rspec/expectations/differ_spec.rb
 - spec/rspec/expectations/expectation_target_spec.rb
 - spec/rspec/expectations/extensions/kernel_spec.rb
@@ -193,7 +185,6 @@ files:
 - spec/rspec/matchers/be_spec.rb
 - spec/rspec/matchers/be_within_spec.rb
 - spec/rspec/matchers/change_spec.rb
-- spec/rspec/matchers/configuration_spec.rb
 - spec/rspec/matchers/cover_spec.rb
 - spec/rspec/matchers/description_generation_spec.rb
 - spec/rspec/matchers/differentiate_block_method_types_spec.rb
@@ -211,6 +202,7 @@ files:
 - spec/rspec/matchers/matcher_spec.rb
 - spec/rspec/matchers/method_missing_spec.rb
 - spec/rspec/matchers/operator_matcher_spec.rb
+- spec/rspec/matchers/pretty_spec.rb
 - spec/rspec/matchers/raise_error_spec.rb
 - spec/rspec/matchers/respond_to_spec.rb
 - spec/rspec/matchers/satisfy_spec.rb
@@ -227,32 +219,28 @@ files:
 homepage: http://github.com/rspec/rspec-expectations
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--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: -1031403983594165086
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: rspec
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: rspec-expectations-2.99.0.beta2
+specification_version: 4
+summary: rspec-expectations-2.99.0.rc1
 test_files:
 - features/README.md
 - features/Upgrade.md
@@ -289,6 +277,7 @@ test_files:
 - features/support/rubinius.rb
 - features/syntax_configuration.feature
 - features/test_frameworks/test_unit.feature
+- spec/rspec/expectations/configuration_spec.rb
 - spec/rspec/expectations/differ_spec.rb
 - spec/rspec/expectations/expectation_target_spec.rb
 - spec/rspec/expectations/extensions/kernel_spec.rb
@@ -303,7 +292,6 @@ test_files:
 - spec/rspec/matchers/be_spec.rb
 - spec/rspec/matchers/be_within_spec.rb
 - spec/rspec/matchers/change_spec.rb
-- spec/rspec/matchers/configuration_spec.rb
 - spec/rspec/matchers/cover_spec.rb
 - spec/rspec/matchers/description_generation_spec.rb
 - spec/rspec/matchers/differentiate_block_method_types_spec.rb
@@ -321,6 +309,7 @@ test_files:
 - spec/rspec/matchers/matcher_spec.rb
 - spec/rspec/matchers/method_missing_spec.rb
 - spec/rspec/matchers/operator_matcher_spec.rb
+- spec/rspec/matchers/pretty_spec.rb
 - spec/rspec/matchers/raise_error_spec.rb
 - spec/rspec/matchers/respond_to_spec.rb
 - spec/rspec/matchers/satisfy_spec.rb