rspec-expectations 2.13.0 → 2.99.0

data/spec/rspec/expectations/handler_spec.rb

@@ -49,21 +49,21 @@ module RSpec
     describe PositiveExpectationHandler do
       describe "#handle_matcher" do
         it "asks the matcher if it matches" do
-          matcher = mock("matcher")
+          matcher = double("matcher")
           actual = Object.new
           matcher.should_receive(:matches?).with(actual).and_return(true)
           RSpec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher)
         end
 
         it "returns the match value" do
-          matcher = mock("matcher")
+          matcher = double("matcher")
           actual = Object.new
           matcher.should_receive(:matches?).with(actual).and_return(:this_value)
           expect(RSpec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher)).to eq :this_value
         end
 
         it "calls failure_message_for_should if the matcher implements it" do
-          matcher = mock("matcher", :failure_message_for_should => "message", :matches? => false)
+          matcher = double("matcher", :failure_message_for_should => "message", :matches? => false)
           actual = Object.new
 
           ::RSpec::Expectations.should_receive(:fail_with).with("message")
@@ -72,7 +72,7 @@ module RSpec
         end
 
         it "calls fail if matcher.diffable?" do
-          matcher = mock("matcher",
+          matcher = double("matcher",
             :diffable? => true,
             :failure_message_for_should => "message",
             :matches? => false,
@@ -87,7 +87,7 @@ module RSpec
         end
 
         it "calls failure_message if the matcher does not implement failure_message_for_should" do
-          matcher = mock("matcher", :failure_message => "message", :matches? => false)
+          matcher = double("matcher", :failure_message => "message", :matches? => false)
           actual = Object.new
 
           ::RSpec::Expectations.should_receive(:fail_with).with("message")
@@ -96,45 +96,56 @@ module RSpec
 
         end
 
-        it "appends the :or message in the options hash passed to should" do
-          matcher = mock("matcher", :failure_message_for_should => "message", :matches? => false)
+        it "uses the custom failure message when one is provided" do
+          matcher = double("matcher", :failure_message_for_should => "message", :matches? => false)
           actual = Object.new
 
           ::RSpec::Expectations.should_receive(:fail_with).with("custom")
 
           RSpec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher, "custom")
         end
+
+        it "uses the custom failure message when one is provided as a callable object" do
+          matcher = double("matcher", :failure_message_for_should => "message", :matches? => false)
+          actual = Object.new
+
+          failure_message = double("failure message", :call => "custom")
+
+          ::RSpec::Expectations.should_receive(:fail_with).with("custom")
+
+          RSpec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher, failure_message)
+        end
       end
     end
 
     describe NegativeExpectationHandler do
       describe "#handle_matcher" do
         it "asks the matcher if it doesn't match when the matcher responds to #does_not_match?" do
-          matcher = mock("matcher", :does_not_match? => true, :negative_failure_message => nil)
+          matcher = double("matcher", :does_not_match? => true, :negative_failure_message => nil)
           actual = Object.new
           matcher.should_receive(:does_not_match?).with(actual).and_return(true)
           RSpec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
         end
 
         it "asks the matcher if it matches when the matcher doesn't respond to #does_not_match?" do
-          matcher = mock("matcher")
+          matcher = double("matcher")
           actual = Object.new
-          matcher.stub!(:negative_failure_message)
+          matcher.stub(:negative_failure_message)
           matcher.should_receive(:matches?).with(actual).and_return(false)
           RSpec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
         end
 
         it "returns the match value" do
-          matcher = mock("matcher")
+          matcher = double("matcher")
           actual = Object.new
           matcher.should_receive(:matches?).with(actual).and_return(false)
-          matcher.stub!(:negative_failure_message).and_return("ignore")
-          expect(RSpec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)).to be_false
+          matcher.stub(:negative_failure_message).and_return("ignore")
+          expect(RSpec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)).to be_falsey
         end
 
 
         it "calls failure_message_for_should_not if the matcher implements it" do
-          matcher = mock("matcher", :failure_message_for_should_not => "message", :matches? => true)
+          matcher = double("matcher", :failure_message_for_should_not => "message", :matches? => true)
           actual = Object.new
 
           ::RSpec::Expectations.should_receive(:fail_with).with("message")
@@ -144,7 +155,7 @@ module RSpec
         end
 
         it "calls negative_failure_message if the matcher does not implement failure_message_for_should_not" do
-          matcher = mock("matcher", :negative_failure_message => "message", :matches? => true)
+          matcher = double("matcher", :negative_failure_message => "message", :matches? => true)
           actual = Object.new
 
           ::RSpec::Expectations.should_receive(:fail_with).with("message")
@@ -155,7 +166,7 @@ module RSpec
 
 
         it "calls fail if matcher.diffable?" do
-          matcher = mock("matcher",
+          matcher = double("matcher",
             :diffable? => true,
             :failure_message_for_should_not => "message",
             :matches? => true,
@@ -169,8 +180,8 @@ module RSpec
           RSpec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
         end
 
-        it "appends the :or message in the options hash passed to should" do
-          matcher = mock("matcher", :failure_message_for_should_not => "message", :matches? => true)
+        it "uses the custom failure message when one is provided" do
+          matcher = double("matcher", :failure_message_for_should_not => "message", :matches? => true)
           actual = Object.new
 
           ::RSpec::Expectations.should_receive(:fail_with).with("custom")
@@ -178,6 +189,16 @@ module RSpec
           RSpec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher, "custom")
         end
 
+        it "uses the custom failure message when one is provided as a callable object" do
+          matcher = double("matcher", :failure_message_for_should_not => "message", :matches? => true)
+          actual = Object.new
+
+          failure_message = double("failure message", :call => "custom")
+
+          ::RSpec::Expectations.should_receive(:fail_with).with("custom")
+
+          RSpec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher, failure_message)
+        end
       end
     end
 
@@ -189,10 +210,10 @@ module RSpec
         expect(5).to arbitrary_matcher(:expected => "wrong").with(5)
         expect { expect(5).to arbitrary_matcher(:expected => 4) }.to fail_with("expected 4, got 5")
         expect { expect(5).to arbitrary_matcher(:expected => 5).with(4) }.to fail_with("expected 4, got 5")
-        expect(5).to_not arbitrary_matcher(:expected => 4)
-        expect(5).to_not arbitrary_matcher(:expected => 5).with(4)
-        expect { expect(5).to_not arbitrary_matcher(:expected => 5) }.to fail_with("expected not 5, got 5")
-        expect { expect(5).to_not arbitrary_matcher(:expected => 4).with(5) }.to fail_with("expected not 5, got 5")
+        expect(5).not_to arbitrary_matcher(:expected => 4)
+        expect(5).not_to arbitrary_matcher(:expected => 5).with(4)
+        expect { expect(5).not_to arbitrary_matcher(:expected => 5) }.to fail_with("expected not 5, got 5")
+        expect { expect(5).not_to arbitrary_matcher(:expected => 4).with(5) }.to fail_with("expected not 5, got 5")
       end
 
       it "handles the submitted block" do

data/spec/rspec/expectations/syntax_spec.rb

@@ -6,9 +6,21 @@ module RSpec
       context "when passing a message to an expectation" do
         let(:warner) { ::Kernel }
 
+        let(:string_like_object) do
+          Struct.new(:to_str, :to_s).new(*(["Ceci n'est pas une Chaine."]*2))
+        end
+
+        let(:insufficiently_string_like_object) do
+          Struct.new(:to_s).new("Ceci n'est pas une Chaine.")
+        end
+
+        let(:callable_object) do
+          Struct.new(:call).new("Ceci n'est pas une Chaine.")
+        end
+
         describe "expect(...).to" do
           it "prints a warning when the message object isn't a String" do
-            warner.should_receive(:warn).with /ignoring.*message/
+            warner.should_receive(:warn).with(/ignoring.*message/)
             expect(3).to eq(3), :not_a_string
           end
 
@@ -16,11 +28,26 @@ module RSpec
             warner.should_not_receive(:warn)
             expect(3).to eq(3), "a string"
           end
+
+          it "doesn't print a warning when message responds to to_str" do
+            warner.should_not_receive(:warn)
+            expect(3).to eq(3), string_like_object
+          end
+
+          it "prints a warning when the message object handles to_s but not to_str" do
+            warner.should_receive(:warn).with(/ignoring.*message/)
+            expect(3).to eq(3), insufficiently_string_like_object
+          end
+
+          it "doesn't print a warning when message responds to call" do
+            warner.should_not_receive(:warn)
+            expect(3).to eq(3), callable_object
+          end
         end
 
-        describe "expect(...).to_not" do
+        describe "expect(...).not_to" do
           it "prints a warning when the message object isn't a String" do
-            warner.should_receive(:warn).with /ignoring.*message/
+            warner.should_receive(:warn).with(/ignoring.*message/)
             expect(3).not_to eq(4), :not_a_string
           end
 
@@ -28,6 +55,21 @@ module RSpec
             warner.should_not_receive(:warn)
             expect(3).not_to eq(4), "a string"
           end
+
+          it "doesn't print a warning when message responds to to_str" do
+            warner.should_not_receive(:warn)
+            expect(3).not_to eq(4), string_like_object
+          end
+
+          it "prints a warning when the message object handles to_s but not to_str" do
+            warner.should_receive(:warn).with(/ignoring.*message/)
+            expect(3).not_to eq(4), insufficiently_string_like_object
+          end
+
+          it "doesn't print a warning when message responds to call" do
+            warner.should_not_receive(:warn)
+            expect(3).not_to eq(4), callable_object
+          end
         end
       end
 
@@ -49,8 +91,8 @@ module RSpec
 
         context "when only :expect is enabled" do
           before do
-            expect(Syntax.should_enabled?).to be_false
-            expect(Syntax.expect_enabled?).to be_true
+            expect(Syntax.should_enabled?).to be_falsey
+            expect(Syntax.expect_enabled?).to be_truthy
           end
 
           it 'generates a positive expression using the expect syntax' do
@@ -64,8 +106,8 @@ module RSpec
 
         context "when both :should and :expect are enabled", :uses_should do
           before do
-            expect(Syntax.should_enabled?).to be_true
-            expect(Syntax.expect_enabled?).to be_true
+            expect(Syntax.should_enabled?).to be_truthy
+            expect(Syntax.expect_enabled?).to be_truthy
           end
 
           it 'generates a positive expression using the expect syntax' do
@@ -79,8 +121,8 @@ module RSpec
 
         context "when only :should is enabled", :uses_only_should do
           before do
-            Syntax.should_enabled?.should be_true
-            Syntax.expect_enabled?.should be_false
+            Syntax.should_enabled?.should be_truthy
+            Syntax.expect_enabled?.should be_falsey
           end
 
           it 'generates a positive expression using the expect syntax' do

data/spec/rspec/expectations_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+module RSpec
+  describe Expectations do
+    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)
+    end
+
+    it 'has an up-to-date caller_filter file' do
+      expectations = file_contents_for("expectations", "rspec/expectations/caller_filter.rb")
+      core         = file_contents_for("core",         "rspec/core/caller_filter.rb")
+
+      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
+        def foo
+          :bar
+        end
+      end
+
+      class ClassWithMethodOverridden < UntamperedClass
+        def method
+          :baz
+        end
+      end
+
+      if RUBY_VERSION.to_f > 1.8
+        class BasicClass < BasicObject
+          def foo
+            :bar
+          end
+        end
+
+        class BasicClassWithKernel < BasicClass
+          include ::Kernel
+        end
+      end
+
+      it 'fetches method definitions for vanilla objects' do
+        object = UntamperedClass.new
+        expect(Expectations.method_handle_for(object, :foo).call).to eq :bar
+      end
+
+      it 'fetches method definitions for objects with method redefined' do
+        object = ClassWithMethodOverridden.new
+        expect(Expectations.method_handle_for(object, :foo).call).to eq :bar
+      end
+
+      it 'fetches method definitions for basic objects', :if => (RUBY_VERSION.to_i >= 2 && RUBY_ENGINE != 'rbx') do
+        object = BasicClass.new
+        expect(Expectations.method_handle_for(object, :foo).call).to eq :bar
+      end
+
+      it 'fetches method definitions for basic objects with kernel mixed in', :if => RUBY_VERSION.to_f > 1.8 do
+        object = BasicClassWithKernel.new
+        expect(Expectations.method_handle_for(object, :foo).call).to eq :bar
+      end
+    end
+  end
+end

data/spec/rspec/matchers/base_matcher_spec.rb

@@ -8,21 +8,21 @@ module RSpec::Matchers::BuiltIn
       end
 
       it "returns true if there are no errors" do
-        expect(matcher.match_unless_raises {}).to be_true
+        expect(matcher.match_unless_raises {}).to be_truthy
       end
 
       it "returns false if there is an error" do
-        expect(matcher.match_unless_raises { raise }).to be_false
+        expect(matcher.match_unless_raises { raise }).to be_falsey
       end
 
       it "returns false if the only submitted error is raised" do
-        expect(matcher.match_unless_raises(RuntimeError){ raise "foo" }).to be_false
+        expect(matcher.match_unless_raises(RuntimeError){ raise "foo" }).to be_falsey
       end
 
       it "returns false if any of several errors submitted is raised" do
-        expect(matcher.match_unless_raises(RuntimeError, ArgumentError, NameError) { raise "foo" }).to be_false
-        expect(matcher.match_unless_raises(RuntimeError, ArgumentError, NameError) { raise ArgumentError.new('') }).to be_false
-        expect(matcher.match_unless_raises(RuntimeError, ArgumentError, NameError) { raise NameError.new('') }).to be_false
+        expect(matcher.match_unless_raises(RuntimeError, ArgumentError, NameError) { raise "foo" }).to be_falsey
+        expect(matcher.match_unless_raises(RuntimeError, ArgumentError, NameError) { raise ArgumentError.new('') }).to be_falsey
+        expect(matcher.match_unless_raises(RuntimeError, ArgumentError, NameError) { raise NameError.new('') }).to be_falsey
       end
 
       it "re-raises any error other than one of those specified" do
@@ -39,24 +39,39 @@ module RSpec::Matchers::BuiltIn
 
     end
 
-    describe "#==" do
-      it "responds the same way as matches?" do
-        matcher = Class.new(BaseMatcher) do
-          def initialize(expected)
-            @expected = expected
-          end
+    describe "#failure_message_for_should" do
+      context "when the parameter to .new is omitted" do
+        it "describes what was expected" do
+          matcher_class = Class.new(BaseMatcher) do
+            def name=(name)
+              @name = name
+            end
 
-          def matches?(actual)
-            (@actual = actual) == @expected
+            def match(expected, actual)
+              false
+            end
           end
+
+          matcher = matcher_class.new
+          matcher.name = "be something"
+          matcher.matches?("foo")
+          expect(matcher.failure_message_for_should).to eq('expected "foo" to be something')
         end
+      end
+    end
 
-        expect(matcher.new(3).matches?(3)).to be_true
-        expect(matcher.new(3)).to eq(3)
+    it_behaves_like "an RSpec matcher", :valid_value => 3, :invalid_value => 4 do
+      matcher_class = Class.new(BaseMatcher) do
+        def initialize(expected)
+          @expected = expected
+        end
 
-        expect(matcher.new(3).matches?(4)).to be_false
-        expect(matcher.new(3)).not_to eq(4)
+        def matches?(actual)
+          (@actual = actual) == @expected
+        end
       end
+
+      let(:matcher) { matcher_class.new(3) }
     end
   end
 end

data/spec/rspec/matchers/be_close_spec.rb

@@ -4,17 +4,20 @@ module RSpec
   module Matchers
     describe "expect(actual).to be_close(expected, delta)" do
       before(:each) do
-        RSpec.stub(:warn)
+        allow(RSpec).to receive(:deprecate)
       end
 
-      it "delegates to be_within(delta).of(expected)" do
-        should_receive(:be_within).with(0.5).and_return( be_within_matcher = stub )
-        be_within_matcher.should_receive(:of).with(3.0)
+      it "is deprecated" do
+        expect_deprecation_with_type('be_close(3.0, 0.5)',
+          'be_within(0.5).of(3.0)',
+          'the be_close matcher'
+        )
         be_close(3.0, 0.5)
       end
 
-      it "prints a deprecation warning" do
-        RSpec.should_receive(:warn).with(/please use be_within.*instead/)
+      it "delegates to be_within(delta).of(expected)" do
+        should_receive(:be_within).with(0.5).and_return( be_within_matcher = double )
+        be_within_matcher.should_receive(:of).with(3.0)
         be_close(3.0, 0.5)
       end
     end