Use match instead of process

icy-arctic-fox · Jul 30, 2024 · 2bdf9e1 · 2bdf9e1
1 parent af4c067
commit 2bdf9e1
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/src/spectator/matchers/built_in/all_matcher.cr b/src/spectator/matchers/built_in/all_matcher.cr
@@ -8,7 +8,7 @@ module Spectator::Matchers::BuiltIn
     def matches?(actual_value)
       raise "`all` matcher requires value to be `Enumerable`" unless actual_value.is_a?(Enumerable)
       actual_value.each_with_index do |value, index|
-        next unless failure = Matcher.process(@matcher, value)
+        next unless failure = Matcher.match(@matcher, value)
         @failed_index = index
         @failure = failure
         return false
@@ -19,7 +19,7 @@ module Spectator::Matchers::BuiltIn
     def does_not_match?(actual_value)
       raise "`all` matcher requires value to be `Enumerable`" unless actual_value.is_a?(Enumerable)
       actual_value.each_with_index do |value, index|
-        next unless failure = Matcher.process_negated(@matcher, value)
+        next unless failure = Matcher.match_negated(@matcher, value)
         @failed_index = index
         @failure = failure
         return false

diff --git a/src/spectator/matchers/expect.cr b/src/spectator/matchers/expect.cr
@@ -12,7 +12,7 @@ module Spectator::Matchers
            source_line = __LINE__,
            source_end_line = __END_LINE__) : Nil
       location = Core::LocationRange.new(source_file, source_line, source_end_line)
-      failure = Matcher.process(matcher, @actual_value,
+      failure = Matcher.match(matcher, @actual_value,
         failure_message: failure_message,
         location: location)
       raise failure if failure
@@ -23,7 +23,7 @@ module Spectator::Matchers
                source_line = __LINE__,
                source_end_line = __END_LINE__) : Nil
       location = Core::LocationRange.new(source_file, source_line, source_end_line)
-      failure = Matcher.process_negated(matcher, @actual_value,
+      failure = Matcher.match_negated(matcher, @actual_value,
         failure_message: failure_message,
         location: location)
       raise failure if failure
@@ -49,7 +49,7 @@ module Spectator::Matchers
            source_line = __LINE__,
            source_end_line = __END_LINE__) : Nil
       location = Core::LocationRange.new(source_file, source_line, source_end_line)
-      failure = Matcher.process_block(matcher, @block,
+      failure = Matcher.match_block(matcher, @block,
         failure_message: failure_message,
         location: location)
       raise failure if failure
@@ -60,7 +60,7 @@ module Spectator::Matchers
            source_line = __LINE__,
            source_end_line = __END_LINE__) : Exception
       location = Core::LocationRange.new(source_file, source_line, source_end_line)
-      failure = Matcher.process_block(matcher, @block,
+      failure = Matcher.match_block(matcher, @block,
         failure_message: failure_message,
         location: location)
       raise failure if failure
@@ -72,7 +72,7 @@ module Spectator::Matchers
                source_line = __LINE__,
                source_end_line = __END_LINE__) : Nil
       location = Core::LocationRange.new(source_file, source_line, source_end_line)
-      failure = Matcher.process_block_negated(matcher, @block,
+      failure = Matcher.match_block_negated(matcher, @block,
         failure_message: failure_message,
         location: location)
       raise failure if failure

diff --git a/src/spectator/matchers/matcher.cr b/src/spectator/matchers/matcher.cr
@@ -6,9 +6,9 @@ module Spectator::Matchers
   module Matcher
     extend self
 
-    def process(matcher, actual_value, *,
-                failure_message : String? = nil,
-                location : Core::LocationRange? = nil) : AssertionFailed?
+    def match(matcher, actual_value, *,
+              failure_message : String? = nil,
+              location : Core::LocationRange? = nil) : AssertionFailed?
       if matcher.responds_to?(:matches?) && matcher.responds_to?(:failure_message)
         return if matcher.matches?(actual_value)
         failure_message ||= matcher.failure_message(actual_value).to_s
@@ -19,9 +19,9 @@ module Spectator::Matchers
       end
     end
 
-    def process_negated(matcher, actual_value, *,
-                        failure_message : String? = nil,
-                        location : Core::LocationRange? = nil) : AssertionFailed?
+    def match_negated(matcher, actual_value, *,
+                      failure_message : String? = nil,
+                      location : Core::LocationRange? = nil) : AssertionFailed?
       if matcher.responds_to?(:negated_failure_message)
         passed = if matcher.responds_to?(:does_not_match?)
                    matcher.does_not_match?(actual_value)
@@ -40,9 +40,9 @@ module Spectator::Matchers
       end
     end
 
-    def process_block(matcher, block, *,
-                      failure_message : String? = nil,
-                      location : Core::LocationRange? = nil) : AssertionFailed?
+    def match_block(matcher, block, *,
+                    failure_message : String? = nil,
+                    location : Core::LocationRange? = nil) : AssertionFailed?
       if matcher.responds_to?(:matches?) && matcher.responds_to?(:failure_message)
         return if matcher.matches?(&block)
         failure_message ||= matcher.failure_message(&block).to_s
@@ -53,9 +53,9 @@ module Spectator::Matchers
       end
     end
 
-    def process_block_negated(matcher, block, *,
-                              failure_message : String? = nil,
-                              location : Core::LocationRange? = nil) : AssertionFailed?
+    def match_block_negated(matcher, block, *,
+                            failure_message : String? = nil,
+                            location : Core::LocationRange? = nil) : AssertionFailed?
       if matcher.responds_to?(:negated_failure_message)
         passed = if matcher.responds_to?(:does_not_match?)
                    matcher.does_not_match?(&block)

diff --git a/src/spectator/matchers/should_methods.cr b/src/spectator/matchers/should_methods.cr
@@ -8,7 +8,7 @@ module Spectator::Matchers
                source_line = __LINE__,
                source_end_line = __END_LINE__) : Nil
       location = Core::LocationRange.new(source_file, source_line, source_end_line)
-      failure = Matcher.process(matcher, self,
+      failure = Matcher.match(matcher, self,
         failure_message: failure_message,
         location: location)
       raise failure if failure
@@ -19,7 +19,7 @@ module Spectator::Matchers
                    source_line = __LINE__,
                    source_end_line = __END_LINE__) : Nil
       location = Core::LocationRange.new(source_file, source_line, source_end_line)
-      failure = Matcher.process_negated(matcher, self,
+      failure = Matcher.match_negated(matcher, self,
         failure_message: failure_message,
         location: location)
       raise failure if failure