X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=test;h=c6c87508d50dab970b6ff7298f05152eb0f36a49;hb=6d7b857216c136426067e9575fc692e09a778d8d;hp=f62d6824315253edd01758f443ca946a393e2947;hpb=66b333239bd232c60cc1093aefc55c585af293cc;p=lmno-server

diff --git a/test b/test
index f62d682..c6c8750 100755
--- a/test
+++ b/test
@@ -655,12 +655,12 @@ empathy_judged()
 }
 
 TEST "Submit word groups from alice"
-result=$(empathy_judged alice $prompt_id '[["sun","SunLight","SunShine"],["sand","sands","Grains of Sand"],["water","wafer"]]')
+result=$(empathy_judged alice $prompt_id '[{"words":["sun","SunLight","SunShine"],"kudos":false},{"words":["sand","sands","Grains of Sand"],"kudos":false},{"words":["water","wafer"],"kudos":false}]')
 test "$result" = '{"valid":true}'
 TEST_END
 
 TEST "Submit word groups from bob"
-result=$(empathy_judged bob $prompt_id '[["sands","grains of sand"],["water","wafer"]]')
+result=$(empathy_judged bob $prompt_id '[{"words":["sands","grains of sand"],"kudos":false},{"words":["water","wafer"],"kudos":false}]')
 test "$result" = '{"valid":true}'
 TEST_END
 
@@ -676,7 +676,7 @@ test "$result" = "null"
 TEST_END
 
 TEST "Submit word groups from charlie"
-result=$(empathy_judged charlie $prompt_id '[["SunLight","SunShine"],["sand","Grains of Sand"]]')
+result=$(empathy_judged charlie $prompt_id '[{"words":["SunLight","SunShine"],"kudos":false},{"words":["sand","Grains of Sand"],"kudos":false}]')
 test "$result" = '{"valid":true}'
 TEST_END
 
@@ -690,7 +690,7 @@ TEST_END
 # Usage: empathy_scores_names_numbers <player_name>
 empathy_scores_names_numbers()
 {
-    empathy_get_event $1 game-state | jq '.scores.scores[]|.player,.score'
+    empathy_get_event $1 game-state | jq '.scores.scores[]|.players[],.score'
 }
 
 TEST_SUBSECTION "Scoring"
@@ -856,6 +856,16 @@ result=$(echo $(empathy_scores alice))
 test "$result" = "null"
 TEST_END
 
+TEST "Submit word groups from a non-answering player"
+result=$(empathy_judged dale $prompt_id '[]')
+test "$result" = '{"valid":true}'
+TEST_END
+
+TEST "Scoring still hasn't started"
+result=$(echo $(empathy_scores alice))
+test "$result" = "null"
+TEST_END
+
 TEST "Submit word groups from last answering player"
 result=$(empathy_judged charlie $prompt_id '[]')
 test "$result" = '{"valid":true}'
@@ -882,7 +892,7 @@ test "$?" = "0"
 TEST_END
 
 TEST "1 player votes for a match"
-empathy_judged alice $prompt_id '[["truth","true"]]' >/dev/null
+empathy_judged alice $prompt_id '[{"words":["truth","true"],"kudos":false}]' >/dev/null
 result=$(empathy_judged bob $prompt_id '[]')
 test "$result" = '{"valid":true}'
 TEST_END
@@ -890,7 +900,7 @@ TEST_END
 TEST "Verify the match passed the vote"
 # echo here is to strip newlines
 result=$(echo $(empathy_scores_names_numbers alice))
-test "$result" = '"alice" 2 "bob" 2 "charlie" 0 "dale" 0 "eric" 0 "fred" 0'
+test "$result" = '"alice" "bob" 2 "charlie" "dale" "eric" "fred" 0'
 TEST_END
 
 echo ""
@@ -929,7 +939,7 @@ TEST_END
 TEST "Verify scores don't include inactive players"
 # echo here is to strip newlines
 result=$(echo $(empathy_scores_names_numbers alice))
-test "$result" = '"alice" 1 "bob" 1 "charlie" 0'
+test "$result" = '"alice" "bob" 1 "charlie" 0'
 TEST_END
 
 TEST_SUBSECTION "Deactivated players don't block future game phase advances"