code review feedback: invert expected_to_diff to actual_to_diff

rspec · Jun 27, 2024 · 7046659 · 7046659
1 parent 938096c
commit 7046659
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/lib/rspec/support/differ.rb b/lib/rspec/support/differ.rb
@@ -60,17 +60,16 @@ def diff_as_string(actual, expected)
 
       if defined?(RSpec::Mocks::ArgumentMatchers::AnyArgMatcher)
         def diff_hashes_as_object(actual, expected)
-          expected_to_diff =
-            expected.reduce({}) do |hash, (key, value)|
-              if RSpec::Mocks::ArgumentMatchers::AnyArgMatcher === value
-                hash[key] = actual[key]
-              else
+          actual_to_diff =
+            actual.reduce({}) do |hash, (key, value)|
+              if RSpec::Mocks::ArgumentMatchers::AnyArgMatcher === expected[key]
                 hash[key] = expected[key]
+              else
+                hash[key] = actual[key]
               end
               hash
             end
-
-          diff_as_object(actual, expected_to_diff)
+          diff_as_object(actual_to_diff, expected)
         end
       else
         def diff_hashes_as_object(actual, expected)

diff --git a/spec/rspec/support/differ_spec.rb b/spec/rspec/support/differ_spec.rb
@@ -564,7 +564,7 @@ def inspect; "<BrokenObject>"; end
             expected_diff = dedent(<<-'EOD')
               |
               |@@ -1,4 +1,4 @@
-              | :anything_key => "bcdd0399-1cfe-4de1-a481-ca6b17d41ed8",
+              | :anything_key => anything,
               | :fixed => "fixed",
               |-:trigger => "wrong",
               |+:trigger => "trigger",