Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions inertia/tests/test_encoder.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from datetime import date, datetime
from json import dumps

Expand All @@ -7,17 +7,21 @@
from inertia.utils import InertiaJsonEncoder


def make_brandon() -> User:
return User(
name="Brandon",
password="something-top-secret",
birthdate=date(1987, 2, 15),
registered_at=datetime(2022, 10, 31, 10, 13, 1),
)


class InertiaJsonEncoderTestCase(TestCase):
def setUp(self):
self.encode = lambda obj: dumps(obj, cls=InertiaJsonEncoder)

def test_it_handles_models_with_dates_and_removes_passwords(self):
user = User(
name="Brandon",
password="something-top-secret",
birthdate=date(1987, 2, 15),
registered_at=datetime(2022, 10, 31, 10, 13, 1),
)
user = make_brandon()

self.assertEqual(
dumps(
Expand Down Expand Up @@ -51,12 +55,7 @@
)

def test_it_handles_querysets(self):
User(
name="Brandon",
password="something-top-secret",
birthdate=date(1987, 2, 15),
registered_at=datetime(2022, 10, 31, 10, 13, 1),
).save()
make_brandon().save()

self.assertEqual(
dumps(
Expand All @@ -71,3 +70,12 @@
),
self.encode(User.objects.all()),
)


def test_it_handles_non_model_querysets(self):
user = make_brandon()
user.save()
self.assertEqual(
self.encode(User.objects.values_list("name", flat=True)),
self.encode([user.name]),
)
5 changes: 4 additions & 1 deletion inertia/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ def default(self, value):
return model_to_dict(value)

if isinstance(value, QuerySet):
return [model_to_dict(model) for model in value]
return [
(model_to_dict(obj) if isinstance(value.model, models.Model) else obj)
for obj in value
]

return super().default(value)

Expand Down
Loading