rspec-expectations 2.14.4 → 2.14.5

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: 2fe9c0e9206aaf6e58ecb9d8ef9e906668443bad
-  data.tar.gz: b87df2d0361493a79a7f6b481b55e13babff42e8
-SHA512:
-  metadata.gz: e72fd27b6f8595cccd408ce04cae06c4ec222f424015c0e50a942ab03ee40b716a3d159c4b88d73715769ab45156056d9a51c0f223335c8ddc1ac9cc1fde01bf
-  data.tar.gz: cf203e11140a60a320babfa6be93bd5943b1645a6ccd4b5dc01edaefd5fbe0ed7e770ba05f2deb9f2b096c76213db103cf8ea8042ef8f6e9052ac24d6e45ca04
+--- 
+SHA1: 
+  metadata.gz: f05471f3e092a7949e6a65050baebd47319f3244
+  data.tar.gz: d285c05c76c8e3185c735444436bb26f09f76900
+SHA512: 
+  metadata.gz: e035793f67b9d902d8afa94ede41915f39aa8bfacddf8cb1a03ed2c89d2e40ee0ecee5dc4bc8557d8ad933d9f33179a971d3cdd1bb2944cfdec12f27b0ddbb90
+  data.tar.gz: f217c62ff802d25bde703e383e7b73deb28b9c895edc14e8576fae14db9ada4264bdd4cc8edd29372e5bb8dd37abf7ca1c21eda446d6bdea9d034b5c1017abd2

data/Changelog.md

@@ -1,3 +1,10 @@
+### 2.14.5 / 2014-02-01
+[full changelog](http://github.com/rspec/rspec-expectations/compare/v2.14.4...v2.14.5)
+
+Bug fixes
+
+* Fix wrong matcher descriptions with falsey expected value (yujinakayama)
+
 ### 2.14.4 / 2013-11-06
 [full changelog](http://github.com/rspec/rspec-expectations/compare/v2.14.3...v2.14.4)
 

data/lib/rspec/expectations/version.rb

@@ -2,7 +2,7 @@ module RSpec
   module Expectations
     # @private
     module Version
-      STRING = '2.14.4'
+      STRING = '2.14.5'
     end
   end
 end

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

@@ -14,10 +14,12 @@ module RSpec
       class BaseMatcher
         include RSpec::Matchers::Pretty
 
+        UNDEFINED = Object.new.freeze
+
         attr_reader :actual, :expected, :rescued_exception
 
-        def initialize(expected = nil)
-          @expected = expected
+        def initialize(expected = UNDEFINED)
+          @expected = expected unless UNDEFINED.equal?(expected)
         end
 
         def matches?(actual)
@@ -36,17 +38,17 @@ module RSpec
         end
 
         def failure_message_for_should
-          assert_ivars :@actual, :@expected
+          assert_ivars :@actual
           "expected #{@actual.inspect} to #{name_to_sentence}#{expected_to_sentence}"
         end
 
         def failure_message_for_should_not
-          assert_ivars :@actual, :@expected
+          assert_ivars :@actual
           "expected #{@actual.inspect} not to #{name_to_sentence}#{expected_to_sentence}"
         end
 
         def description
-          expected ? "#{name_to_sentence} #{@expected.inspect}" : name_to_sentence
+          defined?(@expected) ? "#{name_to_sentence} #{@expected.inspect}" : name_to_sentence
         end
 
         def diffable?

data/spec/rspec/matchers/base_matcher_spec.rb

@@ -39,6 +39,27 @@ module RSpec::Matchers::BuiltIn
 
     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 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
+
     describe "#==" do
       it "responds the same way as matches?" do
         matcher = Class.new(BaseMatcher) do

data/spec/rspec/matchers/equal_spec.rb

@@ -24,6 +24,32 @@ module RSpec
         expect(matcher.description).to eq "equal 1"
       end
 
+      context "when the expected object is falsey in conditinal semantics" do
+        it "describes itself with the expected object" do
+          matcher = equal(nil)
+          matcher.matches?(nil)
+          expect(matcher.description).to eq "equal nil"
+        end
+      end
+
+      context "when the expected object's #equal? always returns true" do
+        let(:strange_string) do
+          string = "foo"
+
+          def string.equal?(other)
+            true
+          end
+
+          string
+        end
+
+        it "describes itself with the expected object" do
+          matcher = equal(strange_string)
+          matcher.matches?(strange_string)
+          expect(matcher.description).to eq 'equal "foo"'
+        end
+      end
+
       it "suggests the `eq` matcher on failure" do
         expected, actual = "1", "1"
         expect {

metadata

@@ -1,84 +1,69 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rspec-expectations
-version: !ruby/object:Gem::Version
-  version: 2.14.4
+version: !ruby/object:Gem::Version 
+  version: 2.14.5
 platform: ruby
-authors:
+authors: 
 - Steven Baker
 - David Chelimsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: diff-lcs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
+
+date: 2014-02-01 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.1.3
     - - <
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
+      - !ruby/object:Gem::Version 
+        version: "2.0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    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
-    requirements:
+  name: diff-lcs
+  type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 10.0.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 10.0.0
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  name: rake
+  type: :development
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.1.9
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  name: cucumber
+  type: :development
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.9
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        version: "0.5"
+  prerelease: false
   name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.5'
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.5'
+  requirement: *id004
 description: rspec expectations (should[_not] and matchers)
 email: rspec-users@rubyforge.org
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/rspec-expectations.rb
 - lib/rspec/expectations.rb
 - lib/rspec/expectations/deprecation.rb
@@ -212,31 +197,32 @@ files:
 - spec/support/ruby_version.rb
 - spec/support/shared_examples.rb
 homepage: http://github.com/rspec/rspec-expectations
-licenses:
+licenses: 
 - MIT
 metadata: {}
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - &id005 
+    - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id005
 requirements: []
+
 rubyforge_project: rspec
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: rspec-expectations-2.14.4
-test_files:
+summary: rspec-expectations-2.14.5
+test_files: 
 - features/README.md
 - features/Upgrade.md
 - features/built_in_matchers/README.md