Make respx-based tests more idiomatic

Author: zyv

pyproject.toml

@@ -44,7 +44,6 @@ path = "src/trac_rpc/__about__.py"
 line-length = 120
 target-version = "py313"
 
-
 [tool.ruff.lint]
 select = [
     "C4", # flake8-comprehensions

tests/test_client.py

@@ -77,7 +77,7 @@ def test_event_hooks_default(monkeypatch: MonkeyPatch, respx_mock: respx.mock):
 
 
 def test_raise_for_status(api_client: ApiClient, respx_mock: respx.mock):
-    respx_mock.post(url=TRAC_RPC_URL).mock(return_value=httpx.Response(status_code=httpx.codes.BAD_GATEWAY))
+    respx_mock.post(url=TRAC_RPC_URL) % httpx.codes.BAD_GATEWAY
 
     with pytest.raises(httpx.HTTPStatusError):
         api_client.get_api_version()
@@ -98,11 +98,9 @@ def test_event_hooks_override(monkeypatch: MonkeyPatch, respx_mock: respx.mock):
 
 
 def test_raise_on_error(api_client: ApiClient, respx_mock: respx.mock):
-    respx_mock.post(TRAC_RPC_URL).mock(
-        return_value=httpx.Response(
-            status_code=httpx.codes.OK,  # sic!
-            text=get_fixture("trac-response-rpc-error.json"),
-        )
+    respx_mock.post(TRAC_RPC_URL).respond(
+        status_code=httpx.codes.OK,  # sic!
+        text=get_fixture("trac-response-rpc-error.json"),
     )
 
     with pytest.raises(TracRpcError) as excinfo:
@@ -116,24 +114,14 @@ def test_raise_on_error(api_client: ApiClient, respx_mock: respx.mock):
 
 
 def test_invalid_success_response(api_client: ApiClient, respx_mock: respx.mock):
-    respx_mock.post().mock(
-        return_value=httpx.Response(
-            status_code=httpx.codes.OK,
-            text="""{"error": null, "result": null, "id": null}""",
-        )
-    )
+    respx_mock.post().respond(text="""{"error": null, "result": null, "id": null}""")
 
     with pytest.raises(ValidationError, match=r".+ invalid success response .+"):
         api_client.get_api_version()
 
 
 def test_invalid_error_response(api_client: ApiClient, respx_mock: respx.mock):
-    respx_mock.post().mock(
-        return_value=httpx.Response(
-            status_code=httpx.codes.OK,
-            text="""{"error": {"message": "", "code": 123, "name": ""}, "result": null, "id": 123}""",
-        )
-    )
+    respx_mock.post().respond(text="""{"error": {"message": "", "code": 123, "name": ""}, "result": null, "id": 123}""")
 
     with pytest.raises(ValidationError, match=r".+ invalid error response .+"):
         api_client.get_api_version()

tests/test_methods.py

@@ -1,7 +1,6 @@
 import json
 from datetime import datetime
 
-import httpx
 import pytest
 import respx
 
@@ -22,12 +21,7 @@
     ],
 )
 def test_query_tickets(kwargs: dict, expected: str, api_client: ApiClient, respx_mock: respx.mock):
-    respx_mock.post().mock(
-        return_value=httpx.Response(
-            status_code=httpx.codes.OK,
-            text="""{"error": null, "result": [3, 2, 1], "id": null}""",
-        )
-    )
+    respx_mock.post().respond(text="""{"error": null, "result": [3, 2, 1], "id": null}""")
 
     def get_last_request_params() -> str:
         (param,) = json.loads(respx_mock.calls.last.request.content)["params"]
@@ -38,12 +32,7 @@ def get_last_request_params() -> str:
 
 
 def test_get_ticket_attachments(api_client: ApiClient, respx_mock: respx.mock):
-    respx_mock.post().mock(
-        return_value=httpx.Response(
-            status_code=httpx.codes.OK,
-            text=get_fixture("trac-get-ticket-attachments-response.json"),
-        )
-    )
+    respx_mock.post().respond(text=get_fixture("trac-get-ticket-attachments-response.json"))
 
     (attachment,) = api_client.get_ticket_attachments(1)
     assert respx_mock.calls.last.request.content == b'{"id":null,"method":"ticket.listAttachments","params":[1]}'
@@ -58,12 +47,7 @@ def test_get_ticket_attachments(api_client: ApiClient, respx_mock: respx.mock):
 
 
 def test_get_ticket_changelog(api_client: ApiClient, respx_mock: respx.mock):
-    respx_mock.post().mock(
-        return_value=httpx.Response(
-            status_code=httpx.codes.OK,
-            text=get_fixture("trac-get-ticket-changelog-response.json"),
-        )
-    )
+    respx_mock.post().respond(text=get_fixture("trac-get-ticket-changelog-response.json"))
 
     changelog = api_client.get_ticket_changelog(1)
     assert respx_mock.calls.last.request.content == b'{"id":null,"method":"ticket.changeLog","params":[1]}'
@@ -113,12 +97,7 @@ def test_get_ticket_changelog(api_client: ApiClient, respx_mock: respx.mock):
 
 
 def test_get_ticket(api_client: ApiClient, respx_mock: respx.mock):
-    respx_mock.post().mock(
-        return_value=httpx.Response(
-            status_code=httpx.codes.OK,
-            text=get_fixture("trac-get-ticket-response.json"),
-        )
-    )
+    respx_mock.post().respond(text=get_fixture("trac-get-ticket-response.json"))
 
     assert api_client.get_ticket(1) == TracTicketProperties(
         id=1,
@@ -145,12 +124,7 @@ def test_get_ticket(api_client: ApiClient, respx_mock: respx.mock):
 
 
 def test_get_ticket_last_field_change(api_client: ApiClient, respx_mock: respx.mock):
-    respx_mock.post().mock(
-        return_value=httpx.Response(
-            status_code=httpx.codes.OK,
-            text=get_fixture("trac-get-ticket-changelog-response.json"),
-        )
-    )
+    respx_mock.post().respond(text=get_fixture("trac-get-ticket-changelog-response.json"))
 
     last_comment = api_client.get_ticket_last_field_change(1, "comment")
     assert last_comment == TracTicketChangelogEntry(

tests/test_models.py

@@ -1,4 +1,3 @@
-import httpx
 import respx
 
 from trac_rpc.client import ApiClient
@@ -9,12 +8,7 @@
 
 
 def test_custom_string_type(api_client: ApiClient, respx_mock: respx.mock):
-    respx_mock.post().mock(
-        return_value=httpx.Response(
-            status_code=httpx.codes.OK,
-            text=get_fixture("trac-get-milestone-response.json"),
-        )
-    )
+    respx_mock.post().respond(text=get_fixture("trac-get-milestone-response.json"))
 
     milestone = api_client.get_milestone(" milestone2  ", TracMilestone[TracStrippedStr])
     assert milestone.name == "milestone2"