diff --git a/halfapi/testing/test_domain.py b/halfapi/testing/test_domain.py index 4898835..2222946 100644 --- a/halfapi/testing/test_domain.py +++ b/halfapi/testing/test_domain.py @@ -120,7 +120,7 @@ class TestDomain(TestCase): return result_d def check_routes(self): - r = self.client.get('/') + r = self.client.request('get', '/') assert r.status_code == 200 schemas = r.json() assert isinstance(schemas, list) @@ -131,7 +131,7 @@ class TestDomain(TestCase): assert 'paths' in schema assert 'domain' in schema - r = self.client.get('/halfapi/acls') + r = self.client.request('get', '/halfapi/acls') """ assert r.status_code == 200 d_r = r.json() diff --git a/tests/test_acl.py b/tests/test_acl.py index 52a6272..c9eb4c4 100644 --- a/tests/test_acl.py +++ b/tests/test_acl.py @@ -17,7 +17,7 @@ def test_acl_Check(dummy_app, token_debug_false_builder): dummy_app.add_route('/test_public', test_route_public) test_client = TestClient(dummy_app) - resp = test_client.get('/test_public?check') + resp = test_client.request('get', '/test_public?check') assert resp.status_code == 200 @HalfRoute.acl_decorator(params=[{'acl':acl.private}]) @@ -28,10 +28,10 @@ def test_acl_Check(dummy_app, token_debug_false_builder): dummy_app.add_route('/test_private', test_route_private) test_client = TestClient(dummy_app) - resp = test_client.get('/test_private') + resp = test_client.request('get', '/test_private') assert resp.status_code == 401 - resp = test_client.get('/test_private?check') + resp = test_client.request('get', '/test_private?check') assert resp.status_code == 200 diff --git a/tests/test_debug_routes.py b/tests/test_debug_routes.py index 139f157..c229881 100644 --- a/tests/test_debug_routes.py +++ b/tests/test_debug_routes.py @@ -15,7 +15,7 @@ def test_halfapi_whoami(application_debug): # So we use a single function with fixture "application debug" c = TestClient(application_debug) - r = c.get('/halfapi/whoami') + r = c.request('get', '/halfapi/whoami') assert r.status_code == 200 def test_halfapi_log(application_debug): @@ -24,7 +24,7 @@ def test_halfapi_log(application_debug): c = TestClient(application_debug) - r = c.get('/halfapi/log') + r = c.request('get', '/halfapi/log') assert r.status_code == 200 def test_halfapi_error_400(application_debug): @@ -33,7 +33,7 @@ def test_halfapi_error_400(application_debug): c = TestClient(application_debug) - r = c.get('/halfapi/error/400') + r = c.request('get', '/halfapi/error/400') assert r.status_code == 400 def test_halfapi_error_404(application_debug): @@ -42,7 +42,7 @@ def test_halfapi_error_404(application_debug): c = TestClient(application_debug) - r = c.get('/halfapi/error/404') + r = c.request('get', '/halfapi/error/404') assert r.status_code == 404 def test_halfapi_error_500(application_debug): @@ -51,13 +51,13 @@ def test_halfapi_error_500(application_debug): c = TestClient(application_debug) - r = c.get('/halfapi/error/500') + r = c.request('get', '/halfapi/error/500') assert r.status_code == 500 def test_schema(application_debug): c = TestClient(application_debug) - r = c.get('/') + r = c.request('get', '/') schemas = r.json() assert isinstance(schemas, list) for schema in schemas: diff --git a/tests/test_domain.py b/tests/test_domain.py index afd2baa..08bb637 100644 --- a/tests/test_domain.py +++ b/tests/test_domain.py @@ -17,22 +17,22 @@ class TestDummyDomain(TestDomain): self.check_routes() def test_html_route(self): - res = self.client.get('/ret_type') + res = self.client.request('get', '/ret_type') assert res.status_code == 200 assert isinstance(res.content.decode(), str) assert res.headers['content-type'].split(';')[0] == 'text/html' - res = self.client.get('/ret_type/h24') + res = self.client.request('get', '/ret_type/h24') assert res.status_code == 200 assert isinstance(res.content.decode(), str) assert res.headers['content-type'].split(';')[0] == 'text/html' - res = self.client.get('/ret_type/h24/config') + res = self.client.request('get', '/ret_type/h24/config') assert res.status_code == 200 assert isinstance(res.content.decode(), str) assert res.headers['content-type'].split(';')[0] == 'text/html' - res = self.client.post('/ret_type/h24/config', { + res = self.client.request('post', '/ret_type/h24/config', data={ 'trou': 'glet' }) assert res.status_code == 200 @@ -40,37 +40,37 @@ class TestDummyDomain(TestDomain): assert res.headers['content-type'].split(';')[0] == 'text/html' def test_arguments__get_routes(self): - res = self.client.post('/arguments?foo=1&x=3') + res = self.client.request('post', '/arguments?foo=1&x=3') assert res.status_code == 400 arg_dict = {'foo': '1', 'bar': '2', 'x': '3'} - res = self.client.get('/arguments?foo=1&bar=2&x=3') + res = self.client.request('get', '/arguments?foo=1&bar=2&x=3') assert res.json() == arg_dict - res = self.client.get('/arguments?foo=1&bar=2&x=3&y=4') + res = self.client.request('get', '/arguments?foo=1&bar=2&x=3&y=4') assert res.json() == arg_dict def test_arguments_post_routes(self): arg_dict = {} - res = self.client.post('/arguments', arg_dict) + res = self.client.request('post', '/arguments', data=arg_dict) assert res.status_code == 400 arg_dict = {'foo': '1', 'bar': '3'} - res = self.client.post('/arguments', arg_dict) + res = self.client.request('post', '/arguments', data=arg_dict) assert res.status_code == 400 arg_dict = {'foo': '1', 'baz': '3'} - res = self.client.post('/arguments', arg_dict) + res = self.client.request('post', '/arguments', data=arg_dict) assert res.json() == arg_dict arg_dict = {'foo': '1', 'baz': '3', 'truebidoo': '4'} - res = self.client.post('/arguments', arg_dict) + res = self.client.request('post', '/arguments', data=arg_dict) assert res.json() == arg_dict - res = self.client.post('/arguments', { **arg_dict, 'y': '4'}) + res = self.client.request('post', '/arguments', data={ **arg_dict, 'y': '4'}) assert res.json() == arg_dict diff --git a/tests/test_dummy_project_router.py b/tests/test_dummy_project_router.py index ff47c30..c8d9a04 100644 --- a/tests/test_dummy_project_router.py +++ b/tests/test_dummy_project_router.py @@ -4,16 +4,17 @@ import importlib import subprocess import time import pytest +import json from pprint import pprint from starlette.routing import Route from starlette.testclient import TestClient def test_get_config_route(dummy_project, application_domain): c = TestClient(application_domain) - r = c.get('/') + r = c.request('get', '/') assert r.status_code == 200 pprint(r.json()) - r = c.get('/config') + r = c.request('get', '/config') assert r.status_code == 200 pprint(r.json()) assert 'test' in r.json() @@ -36,15 +37,15 @@ def test_get_route(dummy_project, application_domain): print(route_path) try: if verb.lower() == 'get': - r = c.get(route_path) + r = c.request('get', route_path) elif verb.lower() == 'post': - r = c.post(route_path) + r = c.request('post', route_path) elif verb.lower() == 'patch': - r = c.patch(route_path) + r = c.request('patch', route_path) elif verb.lower() == 'put': - r = c.put(route_path) + r = c.request('put', route_path) elif verb.lower() == 'delete': - r = c.delete(route_path) + r = c.request('delete', route_path) else: raise Exception(verb) try: @@ -69,7 +70,7 @@ def test_get_route(dummy_project, application_domain): path = path.format(test=str(test_uuid)) route_path = f'/{path}' if verb.lower() == 'get': - r = c.get(f'{route_path}') + r = c.request('get', f'{route_path}') assert r.status_code == 200 @@ -78,7 +79,7 @@ def test_delete_route(dummy_project, application_domain): c = TestClient(application_domain) from uuid import uuid4 arg = str(uuid4()) - r = c.delete(f'/abc/alphabet/{arg}') + r = c.request('delete', f'/abc/alphabet/{arg}') assert r.status_code == 200 assert isinstance(r.json(), str) @@ -86,22 +87,22 @@ def test_arguments_route(dummy_project, application_domain): c = TestClient(application_domain) path = '/arguments' - r = c.get(path) + r = c.request('get', path) assert r.status_code == 400 - r = c.get(path, params={'foo':True}) + r = c.request('get', path, params={'foo':True}) assert r.status_code == 400 arg = {'foo':True, 'bar':True} - r = c.get(path, params=arg) + r = c.request('get', path, params=arg) assert r.status_code == 200 for key, val in arg.items(): assert r.json()[key] == str(val) path = '/async_router/arguments' - r = c.get(path) + r = c.request('get', path) assert r.status_code == 400 - r = c.get(path, params={'foo':True}) + r = c.request('get', path, params={'foo':True}) assert r.status_code == 400 arg = {'foo':True, 'bar':True} - r = c.get(path, params=arg) + r = c.request('get', path, params=arg) assert r.status_code == 200 for key, val in arg.items(): assert r.json()[key] == str(val) diff --git a/tests/test_jwt_middleware.py b/tests/test_jwt_middleware.py index 2a93895..b2979a8 100644 --- a/tests/test_jwt_middleware.py +++ b/tests/test_jwt_middleware.py @@ -38,7 +38,7 @@ def test_jwt_NoToken(dummy_app): dummy_app.add_route('/test', test_route) test_client = TestClient(dummy_app) - resp = test_client.get('/test') + resp = test_client.request('get', '/test') assert resp.status_code == 200 def test_jwt_Token(dummy_app, token_builder): @@ -50,7 +50,7 @@ def test_jwt_Token(dummy_app, token_builder): dummy_app.add_route('/test', test_route) test_client = TestClient(dummy_app) - resp = test_client.get('/test', + resp = test_client.request('get', '/test', headers={ 'Authorization': token_builder }) @@ -65,7 +65,7 @@ def test_jwt_DebugFalse(dummy_app, token_debug_false_builder): dummy_app.add_route('/test', test_route) test_client = TestClient(dummy_app) - resp = test_client.get('/test', + resp = test_client.request('get', '/test', headers={ 'Authorization': token_debug_false_builder }) @@ -82,7 +82,7 @@ def test_jwt_DebugTrue(dummy_app, token_debug_true_builder): dummy_app.add_route('/test', test_route) test_client = TestClient(dummy_app) - resp = test_client.get('/test', + resp = test_client.request('get', '/test', headers={ 'Authorization': token_debug_true_builder }) @@ -100,7 +100,7 @@ def test_jwt_DebugTrue_DebugApp(dummy_debug_app, token_debug_true_builder): dummy_debug_app.add_route('/test', test_route) test_client = TestClient(dummy_debug_app) - resp = test_client.get('/test', + resp = test_client.request('get', '/test', headers={ 'Authorization': token_debug_true_builder }) diff --git a/tests/test_lib_domain_middlware.py b/tests/test_lib_domain_middlware.py index d4994b1..34983fa 100644 --- a/tests/test_lib_domain_middlware.py +++ b/tests/test_lib_domain_middlware.py @@ -12,12 +12,12 @@ def test_init(): def test_call(application_debug): c = TestClient(application_debug) - r = c.get('/abc/alphabet') + r = c.request('get', '/abc/alphabet') assert r.status_code == 200 assert r.headers['x-domain'] == 'dummy_domain' assert r.headers['x-acl'] == 'public' - r = c.get('/arguments') + r = c.request('get', '/arguments') assert r.status_code == 400 assert r.headers['x-domain'] == 'dummy_domain' assert r.headers['x-acl'] == 'public' @@ -26,7 +26,7 @@ def test_call(application_debug): assert r.headers['x-args-optional'] == 'x' c = TestClient(application_debug) - r = c.post('/arguments') + r = c.request('post', '/arguments') assert r.status_code == 400 assert r.headers['x-domain'] == 'dummy_domain' assert r.headers['x-acl'] == 'public'