Add support for array_including argument matcher

Author: wata727

lib/super_diff/rspec.rb

@@ -38,6 +38,10 @@ def self.a_collection_including_something?(value)
         !(value.expecteds.one? && value.expecteds.first.is_a?(::Hash))
     end
 
+    def self.array_including_something?(value)
+      value.is_a?(::RSpec::Mocks::ArgumentMatchers::ArrayIncludingMatcher)
+    end
+
     def self.an_object_having_some_attributes?(value)
       fuzzy_object?(value) &&
         value.base_matcher.is_a?(::RSpec::Matchers::BuiltIn::HaveAttributes)

lib/super_diff/rspec/differs/collection_including.rb

@@ -3,8 +3,10 @@ module RSpec
     module Differs
       class CollectionIncluding < SuperDiff::Differs::Array
         def self.applies_to?(expected, actual)
-          SuperDiff::RSpec.a_collection_including_something?(expected) &&
-            actual.is_a?(::Array)
+          (
+            SuperDiff::RSpec.a_collection_including_something?(expected) ||
+            SuperDiff::RSpec.array_including_something?(expected)
+          ) && actual.is_a?(::Array)
         end
 
         private

lib/super_diff/rspec/object_inspection/inspectors/collection_including.rb

@@ -4,7 +4,7 @@ module ObjectInspection
       module Inspectors
         class CollectionIncluding < SuperDiff::ObjectInspection::Inspectors::Base
           def self.applies_to?(value)
-            SuperDiff::RSpec.a_collection_including_something?(value)
+            SuperDiff::RSpec.a_collection_including_something?(value) || SuperDiff::RSpec.array_including_something?(value)
           end
 
           protected
@@ -13,8 +13,13 @@ def inspection_tree
             SuperDiff::ObjectInspection::InspectionTree.new do
               add_text "#<a collection including ("
 
-              nested do |aliased_matcher|
-                insert_array_inspection_of(aliased_matcher.expecteds)
+              nested do |value|
+                array = if SuperDiff::RSpec.a_collection_including_something?(value)
+                          value.expecteds
+                        else
+                          value.instance_variable_get(:@expected)
+                        end
+                insert_array_inspection_of(array)
               end
 
               add_break

lib/super_diff/rspec/operation_tree_builders/collection_including.rb

@@ -3,8 +3,10 @@ module RSpec
     module OperationTreeBuilders
       class CollectionIncluding < SuperDiff::OperationTreeBuilders::Array
         def self.applies_to?(expected, actual)
-          SuperDiff::RSpec.a_collection_including_something?(expected) &&
-            actual.is_a?(::Array)
+          (
+            SuperDiff::RSpec.a_collection_including_something?(expected) ||
+            SuperDiff::RSpec.array_including_something?(expected)
+          ) && actual.is_a?(::Array)
         end
 
         def initialize(expected:, actual:, **rest)
@@ -16,7 +18,12 @@ def initialize(expected:, actual:, **rest)
         private
 
         def actual_with_extra_items_in_expected_at_end
-          actual + (expected.expecteds - actual)
+          value = if SuperDiff::RSpec.a_collection_including_something?(expected)
+                    expected.expecteds
+                  else
+                    expected.instance_variable_get(:@expected)
+                  end
+          actual + (value - actual)
         end
       end
     end

spec/integration/rspec/match_matcher_spec.rb

@@ -689,6 +689,47 @@
     end
   end
 
+  context "when the expected value is an array-including-<something>" do
+    it "produces the correct failure message" do
+      as_both_colored_and_uncolored do |color_enabled|
+        snippet = <<~TEST.strip
+          expected = array_including("a")
+          actual   = ["b"]
+          expect(actual).to match(expected)
+        TEST
+        program = make_plain_test_program(
+          snippet,
+          color_enabled: color_enabled,
+        )
+
+        expected_output = build_expected_output(
+          color_enabled: color_enabled,
+          snippet: %|expect(actual).to match(expected)|,
+          expectation: proc {
+            line do
+              plain    %|Expected |
+              actual   %|["b"]|
+              plain    %| to match |
+              expected %|#<a collection including ("a")>|
+              plain    %|.|
+            end
+          },
+          diff: proc {
+            plain_line    %|  [|
+            plain_line    %|    "b"|
+            # expected_line %|-   "a",|   # FIXME
+            expected_line %|-   "a"|
+            plain_line    %|  ]|
+          },
+        )
+
+        expect(program).
+          to produce_output_when_run(expected_output).
+          in_color(color_enabled)
+      end
+    end
+  end
+
   context "when the expected value is an object-having-attributes" do
     context "that is small" do
       it "produces the correct failure message when used in the positive" do