Show attribute details when composed have_attributes fails

lib/rspec/matchers/built_in/have_attributes.rb

@@ -6,7 +6,7 @@ module BuiltIn
       # Not intended to be instantiated directly.
       class HaveAttributes < BaseMatcher
         # @private
-        attr_reader :respond_to_failed
+        attr_reader :respond_to_failed, :match_failed
 
         def initialize(expected)
           @expected = expected
@@ -42,6 +42,9 @@ def does_not_match?(actual)
         # @return [String]
         def description
           described_items = surface_descriptions_in(expected)
+
+          return improve_hash_formatting "have attributes #{RSpec::Support::ObjectFormatter.format(described_items)} but had attributes #{ formatted_values }" if match_failed
+
           improve_hash_formatting "have attributes #{RSpec::Support::ObjectFormatter.format(described_items)}"
         end
 
@@ -55,7 +58,7 @@ def diffable?
         # @return [String]
         def failure_message
           respond_to_failure_message_or do
-            "expected #{actual_formatted} to #{description} but had attributes #{ formatted_values }"
+            "expected #{actual_formatted} to #{description}"
           end
         end
 
@@ -77,9 +80,11 @@ def cache_all_values
 
         def perform_match(predicate)
           cache_all_values
-          expected.__send__(predicate) do |attribute_key, attribute_value|
+          result = expected.__send__(predicate) do |attribute_key, attribute_value|
             actual_has_attribute?(attribute_key, attribute_value)
           end
+          @match_failed = !result
+          result
         end
 
         def actual_has_attribute?(attribute_key, attribute_value)

lib/rspec/matchers/composable.rb

@@ -126,7 +126,7 @@ def surface_descriptions_in(item)
       # this method when using `values_match?`, so that any memoization
       # does not "leak" between checks.
       def with_matchers_cloned(object)
-        if Matchers.is_a_matcher?(object)
+        if Matchers.is_a_matcher?(object) && !(::RSpec::Matchers::BuiltIn::HaveAttributes === object)
           object.clone
         elsif Hash === object
           Hash[with_matchers_cloned(object.to_a)]

spec/rspec/matchers/built_in/have_attributes_spec.rb

@@ -115,6 +115,18 @@ def count
         }.to fail_including("expected #{object_inspect person} to have attributes {:age => (a value < 10)}")
       end
     end
+
+    describe "expect([...]).to match(have_attributes(with_one_attribute))" do
+      it "fails with a clear message when attributes does not match" do
+        expect {
+          expect(person).to have_attributes(:age => 10)
+        }.to fail_including("expected #{object_inspect person} to have attributes {:age => 10} but had attributes {:age => 33}")
+
+        expect {
+          expect([person]).to match [have_attributes(:age => 10)]
+        }.to fail_including("expected [#{object_inspect person}] to match [(have attributes {:age => 10} but had attributes {:age => 33})]")
+      end
+    end
   end
 
   describe "expect(...).to_not have_attributes(with_one_attribute)" do

spec/support/shared_examples/value_matcher.rb

@@ -36,10 +36,14 @@ def invalid_expectation
 
   it 'can be used in a composed matcher expression' do
     expect([valid_value, invalid_value]).to include(matcher)
+    # matcher.description => "have attributes {:name => \"Correct name\"}"
+
+    expect([invalid_value]).not_to include(matcher)
+    # matcher.description => "have attributes {:name => \"Correct name\"} but had attributes {:name => \"Wrong Name\"}"
 
     expect {
       expect([invalid_value]).to include(matcher)
-    }.to fail_including("include (#{matcher.description})")
+    }.to fail_including("include (#{matcher.description})") # matcher.description contains description of the most recent assertion
   end
 
   it 'uses the `ObjectFormatter` for `failure_message`' do