From a4680f25848bcc467917970f79b32d99efc47666 Mon Sep 17 00:00:00 2001
From: Michael Miller <icy.arctic.fox@gmail.com>
Date: Sat, 26 Sep 2020 10:50:18 -0600
Subject: [PATCH] Don't splat values for failed match data

This caused an issue where keys with the same name as existing arguments
couldn't be used.
In this case, "description" and "failure_message".

Fixes https://github.com/icy-arctic-fox/spectator/issues/13
---
 src/spectator/matchers/attributes_matcher.cr     | 4 ++--
 src/spectator/matchers/have_predicate_matcher.cr | 4 ++--
 src/spectator/matchers/predicate_matcher.cr      | 4 ++--
 src/spectator/matchers/respond_matcher.cr        | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/spectator/matchers/attributes_matcher.cr b/src/spectator/matchers/attributes_matcher.cr
index 2a72d5b..ec8826f 100644
--- a/src/spectator/matchers/attributes_matcher.cr
+++ b/src/spectator/matchers/attributes_matcher.cr
@@ -30,7 +30,7 @@ module Spectator::Matchers
       if match?(snapshot)
         SuccessfulMatchData.new(description)
       else
-        FailedMatchData.new(description, "#{actual.label} does not have attributes #{expected.label}", **values(snapshot))
+        FailedMatchData.new(description, "#{actual.label} does not have attributes #{expected.label}", values(snapshot).to_a)
       end
     end
 
@@ -39,7 +39,7 @@ module Spectator::Matchers
     def negated_match(actual : TestExpression(T)) : MatchData forall T
       snapshot = snapshot_values(actual.value)
       if match?(snapshot)
-        FailedMatchData.new(description, "#{actual.label} has attributes #{expected.label}", **negated_values(snapshot))
+        FailedMatchData.new(description, "#{actual.label} has attributes #{expected.label}", negated_values(snapshot).to_a)
       else
         SuccessfulMatchData.new(description)
       end
diff --git a/src/spectator/matchers/have_predicate_matcher.cr b/src/spectator/matchers/have_predicate_matcher.cr
index 7b23cd0..5cb3f94 100644
--- a/src/spectator/matchers/have_predicate_matcher.cr
+++ b/src/spectator/matchers/have_predicate_matcher.cr
@@ -20,7 +20,7 @@ module Spectator::Matchers
       if match?(snapshot)
         SuccessfulMatchData.new(description)
       else
-        FailedMatchData.new(description, "#{actual.label} does not have #{expected.label}", **values(snapshot))
+        FailedMatchData.new(description, "#{actual.label} does not have #{expected.label}", values(snapshot).to_a)
       end
     end
 
@@ -29,7 +29,7 @@ module Spectator::Matchers
     def negated_match(actual : TestExpression(T)) : MatchData forall T
       snapshot = snapshot_values(actual.value)
       if match?(snapshot)
-        FailedMatchData.new(description, "#{actual.label} has #{expected.label}", **values(snapshot))
+        FailedMatchData.new(description, "#{actual.label} has #{expected.label}", values(snapshot).to_a)
       else
         SuccessfulMatchData.new(description)
       end
diff --git a/src/spectator/matchers/predicate_matcher.cr b/src/spectator/matchers/predicate_matcher.cr
index bacfac0..bda4f9b 100644
--- a/src/spectator/matchers/predicate_matcher.cr
+++ b/src/spectator/matchers/predicate_matcher.cr
@@ -26,7 +26,7 @@ module Spectator::Matchers
       if match?(snapshot)
         SuccessfulMatchData.new(description)
       else
-        FailedMatchData.new(description, "#{actual.label} is not #{expected.label}", **values(snapshot))
+        FailedMatchData.new(description, "#{actual.label} is not #{expected.label}", values(snapshot).to_a)
       end
     end
 
@@ -35,7 +35,7 @@ module Spectator::Matchers
     def negated_match(actual : TestExpression(T)) : MatchData forall T
       snapshot = snapshot_values(actual.value)
       if match?(snapshot)
-        FailedMatchData.new(description, "#{actual.label} is #{expected.label}", **values(snapshot))
+        FailedMatchData.new(description, "#{actual.label} is #{expected.label}", values(snapshot).to_a)
       else
         SuccessfulMatchData.new(description)
       end
diff --git a/src/spectator/matchers/respond_matcher.cr b/src/spectator/matchers/respond_matcher.cr
index 59a955f..87f95a9 100644
--- a/src/spectator/matchers/respond_matcher.cr
+++ b/src/spectator/matchers/respond_matcher.cr
@@ -19,7 +19,7 @@ module Spectator::Matchers
       if snapshot.values.all?
         SuccessfulMatchData.new(description)
       else
-        FailedMatchData.new(description, "#{actual.label} does not respond to #{label}", **values(snapshot))
+        FailedMatchData.new(description, "#{actual.label} does not respond to #{label}", values(snapshot).to_a)
       end
     end
 
@@ -28,7 +28,7 @@ module Spectator::Matchers
     def negated_match(actual : TestExpression(T)) : MatchData forall T
       snapshot = snapshot_values(actual.value)
       if snapshot.values.any?
-        FailedMatchData.new(description, "#{actual.label} responds to #{label}", **values(snapshot))
+        FailedMatchData.new(description, "#{actual.label} responds to #{label}", values(snapshot).to_a)
       else
         SuccessfulMatchData.new(description)
       end