rspec-expectations 2.14.0.rc1 → 2.14.0

data/Changelog.md

@@ -1,3 +1,15 @@
+### 2.14.0 / 2013-07-06
+[full changelog](http://github.com/rspec/rspec-expectations/compare/v2.14.0.rc1...v2.14.0)
+
+Bug fixes
+
+* Values that are not matchers use `#inspect`, rather than `#description` for
+  documentation output (Andy Lindeman, Sam Phippen).
+* Make `expect(a).to be_within(x).percent_of(y)` work with negative y
+  (Katsuhiko Nishimra).
+* Make the `be_predicate` matcher work as expected used with `expect{...}.to
+  change...`  (Sam Phippen).
+
 ### 2.14.0.rc1 / 2013-05-27
 [full changelog](http://github.com/rspec/rspec-expectations/compare/v2.13.0...v2.14.0.rc1)
 

data/lib/rspec/expectations/version.rb

@@ -2,7 +2,7 @@ module RSpec
   module Expectations
     # @private
     module Version
-      STRING = '2.14.0.rc1'
+      STRING = '2.14.0'
     end
   end
 end

data/lib/rspec/matchers.rb

@@ -174,6 +174,14 @@ module RSpec
   #       config.include(CustomGameMatchers)
   #     end
   module Matchers
+    # @api private
+    def self.is_a_matcher?(obj)
+      return true  if ::RSpec::Matchers::BuiltIn::BaseMatcher === obj
+      return false if obj.respond_to?(:i_respond_to_everything_so_im_not_really_a_matcher)
+      return false unless obj.respond_to?(:matches?)
+
+      obj.respond_to?(:failure_message_for_should) || obj.respond_to?(:failure_message)
+    end
 
     # Passes if actual is truthy (anything but false or nil)
     def be_true

data/lib/rspec/matchers/built_in/be.rb

@@ -148,6 +148,8 @@ it is a bit confusing.
           end
         end
 
+        alias === matches?
+
         def failure_message_for_should
           "expected #{predicate}#{args_to_s} to return true, got #{@result.inspect}"
         end

data/lib/rspec/matchers/built_in/be_within.rb

@@ -23,7 +23,7 @@ module RSpec
 
         def percent_of(expected)
           @expected  = expected
-          @tolerance = @delta * @expected / 100.0
+          @tolerance = @delta * @expected.abs / 100.0
           @unit      = '%'
           self
         end

data/lib/rspec/matchers/built_in/change.rb

@@ -39,7 +39,7 @@ MESSAGE
           if @eval_before && !expected_matches_actual?(@expected_before, @actual_before)
             "#{message} should have initially been #{@expected_before.inspect}, but was #{@actual_before.inspect}"
           elsif @eval_after && !expected_matches_actual?(@expected_after, @actual_after)
-            "#{message} should have been changed to #{@expected_after.inspect}, but is now #{@actual_after.inspect}"
+            "#{message} should have been changed to #{failure_message_for_expected_after}, but is now #{@actual_after.inspect}"
           elsif @expected_delta
             "#{message} should have been changed by #{@expected_delta.inspect}, but was changed by #{actual_delta.inspect}"
           elsif @minimum
@@ -92,6 +92,14 @@ MESSAGE
 
         private
 
+        def failure_message_for_expected_after
+          if RSpec::Matchers.is_a_matcher?(@expected_after)
+            @expected_after.description
+          else
+            @expected_after.inspect
+          end
+        end
+
         def message
           @message || "result"
         end

data/lib/rspec/matchers/built_in/include.rb

@@ -23,7 +23,7 @@ module RSpec
         def diffable?
           # Matchers do not diff well, since diff uses their inspect
           # output, which includes their instance variables and such.
-          @expected.none? { |e| is_a_matcher?(e) }
+          @expected.none? { |e| RSpec::Matchers.is_a_matcher?(e) }
         end
 
         private
@@ -53,15 +53,7 @@ module RSpec
         end
 
         def comparing_with_matcher?(actual, expected)
-          actual.is_a?(Array) && is_a_matcher?(expected)
-        end
-
-        def is_a_matcher?(object)
-          return false if object.respond_to?(:i_respond_to_everything_so_im_not_really_a_matcher)
-
-          [:failure_message_for_should, :failure_message].any? do |msg|
-            object.respond_to?(msg)
-          end && object.respond_to?(:matches?)
+          actual.is_a?(Array) && RSpec::Matchers.is_a_matcher?(expected)
         end
       end
     end

data/lib/rspec/matchers/pretty.rb

@@ -35,7 +35,7 @@ module RSpec
       end
 
       def to_word(item)
-        item.respond_to?(:description) ? item.description : item.inspect
+        is_matcher_with_description?(item) ? item.description : item.inspect
       end
 
       def name_to_sentence
@@ -59,6 +59,12 @@ module RSpec
         word.downcase!
         word
       end
+
+      private
+
+      def is_matcher_with_description?(object)
+        RSpec::Matchers.is_a_matcher?(object) && object.respond_to?(:description)
+      end
     end
   end
 end

data/spec/rspec/matchers/be_within_spec.rb

@@ -31,6 +31,10 @@ module RSpec
         expect(1.0001).to be_within(5).percent_of(1)
       end
 
+      it "passes with negative arguments" do
+        expect(-1.0001).to be_within(5).percent_of(-1)
+      end
+
       it "fails when actual < (expected - delta)" do
         expect {
           expect(4.49).to be_within(0.5).of(5.0)

data/spec/rspec/matchers/change_spec.rb

@@ -72,6 +72,17 @@ describe "expect { ... }.to change(actual, message)" do
       expect {@instance.some_value << 1}.to change(@instance, :some_value)
     end
 
+    it "fails when a predicate on the actual fails" do
+      expect do
+        expect {@instance.some_value << 1}.to change { @instance.some_value }.to be_empty
+      end.to fail_with(/result should have been changed to/)
+    end
+
+    it "passes when a predicate on the actual passes" do
+      @instance.some_value = [1]
+      expect {@instance.some_value.pop}.to change { @instance.some_value }.to be_empty
+    end
+
     it "fails when actual is not modified by the block" do
       expect do
         expect {}.to change(@instance, :some_value)

data/spec/rspec/matchers/description_generation_spec.rb

@@ -107,11 +107,25 @@ describe "Matchers should be able to generate their own descriptions" do
     expect(RSpec::Matchers.generated_description).to eq "should have at most 4 players"
   end
 
-  it "expect(...).to include" do
+  it "expect(...).to include(x)" do
     expect([1,2,3]).to include(3)
     expect(RSpec::Matchers.generated_description).to eq "should include 3"
   end
 
+  it "expect(...).to include(x) when x responds to description but is not a matcher" do
+    obj = double(:description => "description", :inspect => "inspect")
+    expect([obj]).to include(obj)
+    expect(RSpec::Matchers.generated_description).to eq "should include inspect"
+  end
+
+  it "expect(...).to include(x) when x responds to description and is a matcher" do
+    matcher = double(:description                => "description",
+                     :matches?                   => true,
+                     :failure_message_for_should => "")
+    expect([matcher]).to include(matcher)
+    expect(RSpec::Matchers.generated_description).to eq "should include description"
+  end
+
   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"

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  prerelease: 7
-  version: 2.14.0.rc1
+  prerelease: 
+  version: 2.14.0
 platform: ruby
 authors:
 - Steven Baker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -233,20 +233,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3852254251876092451
+      hash: -2919541554530046896
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -2919541554530046896
   none: false
 requirements: []
 rubyforge_project: rspec
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-expectations-2.14.0.rc1
+summary: rspec-expectations-2.14.0
 test_files:
 - features/README.md
 - features/Upgrade.md