minor: ruff formatter
All changes are either: - Correcting tabs - Adding/removing line breaks - Adding trailing commas
This commit is contained in:
parent
b2e5dd2ebb
commit
c689ac1e10
91 changed files with 1710 additions and 689 deletions
|
|
@ -1,6 +1,7 @@
|
|||
"""
|
||||
[DELETE] /org/ is not tested because the testing client cannot attach a body to a delete request.
|
||||
"""
|
||||
|
||||
import pytest
|
||||
from httpx import AsyncClient
|
||||
|
||||
|
|
@ -24,11 +25,12 @@ async def test_get_org_success(default_client: AsyncClient):
|
|||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"query, expected_status",
|
||||
generate_query_and_status(["org_id"])
|
||||
"query, expected_status", generate_query_and_status(["org_id"])
|
||||
)
|
||||
@pytest.mark.anyio
|
||||
async def test_get_org_status_checks(default_client: AsyncClient, query: str, expected_status: int):
|
||||
async def test_get_org_status_checks(
|
||||
default_client: AsyncClient, query: str, expected_status: int
|
||||
):
|
||||
resp = await default_client.get(f"/org?{query}")
|
||||
|
||||
assert resp.status_code == expected_status
|
||||
|
|
@ -53,18 +55,33 @@ async def test_post_org_success(default_client: AsyncClient):
|
|||
],
|
||||
)
|
||||
@pytest.mark.anyio
|
||||
async def test_post_org_status_checks(default_client: AsyncClient, body: dict[str, str], expected_status: int):
|
||||
async def test_post_org_status_checks(
|
||||
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(default_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 default_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
|
||||
|
|
@ -83,24 +100,56 @@ async def test_patch_org_questionnaire_partial_success(default_client: AsyncClie
|
|||
({"organisation_id": "Test Org"}, 422),
|
||||
({"organisation_id": ""}, 422),
|
||||
({}, 422),
|
||||
({"organisation_id": "1", "intake_questionnaire": {"question_one": 42}, "partial": True}, 422),
|
||||
({"organisation_id": "1", "intake_questionnaire": {"question_one": "valid"}}, 422),
|
||||
({"organisation_id": "1", "intake_questionnaire": {"question_one": "valid"}, "partial": 42}, 422),
|
||||
(
|
||||
{
|
||||
"organisation_id": "1",
|
||||
"intake_questionnaire": {"question_one": 42},
|
||||
"partial": True,
|
||||
},
|
||||
422,
|
||||
),
|
||||
(
|
||||
{"organisation_id": "1", "intake_questionnaire": {"question_one": "valid"}},
|
||||
422,
|
||||
),
|
||||
(
|
||||
{
|
||||
"organisation_id": "1",
|
||||
"intake_questionnaire": {"question_one": "valid"},
|
||||
"partial": 42,
|
||||
},
|
||||
422,
|
||||
),
|
||||
],
|
||||
)
|
||||
@pytest.mark.anyio
|
||||
async def test_patch_questionnaire_partial_status_checks(default_client: AsyncClient, body: dict[str, str], expected_status: int):
|
||||
async def test_patch_questionnaire_partial_status_checks(
|
||||
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(default_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 default_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
|
||||
|
|
@ -113,12 +162,13 @@ async def test_patch_org_questionnaire_submit_success(default_client: AsyncClien
|
|||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"status",
|
||||
["partial", "submitted", "remediation", "approved", "rejected", "removed"]
|
||||
"status", ["partial", "submitted", "remediation", "approved", "rejected", "removed"]
|
||||
)
|
||||
@pytest.mark.anyio
|
||||
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})
|
||||
resp = await default_client.patch(
|
||||
"/org/status", json={"organisation_id": 1, "status": status}
|
||||
)
|
||||
data = resp.json()
|
||||
|
||||
assert resp.status_code == 200
|
||||
|
|
@ -138,7 +188,9 @@ async def test_patch_org_status_success(default_client: AsyncClient, status: str
|
|||
],
|
||||
)
|
||||
@pytest.mark.anyio
|
||||
async def test_patch_org_status_status_checks(default_client: AsyncClient, body: dict[str, str], expected_status: int):
|
||||
async def test_patch_org_status_status_checks(
|
||||
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
|
||||
|
|
@ -161,11 +213,12 @@ async def test_get_org_users_success(default_client: AsyncClient):
|
|||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"query, expected_status",
|
||||
generate_query_and_status(["org_id"])
|
||||
"query, expected_status", generate_query_and_status(["org_id"])
|
||||
)
|
||||
@pytest.mark.anyio
|
||||
async def test_get_org_users_status_checks(default_client: AsyncClient, query: str, expected_status: int):
|
||||
async def test_get_org_users_status_checks(
|
||||
default_client: AsyncClient, query: str, expected_status: int
|
||||
):
|
||||
resp = await default_client.get(f"/org/users?{query}")
|
||||
|
||||
assert resp.status_code == expected_status
|
||||
|
|
@ -173,10 +226,19 @@ async def test_get_org_users_status_checks(default_client: AsyncClient, query: s
|
|||
|
||||
@pytest.mark.anyio
|
||||
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.add(
|
||||
User(
|
||||
email="user@test.org",
|
||||
first_name="User",
|
||||
last_name="Test",
|
||||
oidc_id="abcd-efgh-ijkl-1234",
|
||||
)
|
||||
)
|
||||
db_session.flush()
|
||||
|
||||
resp = await default_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
|
||||
|
|
@ -197,8 +259,17 @@ async def test_post_org_user_success(default_client: AsyncClient, db_session):
|
|||
],
|
||||
)
|
||||
@pytest.mark.anyio
|
||||
async def test_post_org_user_status_checks(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"))
|
||||
async def test_post_org_user_status_checks(
|
||||
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 default_client.post("/org/user", json=body)
|
||||
|
|
@ -208,12 +279,21 @@ async def test_post_org_user_status_checks(default_client: AsyncClient, body: di
|
|||
|
||||
@pytest.mark.anyio
|
||||
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.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 default_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
|
||||
|
|
@ -234,8 +314,17 @@ async def test_patch_org_root_user_success(default_client: AsyncClient, db_sessi
|
|||
],
|
||||
)
|
||||
@pytest.mark.anyio
|
||||
async def test_patch_root_user_status_checks(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"))
|
||||
async def test_patch_root_user_status_checks(
|
||||
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()
|
||||
|
|
@ -247,10 +336,19 @@ async def test_patch_root_user_status_checks(default_client: AsyncClient, body:
|
|||
|
||||
@pytest.mark.anyio
|
||||
async def test_patch_org_root_user_non_member(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.add(
|
||||
User(
|
||||
email="user@test.org",
|
||||
first_name="User",
|
||||
last_name="Test",
|
||||
oidc_id="abcd-efgh-ijkl-1234",
|
||||
)
|
||||
)
|
||||
db_session.flush()
|
||||
|
||||
resp = await default_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 == 422
|
||||
|
|
@ -269,23 +367,23 @@ async def test_get_org_groups_success(default_client: AsyncClient):
|
|||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"query, expected_status",
|
||||
generate_query_and_status(["org_id"])
|
||||
"query, expected_status", generate_query_and_status(["org_id"])
|
||||
)
|
||||
@pytest.mark.anyio
|
||||
async def test_get_org_groups_status_checks(default_client: AsyncClient, query: str, expected_status: int):
|
||||
async def test_get_org_groups_status_checks(
|
||||
default_client: AsyncClient, query: str, expected_status: int
|
||||
):
|
||||
resp = await default_client.get(f"/org/groups?{query}")
|
||||
|
||||
assert resp.status_code == expected_status
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"contact_type",
|
||||
["billing", "security", "owner"]
|
||||
)
|
||||
@pytest.mark.parametrize("contact_type", ["billing", "security", "owner"])
|
||||
@pytest.mark.anyio
|
||||
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}")
|
||||
resp = await default_client.get(
|
||||
f"/org/contact?org_id=1&contact_type={contact_type}"
|
||||
)
|
||||
data = resp.json()
|
||||
|
||||
assert resp.status_code == 200
|
||||
|
|
@ -327,7 +425,9 @@ async def test_get_org_contact_success(default_client: AsyncClient, contact_type
|
|||
],
|
||||
)
|
||||
@pytest.mark.anyio
|
||||
async def test_get_org_contact_status_checks(default_client: AsyncClient, query: str, expected_status: int):
|
||||
async def test_get_org_contact_status_checks(
|
||||
default_client: AsyncClient, query: str, expected_status: int
|
||||
):
|
||||
resp = await default_client.get(f"/org/contact?{query}")
|
||||
|
||||
assert resp.status_code == expected_status
|
||||
|
|
@ -348,11 +448,16 @@ async def test_get_org_contact_status_checks(default_client: AsyncClient, query:
|
|||
("address_region", "Glasgow City"),
|
||||
("country_code", "GB"),
|
||||
("postal_code", "G1 1AA"),
|
||||
]
|
||||
],
|
||||
)
|
||||
@pytest.mark.anyio
|
||||
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})
|
||||
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
|
||||
|
|
@ -379,7 +484,9 @@ async def test_patch_org_contact_success(default_client: AsyncClient, key: str,
|
|||
],
|
||||
)
|
||||
@pytest.mark.anyio
|
||||
async def test_patch_org_contact_status_checks(default_client: AsyncClient, body: dict[str, str], expected_status: int):
|
||||
async def test_patch_org_contact_status_checks(
|
||||
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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue