tests: expanded assertions

New assertions added for new data being delivered (eg IDs on endpoints not previously serving IDs)

test/test_organisation.py

@@ -21,12 +21,15 @@ async def test_get_org_success(default_client: AsyncClient):
 	data = resp.json()
 
 	assert resp.status_code == 200
+	assert data["id"] == 1
 	assert data["name"] == "Test Org"
+	assert data["status"] == "approved"
 	assert data["root_user"] == "admin@test.com"
 	assert data["billing_contact"] == "billing@test.org"
 	assert data["owner_contact"] == "owner@test.org"
 	assert data["security_contact"] == "security@test.org"
-	assert data["status"] == "approved"
+	assert "intake_questionnaire" in data
+	assert isinstance(data["intake_questionnaire"], dict)
 
 
 @pytest.mark.parametrize(
@@ -91,10 +94,11 @@ async def test_patch_org_questionnaire_partial_success(
 	data = resp.json()
 
 	assert resp.status_code == 200
-	assert "intake_questionnaire" in data
 	assert data["name"] == "Test Org"
-	assert data["intake_questionnaire"]["question_one"] == "new answer one"
 	assert data["status"] == "partial"
+	assert "intake_questionnaire" in data
+	assert isinstance(data["intake_questionnaire"], dict)
+	assert data["intake_questionnaire"]["question_one"] == "new answer one"
 	assert data["intake_questionnaire"]["question_two"] == "answer two"
 	assert data["intake_questionnaire"]["question_three"] is None
 
@@ -159,10 +163,11 @@ async def test_patch_org_questionnaire_submit_success(
 	data = resp.json()
 
 	assert resp.status_code == 200
-	assert "intake_questionnaire" in data
 	assert data["name"] == "Test Org"
-	assert data["intake_questionnaire"]["question_one"] == "new answer one"
 	assert data["status"] == "submitted"
+	assert "intake_questionnaire" in data
+	assert isinstance(data["intake_questionnaire"], dict)
+	assert data["intake_questionnaire"]["question_one"] == "new answer one"
 	assert data["intake_questionnaire"]["question_two"] == "answer two"
 	assert data["intake_questionnaire"]["question_three"] is None
 
@@ -250,9 +255,11 @@ async def test_post_org_user_success(default_client: AsyncClient, db_session):
 	resp = await default_client.post(
 		"/org/user", json={"organisation_id": 1, "user_id": 2}
 	)
-	data = resp.json()
 
 	assert resp.status_code == 200
+
+	data = resp.json()
+
 	assert "users" in data
 	assert isinstance(data["users"], list)
 	assert "user@test.org" in data["users"]
@@ -305,9 +312,10 @@ async def test_patch_org_root_user_success(default_client: AsyncClient, db_sessi
 	resp = await default_client.patch(
 		"/org/root_user", json={"organisation_id": 1, "user_id": 2}
 	)
+	assert resp.status_code == 200
+
 	data = resp.json()
 
-	assert resp.status_code == 200
 	assert data["name"] == "Test Org"
 	assert data["root_user_email"] == "user@test.org"
 
@@ -369,9 +377,10 @@ async def test_patch_org_root_user_non_member(default_client: AsyncClient, db_se
 @pytest.mark.anyio
 async def test_get_org_groups_success(default_client: AsyncClient):
 	resp = await default_client.get("/org/groups?org_id=1")
+	assert resp.status_code == 200
+
 	data = resp.json()
 
-	assert resp.status_code == 200
 	assert "groups" in data
 	assert isinstance(data["groups"], list)
 	assert "Test Group" in data["groups"]
@@ -399,6 +408,10 @@ async def test_get_org_contact_success(default_client: AsyncClient, contact_type
 
 	assert resp.status_code == 200
 
+	assert "organisation" in data
+	assert data["organisation"]["id"] == 1
+	assert data["organisation"]["name"] == "Test Org"
+
 	attributes = [
 		"email",
 		"first_name",
@@ -469,9 +482,39 @@ async def test_patch_org_contact_success(
 		"/org/contact",
 		json={"organisation_id": 1, "contact_type": "billing", key: value},
 	)
+	assert resp.status_code == 200
+
 	data = resp.json()
 
-	assert resp.status_code == 200
+	assert "organisation" in data
+	assert data["organisation"]["id"] == 1
+	assert data["organisation"]["name"] == "Test Org"
+
+	attributes = [
+		"email",
+		"first_name",
+		"last_name",
+		"phonenumber",
+		"vat_number",
+		"address",
+	]
+
+	for attribute in attributes:
+		assert attribute in data["contact"]
+
+	address_attributes = [
+		"post_office_box_number",
+		"street_address",
+		"street_address_line_2",
+		"locality",
+		"address_region",
+		"country_code",
+		"postal_code",
+	]
+
+	for attribute in address_attributes:
+		assert attribute in data["contact"]["address"]
+
 	if key in data["contact"]:
 		assert data["contact"][key] == value
 	elif key in data["contact"]["address"]: