Merge branch 'master' into example-api

src/spectator/dsl/matchers.cr

@@ -459,6 +459,26 @@ module Spectator
       {% end %}
     end
 
+    # Indicates that some value or set should contain specific items.
+    # This is typically used on a `String` or `Array` (any `Enumerable` works).
+    # The *expected* argument can be a `String` or `Char`
+    # when the actual type (being comapred against) is a `String`.
+    # For `Enumerable` types, items are compared using the underying implementation.
+    # In both cases, the `includes?` method is used.
+    #
+    # This is identical to `#contain`, but accepts an array (or enumerable type) instead of multiple arguments.
+    #
+    # Examples:
+    # ```
+    # expect("foobar").to contain_elements(["foo", "bar"])
+    # expect("foobar").to contain_elements(['a', 'b'])
+    # expect(%i[a b c]).to contain_elements(%i[a b])
+    # ```
+    macro contain_elements(expected)
+      %test_value = ::Spectator::TestValue.new({{expected}}, {{expected.stringify}})
+      ::Spectator::Matchers::ContainMatcher.new(%test_value)
+    end
+
     # Indicates that some range (or collection) should contain another value.
     # This is typically used on a `Range` (although any `Enumerable` works).
     # The `includes?` method is used.
@@ -520,6 +540,29 @@ module Spectator
       {% end %}
     end
 
+    # Indicates that some value or set should contain specific items.
+    # This is similar to `#contain_elements`, but uses a different method for matching.
+    # Typically a `String` or `Array` (any `Enumerable` works) is checked against.
+    # The *expected* argument can be a `String` or `Char`
+    # when the actual type (being comapred against) is a `String`.
+    # The `includes?` method is used for this case.
+    # For `Enumerable` types, each item is inspected until one matches.
+    # The === operator is used for this case, which allows for equality, type, regex, and other matches.
+    #
+    # Examples:
+    # ```
+    # expect("foobar").to have_elements(["foo", "bar"])
+    # expect("foobar").to have_elements(['a', 'b'])
+    #
+    # expect(%i[a b c]).to have_elements(%i[b c])
+    # expect(%w[FOO BAR BAZ]).to have_elements([/FOO/, /bar/i])
+    # expect([1, 2, 3, :a, :b, :c]).to have_elements([Int32, Symbol])
+    # ```
+    macro have_elements(expected)
+      %test_value = ::Spectator::TestValue.new({{expected}}, {{expected.stringify}})
+      ::Spectator::Matchers::HaveMatcher.new(%test_value)
+    end
+
     # Indicates that some set, such as a `Hash`, has a given key.
     # The `has_key?` method is used for this check.
     #

src/spectator/matchers/contain_matcher.cr

@@ -1,9 +1,16 @@
-require "./value_matcher"
+require "./matcher"
 
 module Spectator::Matchers
   # Matcher that tests whether a value, such as a `String` or `Array`, contains one or more values.
   # The values are checked with the `includes?` method.
-  struct ContainMatcher(ExpectedType) < ValueMatcher(ExpectedType)
+  struct ContainMatcher(ExpectedType) < Matcher
+    # Expected value and label.
+    private getter expected
+
+    # Creates the matcher with an expected value.
+    def initialize(@expected : TestValue(ExpectedType))
+    end
+
     # Short text about the matcher's purpose.
     # This explains what condition satisfies the matcher.
     # The description is used when the one-liner syntax is used.
@@ -11,54 +18,48 @@ module Spectator::Matchers
       "contains #{expected.label}"
     end
 
-    # Checks whether the matcher is satisifed with the expression given to it.
-    private def match?(actual : TestExpression(T)) : Bool forall T
+    # Actually performs the test against the expression.
+    def match(actual : TestExpression(T)) : MatchData forall T
       actual_value = actual.value
       return unexpected(actual_value, actual.label) unless actual_value.responds_to?(:includes?)
 
-      expected.value.all? do |item|
+      missing = expected.value.reject do |item|
         actual_value.includes?(item)
       end
+
+      if missing.empty?
+        # Contents are present.
+        SuccessfulMatchData.new(description)
+      else
+        # Content is missing.
+        FailedMatchData.new(description, "#{actual.label} does not contain #{expected.label}",
+          expected: expected.value.inspect,
+          actual: actual_value.inspect,
+          missing: missing.inspect,
+        )
+      end
     end
 
-    # If the expectation is negated, then this method is called instead of `#match?`.
-    private def does_not_match?(actual : TestExpression(T)) : Bool forall T
+    # Performs the test against the expression, but inverted.
+    # A successful match with `#match` should normally fail for this method, and vice-versa.
+    def negated_match(actual : TestExpression(T)) : MatchData forall T
       actual_value = actual.value
       return unexpected(actual_value, actual.label) unless actual_value.responds_to?(:includes?)
 
-      !expected.value.any? do |item|
+      satisfied = expected.value.any? do |item|
         actual_value.includes?(item)
       end
-    end
 
-    # Message displayed when the matcher isn't satisifed.
-    #
-    # This is only called when `#match?` returns false.
-    #
-    # The message should typically only contain the test expression labels.
-    # Actual values should be returned by `#values`.
-    private def failure_message(actual) : String
-      "#{actual.label} does not contain #{expected.label}"
+      if satisfied
+        # Contents are present.
+        FailedMatchData.new(description, "#{actual.label} contains #{expected.label}",
+          expected: "Not #{expected.value.inspect}",
+          actual: actual_value.inspect
+        )
+      else
+        # Content is missing.
+        SuccessfulMatchData.new(description)
       end
-
-    # Message displayed when the matcher isn't satisifed and is negated.
-    # This is essentially what would satisfy the matcher if it wasn't negated.
-    #
-    # This is only called when `#does_not_match?` returns false.
-    #
-    # The message should typically only contain the test expression labels.
-    # Actual values should be returned by `#values`.
-    private def failure_message_when_negated(actual) : String
-      "#{actual.label} contains #{expected.label}"
-    end
-
-    # Additional information about the match failure.
-    # The return value is a NamedTuple with Strings for each value.
-    private def values(actual)
-      {
-        subset:   expected.value.inspect,
-        superset: actual.value.inspect,
-      }
     end
 
     private def unexpected(value, label)

src/spectator/matchers/have_matcher.cr

@@ -4,70 +4,117 @@ module Spectator::Matchers
   # Matcher that tests whether a value, such as a `String` or `Array`, matches one or more values.
   # For a `String`, the `includes?` method is used.
   # Otherwise, it expects an `Enumerable` and iterates over each item until === is true.
-  struct HaveMatcher(ExpectedType) < ValueMatcher(ExpectedType)
+  struct HaveMatcher(ExpectedType) < Matcher
+    # Expected value and label.
+    private getter expected
+
+    # Creates the matcher with an expected value.
+    def initialize(@expected : TestValue(ExpectedType))
+    end
+
     # Short text about the matcher's purpose.
     # This explains what condition satisfies the matcher.
     # The description is used when the one-liner syntax is used.
     def description : String
-      "includes #{expected.label}"
+      "has #{expected.label}"
     end
 
-    # Checks whether the matcher is satisifed with the expression given to it.
-    private def match?(actual : TestExpression(T)) : Bool forall T
+    # Entrypoint for the matcher, forwards to the correct method for string or enumerable.
+    def match(actual : TestExpression(T)) : MatchData forall T
       if (value = actual.value).is_a?(String)
-        match_string?(value)
+        match_string(value, actual.label)
       else
-        match_enumerable?(value)
+        match_enumerable(value, actual.label)
+      end
+    end
+
+    # Actually performs the test against the expression.
+    private def match_enumerable(actual_value, actual_label)
+      array = actual_value.to_a
+      missing = expected.value.reject do |item|
+        array.any? do |element|
+          item === element
+        end
+      end
+
+      if missing.empty?
+        # Contents are present.
+        SuccessfulMatchData.new(description)
+      else
+        # Content is missing.
+        FailedMatchData.new(description, "#{actual_label} does not have #{expected.label}",
+          expected: expected.value.inspect,
+          actual: actual_value.inspect,
+          missing: missing.inspect,
+        )
       end
     end
 
     # Checks if a `String` matches the expected values.
     # The `includes?` method is used for this check.
-    private def match_string?(value)
-      expected.value.all? do |item|
-        value.includes?(item)
+    private def match_string(actual_value, actual_label)
+      missing = expected.value.reject do |item|
+        actual_value.includes?(item)
+      end
+
+      if missing.empty?
+        SuccessfulMatchData.new(description)
+      else
+        FailedMatchData.new(description, "#{actual_label} does not have #{expected.label}",
+          expected: expected.value.inspect,
+          actual: actual_value.inspect,
+          missing: missing.inspect,
+        )
       end
     end
 
-    # Checks if an `Enumerable` matches the expected values.
-    # The `===` operator is used on every item.
-    private def match_enumerable?(value)
-      array = value.to_a
-      expected.value.all? do |item|
+    # Performs the test against the expression, but inverted.
+    # A successful match with `#match` should normally fail for this method, and vice-versa.
+    def negated_match(actual : TestExpression(T)) : MatchData forall T
+      if (value = actual.value).is_a?(String)
+        negated_match_string(value, actual.label)
+      else
+        negated_match_enumerable(value, actual.label)
+      end
+    end
+
+    # Actually performs the negated test against the expression.
+    private def negated_match_enumerable(actual_value, actual_label)
+      array = actual_value.to_a
+      satisfied = expected.value.any? do |item|
         array.any? do |element|
           item === element
         end
       end
+
+      if satisfied
+        # Contents are present.
+        FailedMatchData.new(description, "#{actual_label} has #{expected.label}",
+          expected: "Not #{expected.value.inspect}",
+          actual: actual_value.inspect
+        )
+      else
+        # Content is missing.
+        SuccessfulMatchData.new(description)
+      end
     end
 
-    # Message displayed when the matcher isn't satisifed.
-    #
-    # This is only called when `#match?` returns false.
-    #
-    # The message should typically only contain the test expression labels.
-    # Actual values should be returned by `#values`.
-    private def failure_message(actual) : String
-      "#{actual.label} does not include #{expected.label}"
+    # Checks if a `String` doesn't match the expected values.
+    # The `includes?` method is used for this check.
+    private def negated_match_string(actual_value, actual_label)
+      satisfied = expected.value.any? do |item|
+        actual_value.includes?(item)
       end
 
-    # Message displayed when the matcher isn't satisifed and is negated.
-    # This is essentially what would satisfy the matcher if it wasn't negated.
-    #
-    # This is only called when `#does_not_match?` returns false.
-    #
-    # The message should typically only contain the test expression labels.
-    # Actual values should be returned by `#values`.
-    private def failure_message_when_negated(actual) : String
-      "#{actual.label} includes #{expected.label}"
+      if satisfied
+        SuccessfulMatchData.new(description)
+      else
+        FailedMatchData.new(description, "#{actual_label} does not have #{expected.label}",
+          expected: expected.value.inspect,
+          actual: actual_value.inspect,
+          missing: missing.inspect,
+        )
       end
-
-    # Additional information about the match failure.
-    # The return value is a NamedTuple with Strings for each value.
-    private def values(actual)
-      {
-        subset:   expected.value.inspect,
-        superset: actual.value.inspect,
-      }
     end
   end
 end