cleaning up a class

Author: Stanislav (Stas) Katkov

lib/rspec/rails/matchers/have_reported_error.rb

@@ -61,10 +61,12 @@ def matches?(block)
           return attributes_match_if_specified?
         end
 
+        # @private
         def supports_block_expectations?
           true
         end
 
+        # @private
         def supports_value_expectations?
           false
         end
@@ -93,12 +95,8 @@ def description
         end
 
         def failure_message
-          if !@reports.empty? && !@attributes.empty?
-            report_context = @reports.last.context
-            unmatched = unmatched_attributes(report_context)
-            unless unmatched.empty?
-              return "Expected error attributes to match #{@attributes}, but got these mismatches: #{unmatched} and actual values are #{report_context}"
-            end
+          if @reports.any? && @attributes.any?
+            return "Expected error attributes to match #{@attributes}, but actual values are #{matching_report.context}"
           elsif @reports.empty?
             return 'Expected the block to report an error, but none was reported.'
           elsif actual_error.nil?
@@ -136,7 +134,7 @@ def failure_message_when_negated
         private
 
         def error_matches_expectation?
-          return true if @expected_error.nil? && @expected_message.nil? && @reports.count.positive?
+          return true if @expected_error.nil? && @expected_message.nil?
 
           @reports.any? do |report|
             error_class_matches?(report.error) && error_message_matches?(report.error)
@@ -170,7 +168,7 @@ def attributes_match_if_specified?
         end
 
         def actual_error
-          @actual_error ||= matching_report&.error
+          matching_report&.error
         end
 
         def matching_report

spec/rspec/rails/matchers/have_reported_error_spec.rb

@@ -95,15 +95,15 @@ class AnotherTestError < StandardError; end
         expect {
           Rails.error.report(StandardError.new("test"), context: { user_id: 123, context: "actual" })
         }.to have_reported_error.with_context(user_id: 456, context: "expected")
-      }.to fail_with(/Expected error attributes to match.*user_id.*456.*context.*expected.*got these mismatches.*user_id.*456.*context.*expected.*actual values are.*user_id.*123.*context.*actual/)
+      }.to fail_with(/Expected error attributes to match/)
     end
 
     it "identifies partial attribute mismatches correctly" do
       expect {
         expect {
           Rails.error.report(StandardError.new("test"), context: { user_id: 123, status: "active", role: "admin" })
         }.to have_reported_error.with_context(user_id: 456, status: "active") # user_id wrong, status correct
-      }.to fail_with(/got these mismatches:.*user_id.*456/)
+      }.to fail_with(/Expected error attributes to match/)
     end
 
     it "handles RSpec matcher mismatches in failure messages" do
@@ -151,7 +151,7 @@ class AnotherTestError < StandardError; end
         expect {
           Rails.error.report(StandardError.new("test"), context: { user_id: 123, context: "actual" })
         }.to have_reported_error.with_context(user_id: 456, context: "expected")
-      }.to fail_with(/Expected error attributes to match.*user_id.*456.*context.*expected.*got these mismatches.*user_id.*456.*context.*expected.*actual values are.*user_id.*123.*context.*actual/)
+      }.to fail_with(/Expected error attributes to match/)
     end
 
     it "fails when no error is reported but attributes are expected" do