#414: forums.tests

misago/forums/tests/test_forums_views.py

@@ -1,34 +1,34 @@
 from django.core.urlresolvers import reverse
 
 from misago.acl.testutils import override_acl
-from misago.admin.testutils import AdminTestCase
+from misago.users.testutils import AuthenticatedUserTestCase
 
 from misago.forums.lists import get_forums_list
 from misago.forums.models import Forum
 
 
-class ForumViewsTests(AdminTestCase):
+class ForumViewsTests(AuthenticatedUserTestCase):
     def test_index(self):
         """index contains forums list"""
         response = self.client.get(reverse('misago:index'))
 
-        for node in get_forums_list(self.test_admin):
+        for node in get_forums_list(self.user):
             self.assertIn(node.name, response.content)
             if node.level > 1:
                 self.assertIn(node.get_absolute_url(), response.content)
 
     def test_index_no_perms(self):
         """index contains no visible forums"""
-        override_acl(self.test_admin, {'visible_forums': []})
+        override_acl(self.user, {'visible_forums': []})
         response = self.client.get(reverse('misago:index'))
 
-        for node in get_forums_list(self.test_admin):
+        for node in get_forums_list(self.user):
             self.assertNotIn(node.name, response.content)
             if node.level > 1:
                 self.assertNotIn(node.get_absolute_url(), response.content)
 
 
-class CategoryViewsTests(AdminTestCase):
+class CategoryViewsTests(AuthenticatedUserTestCase):
     def setUp(self):
         super(CategoryViewsTests, self).setUp()
         categories_qs = Forum.objects.all_forums().filter(role='category')
@@ -41,14 +41,14 @@ class CategoryViewsTests(AdminTestCase):
 
     def test_cant_see_category(self):
         """can't see category"""
-        override_acl(self.test_admin, {'visible_forums': []})
+        override_acl(self.user, {'visible_forums': []})
 
         response = self.client.get(self.category.get_absolute_url())
         self.assertEqual(response.status_code, 404)
 
     def test_cant_browse_category(self):
         """can't see category"""
-        override_acl(self.test_admin, {
+        override_acl(self.user, {
             'visible_forums': [self.category.parent_id, self.category.pk],
             'forums': {
                 self.category.parent_id: {'can_see': 1, 'can_browse': 1},
@@ -61,7 +61,7 @@ class CategoryViewsTests(AdminTestCase):
 
     def test_can_browse_category(self):
         """can see category contents"""
-        override_acl(self.test_admin, {
+        override_acl(self.user, {
             'visible_forums': [self.category.parent_id, self.category.pk],
             'forums': {
                 self.category.parent_id: {'can_see': 1, 'can_browse': 1},
@@ -73,14 +73,14 @@ class CategoryViewsTests(AdminTestCase):
         self.assertEqual(response.status_code, 200)
 
 
-class RedirectViewsTests(AdminTestCase):
+class RedirectViewsTests(AuthenticatedUserTestCase):
     def setUp(self):
         super(RedirectViewsTests, self).setUp()
         redirects_qs = Forum.objects.all_forums().filter(role='redirect')
         self.redirect = redirects_qs[:1][0]
 
     def allow_redirect_follow(self):
-        override_acl(self.test_admin, {
+        override_acl(self.user, {
             'visible_forums': [self.redirect.parent_id, self.redirect.pk],
             'forums': {
                 self.redirect.parent_id: {'can_see': 1, 'can_browse': 1},
@@ -90,7 +90,7 @@ class RedirectViewsTests(AdminTestCase):
 
     def test_cant_see_redirect(self):
         """can't see redirect"""
-        override_acl(self.test_admin, {'visible_forums': []})
+        override_acl(self.user, {'visible_forums': []})
 
         response = self.client.get(self.redirect.get_absolute_url())
         self.assertEqual(response.status_code, 404)

misago/forums/tests/test_lists.py

@@ -1,36 +1,32 @@
-from django.test import TestCase
-
 from misago.acl.testutils import override_acl
-from misago.admin.testutils import AdminTestCase
+from misago.users.testutils import AuthenticatedUserTestCase
 
 from misago.forums.lists import get_forums_list, get_forum_path
 from misago.forums.models import Forum
 
 
-class GetForumListTests(AdminTestCase):
+class ForumsListsTests(AuthenticatedUserTestCase):
     def setUp(self):
-        super(GetForumListTests, self).setUp()
+        super(ForumsListsTests, self).setUp()
 
         forums_acl = {'forums': {}, 'visible_forums': []}
         for forum in Forum.objects.all_forums():
             forums_acl['visible_forums'].append(forum.pk)
             forums_acl['forums'][forum.pk] = {'can_see': 1, 'can_browse': 1}
-        override_acl(self.test_admin, forums_acl)
+        override_acl(self.user, forums_acl)
 
     def test_root_forums_list_no_parent(self):
         """get_forums_list returns all children of root nodes"""
-        self.assertEqual(len(get_forums_list(self.test_admin)), 3)
+        self.assertEqual(len(get_forums_list(self.user)), 3)
 
     def test_root_forums_list_with_parents(self):
         """get_forums_list returns all children of given node"""
-        for i, node in enumerate(get_forums_list(self.test_admin)):
-            child_nodes = len(get_forums_list(self.test_admin, node))
+        for i, node in enumerate(get_forums_list(self.user)):
+            child_nodes = len(get_forums_list(self.user, node))
             self.assertEqual(child_nodes, len(node.get_descendants()))
 
-
-class GetForumPathTests(TestCase):
-    def get_forum_path(self):
+    def test_get_forum_path(self):
         """get_forums_list returns all children of root nodes"""
-        for node in get_forums_list(self.test_admin):
-            parent_nodes = len(get_forum_path(self.test_admin, node))
-            self.assertEqual(parent_nodes, node.level - 1)
+        for node in get_forums_list(self.user):
+            parent_nodes = len(get_forum_path(node))
+            self.assertEqual(parent_nodes, node.level)