sr2/cloud-api
6
0
Fork 1
Code Issues 8 Pull requests 2 Projects Releases Packages Wiki Activity Actions

minor: rename test client

Browse source 
client -> default_client

To allow for different clients. Primarily to allow different overrides for auth testing.
This commit is contained in:
Chris Milne 2026-06-03 13:54:30 +01:00
parent a907506ec1
commit 9d9ca0b907
7 changed files with 140 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/conftest.py
View file

@ -32,7 +32,7 @@ def db_session():
@pytest.fixture
async def client(db_session) -> AsyncGenerator[AsyncClient, None]:
async def default_client(db_session) -> AsyncGenerator[AsyncClient, None]:
def get_db_override():
return db_session
app.dependency_overrides[get_db] = get_db_override

72
test/test_auth_approval.py
View file

@ -6,7 +6,7 @@ Delete endpoints are currently skipped because the testing system cannot use bod
import pytest
from httpx import AsyncClient
from .conftest import client
from .conftest import default_client
from src.organisation.models import Organisation as Org, OrgUsers
from src.user.models import User
@ -21,15 +21,15 @@ def set_org_partial(db_session):
@pytest.mark.anyio
async def test_get_org_auth_approval(client: AsyncClient):
resp = await client.get("/org?org_id=1")
async def test_get_org_auth_approval(default_client: AsyncClient):
resp = await default_client.get("/org?org_id=1")
assert resp.status_code != 422
assert resp.status_code == 200
@pytest.mark.anyio
async def test_patch_org_questionnaire_auth_approval(client: AsyncClient):
resp = await client.patch("/org/questionnaire", json={"organisation_id": 1,
async def test_patch_org_questionnaire_auth_approval(default_client: AsyncClient):
resp = await default_client.patch("/org/questionnaire", json={"organisation_id": 1,
"intake_questionnaire": {"question_one": "new answer one",
"question_two": None,
"question_three": None},
@ -39,119 +39,119 @@ async def test_patch_org_questionnaire_auth_approval(client: AsyncClient):
@pytest.mark.anyio
async def test_patch_org_status_auth_approval(client: AsyncClient):
resp = await client.patch("/org/status", json={"organisation_id": 1, "status": "submitted"})
async def test_patch_org_status_auth_approval(default_client: AsyncClient):
resp = await default_client.patch("/org/status", json={"organisation_id": 1, "status": "submitted"})
assert resp.status_code != 422
assert resp.status_code == 200
@pytest.mark.anyio
async def test_get_org_users_auth_approval(client: AsyncClient):
resp = await client.get("/org/users?org_id=1")
async def test_get_org_users_auth_approval(default_client: AsyncClient):
resp = await default_client.get("/org/users?org_id=1")
assert resp.status_code != 422
assert "has not been approved." in resp.json()["detail"]
@pytest.mark.anyio
async def test_post_org_user_auth_approval(client: AsyncClient, db_session):
async def test_post_org_user_auth_approval(default_client: AsyncClient, db_session):
db_session.add(User(email="user@test.org", first_name="User", last_name="Test", oidc_id="abcd-efgh-ijkl-1234"))
db_session.flush()
resp = await client.post("/org/user", json={"organisation_id": 1, "user_id": 2})
resp = await default_client.post("/org/user", json={"organisation_id": 1, "user_id": 2})
assert resp.status_code != 422
assert "has not been approved." in resp.json()["detail"]
@pytest.mark.anyio
async def test_patch_org_root_user_auth_approval(client: AsyncClient, db_session):
async def test_patch_org_root_user_auth_approval(default_client: AsyncClient, db_session):
db_session.add(User(email="user@test.org", first_name="User", last_name="Test", oidc_id="abcd-efgh-ijkl-1234"))
db_session.flush()
db_session.add(OrgUsers(org_id=1, user_id=2))
db_session.flush()
resp = await client.patch("/org/root_user", json={"organisation_id": 1, "user_id": 2})
resp = await default_client.patch("/org/root_user", json={"organisation_id": 1, "user_id": 2})
assert resp.status_code != 422
assert "has not been approved." in resp.json()["detail"]
@pytest.mark.anyio
async def test_get_org_groups_auth_approval(client: AsyncClient):
resp = await client.get("/org/groups?org_id=1")
async def test_get_org_groups_auth_approval(default_client: AsyncClient):
resp = await default_client.get("/org/groups?org_id=1")
assert resp.status_code != 422
assert "has not been approved." in resp.json()["detail"]
@pytest.mark.anyio
async def test_get_org_contact_auth_approval(client: AsyncClient):
resp = await client.get(f"/org/contact?org_id=1&contact_type=billing")
async def test_get_org_contact_auth_approval(default_client: AsyncClient):
resp = await default_client.get(f"/org/contact?org_id=1&contact_type=billing")
assert resp.status_code != 422
assert resp.status_code == 200
@pytest.mark.anyio
async def test_patch_org_contact_auth_approval(client: AsyncClient):
resp = await client.patch("/org/contact",
json={"organisation_id": 1, "contact_type": "billing", "email": "user@example.com"})
async def test_patch_org_contact_auth_approval(default_client: AsyncClient):
resp = await default_client.patch("/org/contact",
json={"organisation_id": 1, "contact_type": "billing", "email": "user@example.com"})
assert resp.status_code != 422
assert resp.status_code == 200
@pytest.mark.anyio
async def test_get_service_auth_approval(client: AsyncClient):
resp = await client.get("/service/?org_id=1")
async def test_get_service_auth_approval(default_client: AsyncClient):
resp = await default_client.get("/service/?org_id=1")
assert resp.status_code != 422
assert "has not been approved." in resp.json()["detail"]
@pytest.mark.anyio
async def test_get_iam_group_permissions_auth_approval(client: AsyncClient):
resp = await client.get("/iam/group/permissions?org_id=1&group_id=1")
async def test_get_iam_group_permissions_auth_approval(default_client: AsyncClient):
resp = await default_client.get("/iam/group/permissions?org_id=1&group_id=1")
assert resp.status_code != 422
assert "has not been approved." in resp.json()["detail"]
@pytest.mark.anyio
async def test_get_iam_group_users_auth_approval(client: AsyncClient):
resp = await client.get("/iam/group/users?org_id=1&group_id=1")
async def test_get_iam_group_users_auth_approval(default_client: AsyncClient):
resp = await default_client.get("/iam/group/users?org_id=1&group_id=1")
assert resp.status_code != 422
assert "has not been approved." in resp.json()["detail"]
@pytest.mark.anyio
async def test_post_iam_group_auth_approval(client: AsyncClient):
resp = await client.post("/iam/group", json={"name": "New Group", "organisation_id": 1})
async def test_post_iam_group_auth_approval(default_client: AsyncClient):
resp = await default_client.post("/iam/group", json={"name": "New Group", "organisation_id": 1})
assert resp.status_code != 422
assert "has not been approved." in resp.json()["detail"]
@pytest.mark.anyio
async def test_put_iam_group_permission_auth_approval(client: AsyncClient, db_session):
async def test_put_iam_group_permission_auth_approval(default_client: AsyncClient, db_session):
db_session.add(Group(name="Test Group Two", org_id=1))
db_session.flush()
resp = await client.put("/iam/group/permission", json={"permission_id": 1, "group_id": 2, "organisation_id": 1})
resp = await default_client.put("/iam/group/permission", json={"permission_id": 1, "group_id": 2, "organisation_id": 1})
assert resp.status_code != 422
assert "has not been approved." in resp.json()["detail"]
@pytest.mark.anyio
async def test_put_iam_group_user_auth_approval(client: AsyncClient, db_session):
async def test_put_iam_group_user_auth_approval(default_client: AsyncClient, db_session):
db_session.add(User(email="user@test.org", first_name="User", last_name="Test", oidc_id="abcd-efgh-ijkl-1234"))
db_session.flush()
resp = await client.put("/iam/group/user", json={"user_id": 2, "group_id": 1, "organisation_id": 1})
resp = await default_client.put("/iam/group/user", json={"user_id": 2, "group_id": 1, "organisation_id": 1})
assert resp.status_code != 422
assert "has not been approved." in resp.json()["detail"]
@pytest.mark.anyio
async def test_get_iam_permissions_auth_approval(client: AsyncClient):
resp = await client.get("/iam/permissions?org_id=1")
async def test_get_iam_permissions_auth_approval(default_client: AsyncClient):
resp = await default_client.get("/iam/permissions?org_id=1")
assert resp.status_code != 422
assert "has not been approved." in resp.json()["detail"]
@pytest.mark.anyio
async def test_post_iam_permissions_search_auth_approval(client: AsyncClient):
resp = await client.post("/iam/permissions/search", json={"organisation_id": 1, "action": "read"})
async def test_post_iam_permissions_search_auth_approval(default_client: AsyncClient):
resp = await default_client.post("/iam/permissions/search", json={"organisation_id": 1, "action": "read"})
assert resp.status_code != 422
assert "has not been approved." in resp.json()["detail"]

6
test/test_healthcheck.py
View file

@ -1,11 +1,11 @@
import pytest
from httpx import AsyncClient
from .conftest import client
from .conftest import default_client
@pytest.mark.anyio
async def test_healthcheck(client: AsyncClient):
resp = await client.get("/healthcheck")
async def test_healthcheck(default_client: AsyncClient):
resp = await default_client.get("/healthcheck")
assert resp.status_code == 200
assert resp.json() == {"status": "ok"}

74
test/test_iam.py
View file

@ -5,13 +5,13 @@ import pytest
from httpx import AsyncClient
from src.user.models import User
from .conftest import client, db_session
from .conftest import default_client, db_session
from src.iam.models import Group
@pytest.mark.anyio
async def test_post_act_on_resource_endpoint_success(client: AsyncClient):
async def test_post_act_on_resource_endpoint_success(default_client: AsyncClient):
body = {
"service": "Test Service",
"organisation": "Test Org",
@ -21,7 +21,7 @@ async def test_post_act_on_resource_endpoint_success(client: AsyncClient):
"Authorization": "Bearer not_checked_when_auth_is_disabled",
"X-API-Key": "123456789"
}
resp = await client.post("/iam/can_act_on_resource?action=read", json=body, headers=headers)
resp = await default_client.post("/iam/can_act_on_resource?action=read", json=body, headers=headers)
data = resp.json()
assert resp.status_code == 200
@ -41,7 +41,7 @@ async def test_post_act_on_resource_endpoint_success(client: AsyncClient):
],
)
@pytest.mark.anyio
async def test_post_act_on_resource_endpoint_failure(client: AsyncClient, service, org, resource, action,
async def test_post_act_on_resource_endpoint_failure(default_client: AsyncClient, service, org, resource, action,
expected_status: int):
body = {
"service": service,
@ -52,14 +52,14 @@ async def test_post_act_on_resource_endpoint_failure(client: AsyncClient, servic
"Authorization": "Bearer not_checked_when_auth_is_disabled",
"X-API-Key": "123456789"
}
resp = await client.post(f"/iam/can_act_on_resource?action={action}", json=body, headers=headers)
resp = await default_client.post(f"/iam/can_act_on_resource?action={action}", json=body, headers=headers)
assert resp.status_code == expected_status
@pytest.mark.anyio
async def test_get_group_permissions_success(client: AsyncClient):
resp = await client.get("/iam/group/permissions?org_id=1&group_id=1")
async def test_get_group_permissions_success(default_client: AsyncClient):
resp = await default_client.get("/iam/group/permissions?org_id=1&group_id=1")
data = resp.json()
assert resp.status_code == 200
@ -88,15 +88,15 @@ async def test_get_group_permissions_success(client: AsyncClient):
],
)
@pytest.mark.anyio
async def test_get_group_permissions_failure(client: AsyncClient, query: str, expected_status: int):
resp = await client.get(f"/iam/group/permissions?{query}")
async def test_get_group_permissions_failure(default_client: AsyncClient, query: str, expected_status: int):
resp = await default_client.get(f"/iam/group/permissions?{query}")
assert resp.status_code == expected_status
@pytest.mark.anyio
async def test_get_group_users_success(client: AsyncClient):
resp = await client.get("/iam/group/users?org_id=1&group_id=1")
async def test_get_group_users_success(default_client: AsyncClient):
resp = await default_client.get("/iam/group/users?org_id=1&group_id=1")
data = resp.json()
assert resp.status_code == 200
@ -126,15 +126,15 @@ async def test_get_group_users_success(client: AsyncClient):
],
)
@pytest.mark.anyio
async def test_get_group_users_failure(client: AsyncClient, query: str, expected_status: int):
resp = await client.get(f"/iam/group/users?{query}")
async def test_get_group_users_failure(default_client: AsyncClient, query: str, expected_status: int):
resp = await default_client.get(f"/iam/group/users?{query}")
assert resp.status_code == expected_status
@pytest.mark.anyio
async def test_post_group_success(client: AsyncClient):
resp = await client.post("/iam/group", json={"name": "New Group", "organisation_id": 1})
async def test_post_group_success(default_client: AsyncClient):
resp = await default_client.post("/iam/group", json={"name": "New Group", "organisation_id": 1})
data = resp.json()
assert resp.status_code == 200
@ -161,17 +161,17 @@ async def test_post_group_success(client: AsyncClient):
],
)
@pytest.mark.anyio
async def test_post_group_failure(client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await client.post("/iam/group", json=body)
async def test_post_group_failure(default_client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await default_client.post("/iam/group", json=body)
assert resp.status_code == expected_status
@pytest.mark.anyio
async def test_put_group_perm_success(client: AsyncClient, db_session):
async def test_put_group_perm_success(default_client: AsyncClient, db_session):
db_session.add(Group(name="Test Group Two", org_id=1))
db_session.flush()
resp = await client.put("/iam/group/permission", json={"permission_id": 1, "group_id": 2, "organisation_id": 1})
resp = await default_client.put("/iam/group/permission", json={"permission_id": 1, "group_id": 2, "organisation_id": 1})
data = resp.json()
assert resp.status_code == 200
@ -217,18 +217,18 @@ async def test_put_group_perm_success(client: AsyncClient, db_session):
],
)
@pytest.mark.anyio
async def test_put_group_perm_failure(client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await client.put("/iam/group/permission", json=body)
async def test_put_group_perm_failure(default_client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await default_client.put("/iam/group/permission", json=body)
assert resp.status_code == expected_status
@pytest.mark.anyio
async def test_put_group_user_success(client: AsyncClient, db_session):
async def test_put_group_user_success(default_client: AsyncClient, db_session):
db_session.add(User(email="user@test.org", first_name="User", last_name="Test", oidc_id="abcd-efgh-ijkl-1234"))
db_session.flush()
resp = await client.put("/iam/group/user", json={"user_id": 2, "group_id": 1, "organisation_id": 1})
resp = await default_client.put("/iam/group/user", json={"user_id": 2, "group_id": 1, "organisation_id": 1})
data = resp.json()
assert resp.status_code == 200
@ -275,15 +275,15 @@ async def test_put_group_user_success(client: AsyncClient, db_session):
],
)
@pytest.mark.anyio
async def test_put_group_user_failure(client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await client.put("/iam/group/user", json=body)
async def test_put_group_user_failure(default_client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await default_client.put("/iam/group/user", json=body)
assert resp.status_code == expected_status
@pytest.mark.anyio
async def test_get_permissions_success(client: AsyncClient):
resp = await client.get("/iam/permissions?org_id=1")
async def test_get_permissions_success(default_client: AsyncClient):
resp = await default_client.get("/iam/permissions?org_id=1")
data = resp.json()
assert resp.status_code == 200
@ -305,15 +305,15 @@ async def test_get_permissions_success(client: AsyncClient):
],
)
@pytest.mark.anyio
async def test_get_permissions_failure(client: AsyncClient, query: str, expected_status: int):
resp = await client.get(f"/iam/permissions?{query}")
async def test_get_permissions_failure(default_client: AsyncClient, query: str, expected_status: int):
resp = await default_client.get(f"/iam/permissions?{query}")
assert resp.status_code == expected_status
@pytest.mark.anyio
async def test_post_perm_success(client: AsyncClient, db_session):
resp = await client.post("/iam/permission", json={"service_id": 1, "resource": "test_resource", "action": "create"})
async def test_post_perm_success(default_client: AsyncClient, db_session):
resp = await default_client.post("/iam/permission", json={"service_id": 1, "resource": "test_resource", "action": "create"})
data = resp.json()
assert resp.status_code == 200
@ -351,8 +351,8 @@ async def test_post_perm_success(client: AsyncClient, db_session):
],
)
@pytest.mark.anyio
async def test_post_perm_failure(client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await client.post("/iam/permission", json=body)
async def test_post_perm_failure(default_client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await default_client.post("/iam/permission", json=body)
assert resp.status_code == expected_status
@ -371,8 +371,8 @@ async def test_post_perm_failure(client: AsyncClient, body: dict[str, str], expe
],
)
@pytest.mark.anyio
async def test_post_perm_search_success(client: AsyncClient, db_session, body):
resp = await client.post("/iam/permissions/search", json=body)
async def test_post_perm_search_success(default_client: AsyncClient, db_session, body):
resp = await default_client.post("/iam/permissions/search", json=body)
data = resp.json()
assert resp.status_code == 200
@ -408,7 +408,7 @@ async def test_post_perm_search_success(client: AsyncClient, db_session, body):
],
)
@pytest.mark.anyio
async def test_post_perm_search_failure(client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await client.post("/iam/permissions/search", json=body)
async def test_post_perm_search_failure(default_client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await default_client.post("/iam/permissions/search", json=body)
assert resp.status_code == expected_status

86
test/test_organisation.py
View file

@ -6,12 +6,12 @@ from httpx import AsyncClient
from src.organisation.models import Organisation, OrgUsers
from src.user.models import User
from .conftest import client
from .conftest import default_client
@pytest.mark.anyio
async def test_get_org_success(client: AsyncClient):
resp = await client.get("/org?org_id=1")
async def test_get_org_success(default_client: AsyncClient):
resp = await default_client.get("/org?org_id=1")
data = resp.json()
assert resp.status_code == 200
@ -32,15 +32,15 @@ async def test_get_org_success(client: AsyncClient):
],
)
@pytest.mark.anyio
async def test_get_org_failure(client: AsyncClient, query: str, expected_status: int):
resp = await client.get(f"/org?{query}")
async def test_get_org_failure(default_client: AsyncClient, query: str, expected_status: int):
resp = await default_client.get(f"/org?{query}")
assert resp.status_code == expected_status
@pytest.mark.anyio
async def test_post_org_success(client: AsyncClient):
resp = await client.post("/org", json={"name": "New Test Org"})
async def test_post_org_success(default_client: AsyncClient):
resp = await default_client.post("/org", json={"name": "New Test Org"})
data = resp.json()
assert resp.status_code == 201
@ -57,18 +57,18 @@ async def test_post_org_success(client: AsyncClient):
],
)
@pytest.mark.anyio
async def test_post_org_failure(client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await client.post("/org", json=body)
async def test_post_org_failure(default_client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await default_client.post("/org", json=body)
assert resp.status_code == expected_status
@pytest.mark.anyio
async def test_patch_org_questionnaire_partial_success(client: AsyncClient, db_session):
async def test_patch_org_questionnaire_partial_success(default_client: AsyncClient, db_session):
org_model = db_session.get(Organisation, 1)
org_model.status = "partial"
db_session.flush()
resp = await client.patch("/org/questionnaire", json={"organisation_id": 1, "intake_questionnaire": {"question_one": "new answer one", "question_two": None, "question_three": None}, "partial": True})
resp = await default_client.patch("/org/questionnaire", json={"organisation_id": 1, "intake_questionnaire": {"question_one": "new answer one", "question_two": None, "question_three": None}, "partial": True})
data = resp.json()
assert resp.status_code == 200
@ -93,18 +93,18 @@ async def test_patch_org_questionnaire_partial_success(client: AsyncClient, db_s
],
)
@pytest.mark.anyio
async def test_patch_questionnaire_partial_failure(client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await client.patch("/org/questionnaire", json=body)
async def test_patch_questionnaire_partial_failure(default_client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await default_client.patch("/org/questionnaire", json=body)
assert resp.status_code == expected_status
@pytest.mark.anyio
async def test_patch_org_questionnaire_submit_success(client: AsyncClient, db_session):
async def test_patch_org_questionnaire_submit_success(default_client: AsyncClient, db_session):
org_model = db_session.get(Organisation, 1)
org_model.status = "partial"
db_session.flush()
resp = await client.patch("/org/questionnaire", json={"organisation_id": 1, "intake_questionnaire": {"question_one": "new answer one", "question_two": None, "question_three": None}, "partial": False})
resp = await default_client.patch("/org/questionnaire", json={"organisation_id": 1, "intake_questionnaire": {"question_one": "new answer one", "question_two": None, "question_three": None}, "partial": False})
data = resp.json()
assert resp.status_code == 200
@ -121,8 +121,8 @@ async def test_patch_org_questionnaire_submit_success(client: AsyncClient, db_se
["partial", "submitted", "remediation", "approved", "rejected", "removed"]
)
@pytest.mark.anyio
async def test_patch_org_status_success(client: AsyncClient, status: str):
resp = await client.patch("/org/status", json={"organisation_id": 1, "status": status})
async def test_patch_org_status_success(default_client: AsyncClient, status: str):
resp = await default_client.patch("/org/status", json={"organisation_id": 1, "status": status})
data = resp.json()
assert resp.status_code == 200
@ -142,15 +142,15 @@ async def test_patch_org_status_success(client: AsyncClient, status: str):
],
)
@pytest.mark.anyio
async def test_patch_org_status_failure(client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await client.patch("/org/status", json=body)
async def test_patch_org_status_failure(default_client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await default_client.patch("/org/status", json=body)
assert resp.status_code == expected_status
@pytest.mark.anyio
async def test_get_org_users_success(client: AsyncClient):
resp = await client.get("/org/users?org_id=1")
async def test_get_org_users_success(default_client: AsyncClient):
resp = await default_client.get("/org/users?org_id=1")
data = resp.json()
assert resp.status_code == 200
@ -173,18 +173,18 @@ async def test_get_org_users_success(client: AsyncClient):
],
)
@pytest.mark.anyio
async def test_get_org_users_failure(client: AsyncClient, query: str, expected_status: int):
resp = await client.get(f"/org/users?{query}")
async def test_get_org_users_failure(default_client: AsyncClient, query: str, expected_status: int):
resp = await default_client.get(f"/org/users?{query}")
assert resp.status_code == expected_status
@pytest.mark.anyio
async def test_post_org_user_success(client: AsyncClient, db_session):
async def test_post_org_user_success(default_client: AsyncClient, db_session):
db_session.add(User(email="user@test.org", first_name="User", last_name="Test", oidc_id="abcd-efgh-ijkl-1234"))
db_session.flush()
resp = await client.post("/org/user", json={"organisation_id": 1, "user_id": 2})
resp = await default_client.post("/org/user", json={"organisation_id": 1, "user_id": 2})
data = resp.json()
assert resp.status_code == 200
@ -204,23 +204,23 @@ async def test_post_org_user_success(client: AsyncClient, db_session):
],
)
@pytest.mark.anyio
async def test_post_org_failure(client: AsyncClient, body: dict[str, str], expected_status: int, db_session):
async def test_post_org_failure(default_client: AsyncClient, body: dict[str, str], expected_status: int, db_session):
db_session.add(User(email="user@test.org", first_name="User", last_name="Test", oidc_id="abcd-efgh-ijkl-1234"))
db_session.flush()
resp = await client.post("/org/user", json=body)
resp = await default_client.post("/org/user", json=body)
assert resp.status_code == expected_status
@pytest.mark.anyio
async def test_patch_org_root_user_success(client: AsyncClient, db_session):
async def test_patch_org_root_user_success(default_client: AsyncClient, db_session):
db_session.add(User(email="user@test.org", first_name="User", last_name="Test", oidc_id="abcd-efgh-ijkl-1234"))
db_session.flush()
db_session.add(OrgUsers(org_id=1, user_id=2))
db_session.flush()
resp = await client.patch("/org/root_user", json={"organisation_id": 1, "user_id": 2})
resp = await default_client.patch("/org/root_user", json={"organisation_id": 1, "user_id": 2})
data = resp.json()
assert resp.status_code == 200
@ -241,20 +241,20 @@ async def test_patch_org_root_user_success(client: AsyncClient, db_session):
],
)
@pytest.mark.anyio
async def test_patch_root_user_failure(client: AsyncClient, body: dict[str, str], expected_status: int, db_session):
async def test_patch_root_user_failure(default_client: AsyncClient, body: dict[str, str], expected_status: int, db_session):
db_session.add(User(email="user@test.org", first_name="User", last_name="Test", oidc_id="abcd-efgh-ijkl-1234"))
db_session.flush()
db_session.add(OrgUsers(org_id=1, user_id=2))
db_session.flush()
resp = await client.patch("/org/root_user", json=body)
resp = await default_client.patch("/org/root_user", json=body)
assert resp.status_code == expected_status
@pytest.mark.anyio
async def test_get_org_groups_success(client: AsyncClient):
resp = await client.get("/org/groups?org_id=1")
async def test_get_org_groups_success(default_client: AsyncClient):
resp = await default_client.get("/org/groups?org_id=1")
data = resp.json()
assert resp.status_code == 200
@ -272,8 +272,8 @@ async def test_get_org_groups_success(client: AsyncClient):
],
)
@pytest.mark.anyio
async def test_get_org_groups_failure(client: AsyncClient, query: str, expected_status: int):
resp = await client.get(f"/org/groups?{query}")
async def test_get_org_groups_failure(default_client: AsyncClient, query: str, expected_status: int):
resp = await default_client.get(f"/org/groups?{query}")
assert resp.status_code == expected_status
@ -283,8 +283,8 @@ async def test_get_org_groups_failure(client: AsyncClient, query: str, expected_
["billing", "security", "owner"]
)
@pytest.mark.anyio
async def test_get_org_contact_success(client: AsyncClient, contact_type: str):
resp = await client.get(f"/org/contact?org_id=1&contact_type={contact_type}")
async def test_get_org_contact_success(default_client: AsyncClient, contact_type: str):
resp = await default_client.get(f"/org/contact?org_id=1&contact_type={contact_type}")
data = resp.json()
assert resp.status_code == 200
@ -326,8 +326,8 @@ async def test_get_org_contact_success(client: AsyncClient, contact_type: str):
],
)
@pytest.mark.anyio
async def test_get_org_contact_failure(client: AsyncClient, query: str, expected_status: int):
resp = await client.get(f"/org/contact?{query}")
async def test_get_org_contact_failure(default_client: AsyncClient, query: str, expected_status: int):
resp = await default_client.get(f"/org/contact?{query}")
assert resp.status_code == expected_status
@ -350,8 +350,8 @@ async def test_get_org_contact_failure(client: AsyncClient, query: str, expected
]
)
@pytest.mark.anyio
async def test_patch_org_contact_success(client: AsyncClient, key: str, value: str):
resp = await client.patch("/org/contact", json={"organisation_id": 1, "contact_type": "billing", key: value})
async def test_patch_org_contact_success(default_client: AsyncClient, key: str, value: str):
resp = await default_client.patch("/org/contact", json={"organisation_id": 1, "contact_type": "billing", key: value})
data = resp.json()
assert resp.status_code == 200
@ -376,7 +376,7 @@ async def test_patch_org_contact_success(client: AsyncClient, key: str, value: s
],
)
@pytest.mark.anyio
async def test_patch_org_status_failure(client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await client.patch("/org/contact", json=body)
async def test_patch_org_status_failure(default_client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await default_client.patch("/org/contact", json=body)
assert resp.status_code == expected_status

26
test/test_service.py
View file

@ -4,12 +4,12 @@
import pytest
from httpx import AsyncClient
from .conftest import client
from .conftest import default_client
@pytest.mark.anyio
async def test_get_services_success(client: AsyncClient):
resp = await client.get("/service/?org_id=1")
async def test_get_services_success(default_client: AsyncClient):
resp = await default_client.get("/service/?org_id=1")
data = resp.json()
assert resp.status_code == 200
@ -28,15 +28,15 @@ async def test_get_services_success(client: AsyncClient):
],
)
@pytest.mark.anyio
async def test_get_services_failure(client: AsyncClient, query: str, expected_status: int):
resp = await client.get(f"/service/?{query}")
async def test_get_services_failure(default_client: AsyncClient, query: str, expected_status: int):
resp = await default_client.get(f"/service/?{query}")
assert resp.status_code == expected_status
@pytest.mark.anyio
async def test_post_service_success(client: AsyncClient):
resp = await client.post("/service/", json={"name": "New Test Service"})
async def test_post_service_success(default_client: AsyncClient):
resp = await default_client.post("/service/", json={"name": "New Test Service"})
data = resp.json()
assert resp.status_code == 200
@ -55,15 +55,15 @@ async def test_post_service_success(client: AsyncClient):
],
)
@pytest.mark.anyio
async def test_post_services_failure(client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await client.post("/service/", json=body)
async def test_post_services_failure(default_client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await default_client.post("/service/", json=body)
assert resp.status_code == expected_status
@pytest.mark.anyio
async def test_patch_service_success(client: AsyncClient):
resp = await client.patch("/service/key", json={"service_id": 1})
async def test_patch_service_success(default_client: AsyncClient):
resp = await default_client.patch("/service/key", json={"service_id": 1})
data = resp.json()
assert resp.status_code == 200
@ -84,7 +84,7 @@ async def test_patch_service_success(client: AsyncClient):
],
)
@pytest.mark.anyio
async def test_patch_services_failure(client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await client.patch("/service/key", json=body)
async def test_patch_services_failure(default_client: AsyncClient, body: dict[str, str], expected_status: int):
resp = await default_client.patch("/service/key", json=body)
assert resp.status_code == expected_status

14
test/test_user.py
View file

@ -6,11 +6,11 @@
import pytest
from httpx import AsyncClient
from .conftest import client
from .conftest import default_client
@pytest.mark.anyio
async def test_get_self_db(client: AsyncClient):
resp = await client.get("/user/self/db")
async def test_get_self_db(default_client: AsyncClient):
resp = await default_client.get("/user/self/db")
data = resp.json()
assert resp.status_code == 200
@ -22,8 +22,8 @@ async def test_get_self_db(client: AsyncClient):
@pytest.mark.anyio
async def test_get_user_success(client: AsyncClient):
resp = await client.get("/user/?user_id=1")
async def test_get_user_success(default_client: AsyncClient):
resp = await default_client.get("/user/?user_id=1")
data = resp.json()
assert resp.status_code == 200
@ -44,7 +44,7 @@ async def test_get_user_success(client: AsyncClient):
("", 422),
],
)
async def test_get_user_fail(client: AsyncClient, query: str, expected_status: int):
resp = await client.get(f"/user/?{query}")
async def test_get_user_fail(default_client: AsyncClient, query: str, expected_status: int):
resp = await default_client.get(f"/user/?{query}")
assert resp.status_code == expected_status