wip fixing existing tests

gip-inclusion · Jun 29, 2023 · 5da6a3b · 5da6a3b
1 parent ecccdc9
commit 5da6a3b
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 297 deletions.
diff --git a/lacommunaute/forum/tests/test_CategoryForumListView.py b/lacommunaute/forum/tests/test_CategoryForumListView.py
@@ -1,12 +1,13 @@
 import pytest  # noqa
 from django.urls import reverse
 
+from lacommunaute.forum.enums import Kind as ForumKind
 from lacommunaute.forum.factories import ForumFactory
 from lacommunaute.forum.models import Forum
 
 
 def test_context(client, db):
-    url = reverse("forum_extension:categories")
+    url = reverse("forum_extension:documentation")
     response = client.get(url)
     assert response.status_code == 200
     assert "forum/category_forum_list.html" == response.templates[0].name
@@ -17,11 +18,11 @@ def test_queryset(client, db):
     forum = ForumFactory(type=Forum.FORUM_CAT)
     unvisible_forums = (
         ForumFactory(type=Forum.FORUM_CAT, parent=forum),
-        ForumFactory(type=Forum.FORUM_CAT, is_private=True),
+        ForumFactory(type=Forum.FORUM_CAT, kind=ForumKind.PRIVATE_FORUM),
         ForumFactory(),
         ForumFactory(type=Forum.FORUM_LINK),
     )
-    url = reverse("forum_extension:categories")
+    url = reverse("forum_extension:documentation")
     response = client.get(url)
     assert response.status_code == 200
     assert forum in response.context_data["forums"]

diff --git a/lacommunaute/forum/tests/tests_views.py b/lacommunaute/forum/tests/tests_views.py
@@ -254,7 +254,7 @@ def test_cannot_submit_post(self):
     def test_queries(self):
         TopicFactory.create_batch(20, with_post=True)
         self.client.force_login(self.user)
-        with self.assertNumQueries(33):
+        with self.assertNumQueries(27):
             self.client.get(self.url)
 
     def test_certified_post_display(self):

diff --git a/lacommunaute/forum/views.py b/lacommunaute/forum/views.py
@@ -9,6 +9,7 @@
 from machina.apps.forum.views import ForumView as BaseForumView
 from machina.core.loading import get_class
 
+from lacommunaute.forum.enums import Kind as ForumKind
 from lacommunaute.forum.models import Forum
 from lacommunaute.forum_conversation.forms import PostForm
 from lacommunaute.forum_conversation.models import Topic
@@ -63,4 +64,4 @@ class CategoryForumListView(ListView):
     context_object_name = "forums"
 
     def get_queryset(self) -> QuerySet[Any]:
-        return Forum.objects.filter(type=Forum.FORUM_CAT, level=0)
+        return Forum.objects.filter(type=Forum.FORUM_CAT, kind=ForumKind.PUBLIC_FORUM, level=0)
diff --git a/lacommunaute/forum_conversation/models.py b/lacommunaute/forum_conversation/models.py
@@ -12,7 +12,12 @@
 
 class TopicQuerySet(models.QuerySet):
     def unanswered(self):
-        return self.exclude(approved=False).exclude(status=Topic.TOPIC_LOCKED).filter(posts_count=1)
+        return (
+            self.exclude(approved=False)
+            .exclude(status=Topic.TOPIC_LOCKED)
+            .exclude(type=Topic.TOPIC_ANNOUNCE)
+            .filter(posts_count=1)
+        )
 
     def optimized_for_topics_list(self, user_id):
         return (

diff --git a/lacommunaute/forum_conversation/tests/tests_models.py b/lacommunaute/forum_conversation/tests/tests_models.py
@@ -36,8 +36,7 @@ def test_unanswered(self):
         TopicFactory(forum=forum, posts_count=1, type=Topic.TOPIC_ANNOUNCE)
         TopicFactory(forum=forum, posts_count=1, approved=False)
 
-        self.assertEqual(Topic.objects.unanswered().count(), 1)
-        self.assertIn(topic, Topic.objects.unanswered())
+        self.assertEqual(Topic.objects.unanswered().get(), topic)
 
     def test_optimized_for_topics_list_disapproved(self):
         TopicFactory(approved=False)
@@ -125,4 +124,3 @@ def test_topic_types(self):
         self.assertEqual(0, Topic.TOPIC_POST)
         self.assertEqual(1, Topic.TOPIC_STICKY)
         self.assertEqual(2, Topic.TOPIC_ANNOUNCE)
-        self.assertEqual(3, Topic.TOPIC_NEWS)