Add message string to the return value of add_move

[lmno-server] / test

diff --git a/test b/test
index 30dbe7f2781cd292de35b2b4112862f11af992c3..55a4c2956318b04c5ac1e0c7c830cb4b358bfa0f 100755 (executable)
--- a/test
+++ b/test
@@ -140,6 +140,24 @@ tictactoe_game_id=$(new_game tictactoe)
 test "$tictactoe_game_id" != ""
 TEST_END $tictactoe_game_id
 
+TEST_SUBSECTION "Test redirects"
+
+TEST "Redirect of /GAMEID at top level"
+redirect=$(curl_get $empires_game_id)
+test "$redirect" = "Moved Permanently. Redirecting to /empires/$empires_game_id/"
+TEST_END
+
+TEST "Redirect of lowercase /gameid at top level"
+empires_game_id_lower=$(tr '[:upper:]' '[:lower:]' <<< $empires_game_id)
+redirect=$(curl_get $empires_game_id_lower)
+test "$redirect" = "Moved Permanently. Redirecting to /$empires_game_id/"
+TEST_END
+
+TEST "Redirect of lowercase /empires/gameid"
+redirect=$(curl_get empires/$empires_game_id_lower)
+test "$redirect" = "Moved Permanently. Redirecting to /empires/$empires_game_id/"
+TEST_END
+
 TEST_SECTION "Empires game"
 
 empires_game_path=empires/$empires_game_id
@@ -268,5 +286,25 @@ players=$(empires_players_string)
 test "$players" = ""
 TEST_END
 
-TEST_REPORT
+TEST_SECTION "Tic Tac Toe game"
+
+tictactoe_game_path=tictactoe/$tictactoe_game_id
 
+tictactoe_move()
+{
+    curl_post $tictactoe_game_path/move "{ \"move\": $1 }"
+}
+
+TEST_SUBSECTION "Tic Tac Toe /move"
+
+TEST "Move to the center square"
+result=$(tictactoe_move 4)
+test "$result" = '{"legal":true}'
+TEST_END
+
+TEST "Move to center square again is now illegal"
+result=$(tictactoe_move 4)
+test "$result" = '{"legal":false,"message":"Square is already occupied"}'
+TEST_END
+
+TEST_REPORT