Skip to content

Commit 36c07c6

Browse files
committed
Fix tests
1 parent 51f9c85 commit 36c07c6

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

djangocms_rest/serializers/plugins.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def to_representation(self, instance: CMSPlugin):
133133
if field.is_cached(instance)
134134
else None,
135135
)
136-
elif isinstance(field, JSON_FIELDS):
136+
elif isinstance(field, JSON_FIELDS) and ret.get(field.name):
137137
# If the field is a subclass of JSONField, serialize its value directly
138138
ret[field.name] = serialize_soft_refs(request, ret[field.name])
139139
return ret

tests/endpoints/test_placeholders.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,4 +221,7 @@ def test_serialize_page_fk(self):
221221
rendered_plugin = response.json()["content"][-1]
222222
self.assertIn("page", rendered_plugin)
223223
self.assertIsInstance(rendered_plugin["page"], str)
224-
self.assertEqual(rendered_plugin["page"], self.page.get_api_endpoint("en"))
224+
self.assertEqual(
225+
rendered_plugin["page"],
226+
f'http://testserver{self.page.get_api_endpoint("en")}',
227+
)

tests/test_edit_endpoint.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,13 @@ def test_edit_endpoint(self):
153153
# Test link plugin resolves link to page API endpoint
154154
self.assertContains(
155155
response,
156-
'<span class="key">"page"</span>: <span class="str">"/api/en/pages-root/"</span>',
156+
'<span class="key">"page"</span>: <span class="str">"http://testserver/api/en/pages-root/"</span>',
157157
)
158158

159159
# Test image plugin resolves image URL
160160
self.assertContains(
161161
response,
162-
f'"filer_image"</span>: <span class="str">"<span class="ellipsis">{self.image_plugin.filer_image.url}</span>"</span>',
162+
f'"filer_image"</span>: <span class="str">"<span class="ellipsis">http://testserver{self.image_plugin.filer_image.url}</span>"</span>',
163163
)
164164

165165
# Test for rendering of numbers

0 commit comments

Comments
 (0)