Skip to content

Commit 9fcb4a4

Browse files
committed
Revert "Update test assertions to be less brittle"
This reverts commit 5df2748.
1 parent 5df2748 commit 9fcb4a4

1 file changed

Lines changed: 30 additions & 21 deletions

File tree

tests/test_image_chooser_views.py

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,18 @@ def test_creates_image_if_asset_id_not_recognised(self):
4040
# Assertions
4141
create_object_mock.assert_called_once()
4242
self.assertEqual(response.status_code, 200)
43-
response_json = response.json()
44-
self.assertEqual(response_json["step"], "chosen")
45-
result = response_json["result"]
46-
self.assertEqual(result["id"], str(image.id))
47-
self.assertEqual(result["title"], image.title)
4843
self.assertEqual(
49-
result["edit_url"], reverse("wagtailimages:edit", args=[image.id])
44+
response.json(),
45+
{
46+
"step": "chosen",
47+
"result": {
48+
"id": str(image.id),
49+
"title": image.title,
50+
"preview": mock.ANY,
51+
"edit_url": reverse("wagtailimages:edit", args=[image.id]),
52+
},
53+
},
5054
)
51-
self.assertIn("preview", result)
5255

5356
@mock.patch("wagtail_bynder.views.image.ImageChosenView.update_object")
5457
def test_uses_existing_image_without_updating(self, update_object_mock):
@@ -64,15 +67,18 @@ def test_uses_existing_image_without_updating(self, update_object_mock):
6467

6568
# Check response content
6669
self.assertEqual(response.status_code, 200)
67-
response_json = response.json()
68-
self.assertEqual(response_json["step"], "chosen")
69-
result = response_json["result"]
70-
self.assertEqual(result["id"], str(image.id))
71-
self.assertEqual(result["title"], image.title)
7270
self.assertEqual(
73-
result["edit_url"], reverse("wagtailimages:edit", args=[image.id])
71+
response.json(),
72+
{
73+
"step": "chosen",
74+
"result": {
75+
"id": str(image.id),
76+
"title": image.title,
77+
"preview": mock.ANY,
78+
"edit_url": reverse("wagtailimages:edit", args=[image.id]),
79+
},
80+
},
7481
)
75-
self.assertIn("preview", result)
7682

7783
@override_settings(BYNDER_SYNC_EXISTING_IMAGES_ON_CHOOSE=True)
7884
@mock.patch("wagtail_bynder.views.image.ImageChosenView.update_object")
@@ -88,12 +94,15 @@ def test_uses_existing_image_and_updates_it(self, update_object_mock):
8894

8995
# Check response content
9096
self.assertEqual(response.status_code, 200)
91-
response_json = response.json()
92-
self.assertEqual(response_json["step"], "chosen")
93-
result = response_json["result"]
94-
self.assertEqual(result["id"], str(image.id))
95-
self.assertEqual(result["title"], image.title)
9697
self.assertEqual(
97-
result["edit_url"], reverse("wagtailimages:edit", args=[image.id])
98+
response.json(),
99+
{
100+
"step": "chosen",
101+
"result": {
102+
"id": str(image.id),
103+
"title": image.title,
104+
"preview": mock.ANY,
105+
"edit_url": reverse("wagtailimages:edit", args=[image.id]),
106+
},
107+
},
98108
)
99-
self.assertIn("preview", result)

0 commit comments

Comments
 (0)