X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=test;h=9ba61855248404a144bb44dfeaca9b38e83ec550;hb=c5bdd36586eaa0235fb6822cb4ccb7620e1bb0aa;hp=0e42462a264d8d8e07063628bf6ff7a951cb4a44;hpb=9e5bf65868eaafcb11d09c0fee02e0d3d7c2121f;p=empires-server

diff --git a/test b/test
index 0e42462..9ba6185 100755
--- a/test
+++ b/test
@@ -85,24 +85,34 @@ contains()
     grep -q "$2" <<< $1
 }
 
-# Post to a URL endpoint with optional JSON data
+# POST to a URL endpoint with optional JSON data
 #
 # Usage:
 #
-# curl_post <ENDPOINT> [data]
+# curl_post <ENDPOINT> [data] [CURL_OPTIONS]
 curl_post()
 {
-    $CURL -X POST ${2:+-H 'Content-Type: application/json' -d "$2"} $URL/$1
+    $CURL ${3:-} -X POST ${2:+-H 'Content-Type: application/json' -d "$2"} $URL/$1
 }
 
-# Get form a URL endpoint
+# PUT to a URL endpoint with optional JSON data
 #
 # Usage:
 #
-# curl_get <ENDPOINT>
+# curl_post <ENDPOINT> [data] [CURL_OPTIONS]
+curl_put()
+{
+    $CURL ${3:-} -X PUT ${2:+-H 'Content-Type: application/json' -d "$2"} $URL/$1
+}
+
+# GET from a URL endpoint
+#
+# Usage:
+#
+# curl_get <ENDPOINT> [CURL_OPTIONS]
 curl_get()
 {
-    $CURL $URL/$1
+    $CURL ${2:-} $URL/$1
 }
 
 # Create a new game of the specified engine type
@@ -295,16 +305,39 @@ tictactoe_move()
     curl_post $tictactoe_game_path/move "{ \"move\": $1 }"
 }
 
+lmno_profile()
+{
+    curl_put /profile "{ \"nickname\": \"$1\" }" "-c .test-cookie"
+}
+
+tictactoe_player_info()
+{
+    curl_get $tictactoe_game_path/events  "-m 0.1 -b .test-cookie" 2>&1 \
+        | grep player-info -A 1 \
+        | grep ^data
+}
+
+TEST_SUBSECTION "Tic Tac Toe player-info"
+
+TEST "Hit LMNO /profile to set name to 'curl'"
+lmno_profile curl
+TEST_END
+
+TEST "Verify player-info event reports 'curl' name"
+result=$(tictactoe_player_info)
+test "$result" = 'data: {"id":1,"name":"curl"}'
+TEST_END
+
 TEST_SUBSECTION "Tic Tac Toe /move"
 
 TEST "Move to the center square"
 result=$(tictactoe_move 4)
-test "$result" = "true"
+test "$result" = '{"legal":true}'
 TEST_END
 
 TEST "Move to center square again is now illegal"
 result=$(tictactoe_move 4)
-test "$result" = "false"
+test "$result" = '{"legal":false,"message":"Square is already occupied"}'
 TEST_END
 
 TEST_REPORT