Skip to content

Commit 544c07e

Browse files
hinashihinashi
authored
Merge pull request #1114 from syucream/feature/drf-3.15.1
Update DRF
2 parents 48fb156 + dd39d54 commit 544c07e

File tree

7 files changed

+57
-25
lines changed

7 files changed

+57
-25
lines changed

‎.github/workflows/build-core.yml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- "templates/**/*.html"
1111
- ".github/workflows/build-core.yml"
1212
- "tox.ini"
13+
- "poetry.lock"
1314

1415
jobs:
1516
lint:

‎entity/tests/test_api_v2.py

+18-6
Original file line numberDiff line numberDiff line change
@@ -305,15 +305,19 @@ def test_retrieve_entity_with_webhook(self):
305305
def test_retrieve_entity_with_invalid_param(self):
306306
resp = self.client.get("/entity/api/v2/%d/" % 9999)
307307
self.assertEqual(resp.status_code, 404)
308-
self.assertEqual(resp.json(), {"code": "AE-230000", "message": "Not found."})
308+
self.assertEqual(
309+
resp.json(), {"code": "AE-230000", "message": "No Entity matches the given query."}
310+
)
309311

310312
resp = self.client.get("/entity/api/v2/%s/" % "hoge")
311313
self.assertEqual(resp.status_code, 404)
312314

313315
self.entity.delete()
314316
resp = self.client.get("/entity/api/v2/%d/" % self.entity.id)
315317
self.assertEqual(resp.status_code, 404)
316-
self.assertEqual(resp.json(), {"code": "AE-230000", "message": "Not found."})
318+
self.assertEqual(
319+
resp.json(), {"code": "AE-230000", "message": "No Entity matches the given query."}
320+
)
317321

318322
def test_retrieve_entity_without_permission(self):
319323
# permission nothing entity
@@ -1462,15 +1466,19 @@ def test_update_entity_with_invalid_url(self):
14621466
params = {}
14631467
resp = self.client.put("/entity/api/v2/%d/" % 9999, json.dumps(params), "application/json")
14641468
self.assertEqual(resp.status_code, 404)
1465-
self.assertEqual(resp.json(), {"code": "AE-230000", "message": "Not found."})
1469+
self.assertEqual(
1470+
resp.json(), {"code": "AE-230000", "message": "No Entity matches the given query."}
1471+
)
14661472

14671473
self.entity.delete()
14681474
params = {}
14691475
resp = self.client.put(
14701476
"/entity/api/v2/%d/" % self.entity.id, json.dumps(params), "application/json"
14711477
)
14721478
self.assertEqual(resp.status_code, 404)
1473-
self.assertEqual(resp.json(), {"code": "AE-230000", "message": "Not found."})
1479+
self.assertEqual(
1480+
resp.json(), {"code": "AE-230000", "message": "No Entity matches the given query."}
1481+
)
14741482

14751483
def test_update_entity_with_invalid_param(self):
14761484
# name param
@@ -2733,12 +2741,16 @@ def test_delete_entity_with_invalid_param(self):
27332741

27342742
resp = self.client.delete("/entity/api/v2/%d/" % 9999, None, "application/json")
27352743
self.assertEqual(resp.status_code, 404)
2736-
self.assertEqual(resp.json(), {"code": "AE-230000", "message": "Not found."})
2744+
self.assertEqual(
2745+
resp.json(), {"code": "AE-230000", "message": "No Entity matches the given query."}
2746+
)
27372747

27382748
self.entity.delete()
27392749
resp = self.client.delete("/entity/api/v2/%d/" % self.entity.id, None, "application/json")
27402750
self.assertEqual(resp.status_code, 404)
2741-
self.assertEqual(resp.json(), {"code": "AE-230000", "message": "Not found."})
2751+
self.assertEqual(
2752+
resp.json(), {"code": "AE-230000", "message": "No Entity matches the given query."}
2753+
)
27422754

27432755
def test_delete_entity_with_exist_entry(self):
27442756
self.add_entry(self.user, "entry", self.entity)

‎entry/tests/test_api_v2.py

+15-5
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,9 @@ def test_retrieve_entry_with_invalid_param(self):
538538

539539
resp = self.client.get("/entry/api/v2/%s/" % 9999)
540540
self.assertEqual(resp.status_code, 404)
541-
self.assertEqual(resp.json(), {"code": "AE-230000", "message": "Not found."})
541+
self.assertEqual(
542+
resp.json(), {"code": "AE-230000", "message": "No Entry matches the given query."}
543+
)
542544

543545
@mock.patch("custom_view.is_custom", mock.Mock(return_value=True))
544546
@mock.patch("custom_view.call_custom")
@@ -868,7 +870,9 @@ def test_update_entry_with_invalid_param_entry_id(self):
868870
"/entry/api/v2/%s/" % 9999, json.dumps({"name": "entry1"}), "application/json"
869871
)
870872
self.assertEqual(resp.status_code, 404)
871-
self.assertEqual(resp.json(), {"code": "AE-230000", "message": "Not found."})
873+
self.assertEqual(
874+
resp.json(), {"code": "AE-230000", "message": "No Entry matches the given query."}
875+
)
872876

873877
def test_update_entry_with_invalid_param_name(self):
874878
entry: Entry = self.add_entry(self.user, "entry", self.entity)
@@ -1279,7 +1283,9 @@ def test_destory_entry_with_invalid_param(self):
12791283

12801284
resp = self.client.delete("/entry/api/v2/%s/" % 9999, None, "application/json")
12811285
self.assertEqual(resp.status_code, 404)
1282-
self.assertEqual(resp.json(), {"code": "AE-230000", "message": "Not found."})
1286+
self.assertEqual(
1287+
resp.json(), {"code": "AE-230000", "message": "No Entry matches the given query."}
1288+
)
12831289

12841290
@patch("entry.tasks.delete_entry_v2.delay", Mock(side_effect=tasks.delete_entry_v2))
12851291
@mock.patch("custom_view.is_custom", mock.Mock(return_value=True))
@@ -1406,7 +1412,9 @@ def test_restore_entry_with_invalid_param(self):
14061412

14071413
resp = self.client.post("/entry/api/v2/%s/restore/" % 9999, None, "application/json")
14081414
self.assertEqual(resp.status_code, 404)
1409-
self.assertEqual(resp.json(), {"code": "AE-230000", "message": "Not found."})
1415+
self.assertEqual(
1416+
resp.json(), {"code": "AE-230000", "message": "No Entry matches the given query."}
1417+
)
14101418

14111419
entry = self.add_entry(self.user, "entry", self.entity)
14121420
entry.delete()
@@ -1587,7 +1595,9 @@ def test_copy_entry_with_invalid_param(self):
15871595
"/entry/api/v2/%s/copy/" % 9999, json.dumps(params), "application/json"
15881596
)
15891597
self.assertEqual(resp.status_code, 404)
1590-
self.assertEqual(resp.json(), {"code": "AE-230000", "message": "Not found."})
1598+
self.assertEqual(
1599+
resp.json(), {"code": "AE-230000", "message": "No Entry matches the given query."}
1600+
)
15911601

15921602
entry = self.add_entry(self.user, "entry", self.entity)
15931603

‎job/tests/test_api_v2.py

+12-4
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,9 @@ def test_get_job_with_invalid_param(self):
126126
user = self.guest_login()
127127
resp = self.client.get("/job/api/v2/%d/" % 9999)
128128
self.assertEqual(resp.status_code, 404)
129-
self.assertEqual(resp.json(), {"code": "AE-230000", "message": "Not found."})
129+
self.assertEqual(
130+
resp.json(), {"code": "AE-230000", "message": "No Job matches the given query."}
131+
)
130132

131133
resp = self.client.get("/job/api/v2/%s/" % "hoge")
132134
self.assertEqual(resp.status_code, 404)
@@ -139,7 +141,9 @@ def test_get_job_with_invalid_param(self):
139141
self.admin_login()
140142
resp = self.client.get("/job/api/v2/%d/" % job.id)
141143
self.assertEqual(resp.status_code, 404)
142-
self.assertEqual(resp.json(), {"code": "AE-230000", "message": "Not found."})
144+
self.assertEqual(
145+
resp.json(), {"code": "AE-230000", "message": "No Job matches the given query."}
146+
)
143147

144148
def test_cancel_job(self):
145149
user = self.guest_login()
@@ -266,7 +270,9 @@ def test_download_job_with_invalid_param(self):
266270
# send request to download job with invalid job-id
267271
resp = self.client.get("/job/api/v2/%d/download" % 9999)
268272
self.assertEqual(resp.status_code, 404)
269-
self.assertEqual(resp.json(), {"message": "Not found.", "code": "AE-230000"})
273+
self.assertEqual(
274+
resp.json(), {"message": "No Job matches the given query.", "code": "AE-230000"}
275+
)
270276

271277
# Send a request to a job that cannot be downloaded
272278
job = Job.new_create(user, None)
@@ -325,4 +331,6 @@ def test_download_job_with_invalid_param(self):
325331
self.admin_login()
326332
resp = self.client.get("/job/api/v2/%d/download" % job.id)
327333
self.assertEqual(resp.status_code, 404)
328-
self.assertEqual(resp.json(), {"message": "Not found.", "code": "AE-230000"})
334+
self.assertEqual(
335+
resp.json(), {"message": "No Job matches the given query.", "code": "AE-230000"}
336+
)

‎poetry.lock

+7-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ django-replicated = "2.7"
3838
django-simple-history = "3.2.0"
3939
django-storages = "1.13.2"
4040
django = "3.2.25"
41-
djangorestframework = "3.11.2"
41+
djangorestframework = "3.15.1"
4242
drf-spectacular = "0.26.4"
4343
elasticsearch = "7.17.6"
4444
flower = "1.2.0"

‎user/tests/test_api_v2.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ def test_get_user_token_via_apiv2_without_creation(self):
117117

118118
resp = self.client.get("/user/api/v2/token/")
119119
self.assertEqual(resp.status_code, 404)
120-
self.assertEqual(resp.json(), {"message": "Not found.", "code": "AE-230000"})
120+
self.assertEqual(
121+
resp.json(), {"message": "No Token matches the given query.", "code": "AE-230000"}
122+
)
121123

122124
def test_get_user_token_via_apiv2(self):
123125
user = self.guest_login()

0 commit comments

Comments
 (0)