rspec-expectations 3.5.0.beta3 → 3.5.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a6496869e9518ad7b96e0618ee997db0f593545
-  data.tar.gz: b975ea80a7855d3b8e596e94fb5e474efff707aa
+  metadata.gz: 9d95b80f9a64a43b6e1f0e95dcc4e2dfd0cfa1af
+  data.tar.gz: 7afd8be35cbcab028f3099e393c67dd762535b10
 SHA512:
-  metadata.gz: 9142626323678bbaba0597848663d5c1fdf85f29920507246ce4d376a93f44adc1511f877c43ce7251270e9573c1d8d0b6324898a155d9e25912fe6b71ad0d90
-  data.tar.gz: 610ed1c18c06411a1506884a13b73d6951d39c7d0035d9360d45d915df721c04676db5ad1257c28d4f2a111aa2629062934f83f3867bc3359dc86e76cfff8813
+  metadata.gz: 26f7c1f25f63e1af63acff047c324213d4c564c37e11f25210552ac3e5006026788b4ea74deeb8b84faf2e5faad4c92430c3b590437ae3f6e73d5ceefd54e6c7
+  data.tar.gz: b6946ee2b2fd09495f45b08977a44c22b1a91721b54092f5a1a16c4210886a5df876d3fe1792f305dca932e7448831c8acf1890908c338690777766d36455c4a

data/Changelog.md

@@ -1,14 +1,18 @@
-### 3.5.0 Development
-[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.5.0.beta1...master)
+### 3.5 Development
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.5.0.beta4...master)
+
+### 3.5.0.beta4 / 2016-06-05
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.5.0.beta3...v3.5.0.beta4)
+
+Bug Fixes:
+
+* Fix `include` matcher so that it provides a valid diff for hashes. (Yuji Nakayama, #916)
+
+### 3.5.0.beta3 / 2016-04-02
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.5.0.beta2...v3.5.0.beta3)
 
 Enhancements:
 
-* Add the ability to raise an error on encountering false positives via
-  `RSpec::Configuration#on_potential_false_positives = :raise`. (Jon Rowe, #900)
-* When using the custom matcher DSL, support new
-  `notify_expectation_failures: true` option for the `match` method to
-  allow expectation failures to be raised as normal instead of being
-  converted into a `false` return value for `matches?`. (Jon Rowe, #892)
 * Make `rspec/expectations/minitest_integration` work on Minitest::Spec
   5.6+. (Myron Marston, #904)
 * Add an alias `having_attributes` for `have_attributes` matcher.
@@ -16,6 +20,18 @@ Enhancements:
 * Improve `change` matcher error message when block is mis-used.
   (Alex Altair, #908)
 
+### 3.5.0.beta2 / 2016-03-10
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.5.0.beta1...v3.5.0.beta2)
+
+Enhancements:
+
+* Add the ability to raise an error on encountering false positives via
+  `RSpec::Configuration#on_potential_false_positives = :raise`. (Jon Rowe, #900)
+* When using the custom matcher DSL, support new
+  `notify_expectation_failures: true` option for the `match` method to
+  allow expectation failures to be raised as normal instead of being
+  converted into a `false` return value for `matches?`. (Jon Rowe, #892)
+
 Bug Fixes:
 
 * Allow `should` deprecation check to work on `BasicObject`s. (James Coleman, #898)

data/lib/rspec/expectations/version.rb

@@ -2,7 +2,7 @@ module RSpec
   module Expectations
     # @private
     module Version
-      STRING = '3.5.0.beta3'
+      STRING = '3.5.0.beta4'
     end
   end
 end

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

@@ -5,8 +5,11 @@ module RSpec
       # Provides the implementation for `include`.
       # Not intended to be instantiated directly.
       class Include < BaseMatcher
-        def initialize(*expected)
-          @expected = expected
+        # @private
+        attr_reader :expecteds
+
+        def initialize(*expecteds)
+          @expecteds = expecteds
         end
 
         # @api private
@@ -24,7 +27,7 @@ module RSpec
         # @api private
         # @return [String]
         def description
-          improve_hash_formatting("include#{readable_list_of(expected)}")
+          improve_hash_formatting("include#{readable_list_of(expecteds)}")
         end
 
         # @api private
@@ -45,6 +48,16 @@ module RSpec
           !diff_would_wrongly_highlight_matched_item?
         end
 
+        # @api private
+        # @return [Array, Hash]
+        def expected
+          if expecteds.one? && Hash === expecteds.first
+            expecteds.first
+          else
+            expecteds
+          end
+        end
+
       private
 
         def format_failure_message(preposition)
@@ -73,7 +86,7 @@ module RSpec
         def excluded_from_actual
           return [] unless @actual.respond_to?(:include?)
 
-          expected.inject([]) do |memo, expected_item|
+          expecteds.inject([]) do |memo, expected_item|
             if comparing_hash_to_a_subset?(expected_item)
               expected_item.each do |(key, value)|
                 memo << { key => value } unless yield actual_hash_includes?(key, value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  version: 3.5.0.beta3
+  version: 3.5.0.beta4
 platform: ruby
 authors:
 - Steven Baker
@@ -45,7 +45,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2016-04-02 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -53,14 +53,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta3
+        version: 3.5.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta3
+        version: 3.5.0.beta4
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -217,9 +217,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-expectations-3.5.0.beta3
+summary: rspec-expectations-3.5.0.beta4
 test_files: []
 has_rdoc: