shockrah/freechat
shockrah/freechat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updating tests for members routes

Browse Source
This commit is contained in:
shockrah 2021-02-20 20:14:10 -08:00
parent c4db03f962
commit 34736bef3f
3 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
json-api/build.sh
View File

@ -21,11 +21,22 @@ full=
testing() { testing() {
release_opt=$1 release_opt=$1
cargo build $release_opt cargo build $release_opt
# next we run the server in the background
cargo run $release_opt -- -s&
sid=$!
# wait a sec
echo Waiting on server to start
sleep 3
# now fire off client tests
source ./client-tests/bin/activate source ./client-tests/bin/activate
python3 client-tests/client.py python3 client-tests/client.py
# if [ ! -z $full ];then # clean up the server now
# cargo test $release_opt kill -9 $sid
# fi if [ ! -z $full ];then
cargo test $release_opt
fi
} }
while getopts ":fhtTbr" arg; do while getopts ":fhtTbr" arg; do

26
json-api/client-tests/client.py
View File

@ -102,6 +102,7 @@ def run(worker: Worker):
# Basically every test requires a jwt to be passed in so we grab that here # Basically every test requires a jwt to be passed in so we grab that here
# Should this fail so should nearly every other test from this point # Should this fail so should nearly every other test from this point
req_login = worker.request('post', '/login', 'basic',{}, 200) req_login = worker.request('post', '/login', 'basic',{}, 200)
print(worker.responses[req_login].json())
jwt = worker.responses[req_login].json()['jwt'] jwt = worker.responses[req_login].json()['jwt']
new_channel_name = time.time() new_channel_name = time.time()
@ -147,25 +148,25 @@ def run(worker: Worker):
# can we get them back tho? # can we get them back tho?
{ {
'init': [ 'init': [
'get', '/message/get_range', {'channel_id': chan_d['id'], 'start-time': int(msg_chan_name-10), 'end-time': int(msg_chan_name + 10)} 'get', '/message/get_range', {'channel_id': chan_d['id'], 'start_time': int(msg_chan_name-10), 'end_time': int(msg_chan_name + 10)}
], ],
'auth': jwt, 'hope': 200 'auth': jwt, 'hope': 200
}, },
{ {
'init': [ 'init': [
'get', '/message/get_range', {'channel_id': chan_d['id'], 'end-time': int(msg_chan_name)} 'get', '/message/get_range', {'channel_id': chan_d['id'], 'end_time': int(msg_chan_name)}
], ],
'auth': jwt, 'hope': 400 'auth': jwt, 'hope': 400
}, },
{ {
'init': [ 'init': [
'get', '/message/get_range', {'channel_id': chan_d['id'], 'start-time': int(msg_chan_name), 'end-time': int(msg_chan_name)} 'get', '/message/get_range', {'channel_id': chan_d['id'], 'start_time': int(msg_chan_name), 'end_time': int(msg_chan_name)}
], ],
'auth': jwt, 'hope': 400 'auth': jwt, 'hope': 400
}, },
{ {
'init': [ 'init': [
'get', '/message/get_range', {'channel_id': chan_d['id'], 'end-time': int(msg_chan_name), 'start-time': int(msg_chan_name)} 'get', '/message/get_range', {'channel_id': chan_d['id'], 'end_time': int(msg_chan_name), 'start_time': int(msg_chan_name)}
], ],
'auth': jwt, 'hope': 400 'auth': jwt, 'hope': 400
}, },
@ -210,8 +211,23 @@ def run(worker: Worker):
member_tests = [
{ 'init': ['get', '/members/me', {}], 'auth': jwt, 'hope': 200 },
{ 'init': ['get', '/members/me', {'asdf': 123}], 'auth': jwt, 'hope': 200 },
{ 'init': ['get', '/members/get_online', {}], 'auth': jwt, 'hope': 200, 'body': True},
]
for test in member_tests:
method, path, opts = test['init']
auth = test['auth']
hope = test['hope']
if 'body' in test:
worker.request(method, path, auth, opts, hope, show_body=test['body'])
else:
worker.request(method, path, auth, opts, hope)
worker.logs() worker.logs()
if __name__ == '__main__': if __name__ == '__main__':
worker = Worker('https://localhost', create_admin=True) worker = Worker('http://localhost:4536', create_admin=True)
run(worker) run(worker)

2
json-api/client-tests/web/http.py
View File

@ -90,7 +90,7 @@ class Response:
# no color on the query like ever(because its typically massive # no color on the query like ever(because its typically massive
if show_query: if show_query:
msg += f'\n\t{self.query_string[:80]}' msg += f'\n\t{self.query_string[:77]}...'
self.__write_msg(msg) self.__write_msg(msg)