diff --git a/server/tests/common.sh b/server/tests/common.sh index a996878..8bc7813 100644 --- a/server/tests/common.sh +++ b/server/tests/common.sh @@ -1,13 +1,15 @@ #!/bin/sh # Details for our bs user when testing things -export id=1 -export secret=secret -export name=godrah -export joindate=123 -export status=1 -export permissions=69 +# raw from `-c same` flag +# {"id":5,"secret":"JYFKgDOgEAn2vJISwRSkRKn3kNE2EQD0dTFOG24UipQ9kQfBOura06PYf-hYGdFbCNeDJy2LxLu-9N13S8Auaw==","name":"adminsama","joindate":1596865071,"status":0,"permissions":18446744073709551615} +export id=5 +export secret='JYFKgDOgEAn2vJISwRSkRKn3kNE2EQD0dTFOG24UipQ9kQfBOura06PYf-hYGdFbCNeDJy2LxLu-9N13S8Auaw==' +export name='adminsama' +export joindate='1596865071' +export status=0 +export permissions='18446744073709551615' -export simple_key='{"secret":"secret"}' +export simple_key='{"secret":"'"$secret"'","id":'$id'}' export url='localhost:8888' diff --git a/server/tests/verify_basic_cases.sh b/server/tests/verify_basic_cases.sh index b23e796..e25004c 100644 --- a/server/tests/verify_basic_cases.sh +++ b/server/tests/verify_basic_cases.sh @@ -13,14 +13,14 @@ list_all_channels() { # TEST } create_channel() { - kv='{"secret":"secret", "name":"sample", "kind":2, "description":"some bs description"}' + kv="{\"secret\":\"$secret\", \"name\":\"sample\", \"kind\":2, \"description\":\"some bs description\"}" result=$($crl $POST $url/channels/create -d "$kv") code=$(echo "$result" | grep HTTP\/1.1 | awk '{print $2}') log_result good_create_channel 200 $code "$result" } delete_channel() { - kv='{"secret":"secret", "name":"sample"}' + kv="{\"secret\":\"$secret\", \"name\":\"sample\"}" result=$($crl $POST $url/channels/delete -d "$kv") code=$(echo "$result" | grep HTTP\/1.1 | awk '{print $2}') log_result good_delete_channel 200 $code "$result" @@ -28,10 +28,10 @@ delete_channel() { send_message() { # ignoring the reaction to this as its not _completely_ relevant for this test - $crl $POST $url/channels/create -d '{"secret":"secret","name":"msgchannel","kind":2}' > /dev/null + $crl $POST $url/channels/create -d "{\"id\":$id, \"secret\":\"$secret\",\"name\":\"msgchannel\",\"kind\":2}" > /dev/null # now we can try sending the right parameters to send a basic message - kv='{"secret":"secret", "content":"message sample", "channel":"msgchannel"}' + kv="{\"secret\":\"$secret\", \"content\":\"message sample\", \"channel\":\"msgchannel\"}" result=$($crl $POST $url/message/send -d "$kv") code=$(echo "$result" | grep HTTP\/1.1 | awk '{print $2}') # non-existant channel for now but whatever ignore for now