From 6240eff1603f318126a81aa538cda4dbdc5c6e02 Mon Sep 17 00:00:00 2001 From: Sli Date: Wed, 10 Jul 2024 10:17:08 +0200 Subject: [PATCH] Apply review suggestions --- forum/models.py | 2 +- forum/tests.py | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/forum/models.py b/forum/models.py index fef7704a..7b29bd18 100644 --- a/forum/models.py +++ b/forum/models.py @@ -390,7 +390,7 @@ class ForumMessage(models.Model): ) def is_deleted(self): - if self.id is None: + if self._state.adding: return False meta = self.metas.exclude(action="EDIT").order_by("-date").first() if meta: diff --git a/forum/tests.py b/forum/tests.py index 564e28c2..2c6b2bed 100644 --- a/forum/tests.py +++ b/forum/tests.py @@ -16,9 +16,10 @@ import pytest from django.test import Client from django.urls import reverse +from pytest_django.asserts import assertRedirects from core.models import User -from forum.models import Forum, ForumTopic +from forum.models import Forum, ForumMessage, ForumTopic @pytest.mark.django_db @@ -33,7 +34,13 @@ class TestTopicCreation: } assert not ForumTopic.objects.filter(_title=payload["title"]).first() response = client.post(reverse("forum:new_topic", args=str(forum.id)), payload) - assert response.status_code == 302 + assertRedirects( + response, + expected_url=reverse( + "forum:view_message", args=str(ForumMessage.objects.all().count()) + ), # Get the last created message id + target_status_code=302, + ) topic = ForumTopic.objects.filter(_title=payload["title"]).first() assert topic assert topic.last_message.message == payload["message"]