ungleich-public/djangocms_blog
6
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Filter out duplicated categories due to parler joins

Browse source
This commit is contained in:
Iacopo Spalletti 2017-06-11 12:35:47 +02:00
commit 88e7ab6490
No known key found for this signature in database
GPG key ID: BDCBC2EB289F60C6
2 changed files with 33 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tests/test_menu.py
View file

@ -6,6 +6,7 @@ from django.utils.translation import activate
from menus.menu_pool import menu_pool
from parler.utils.context import smart_override, switch_language
from djangocms_blog.models import BlogCategory
from djangocms_blog.settings import (
MENU_TYPE_CATEGORIES, MENU_TYPE_COMPLETE, MENU_TYPE_NONE, MENU_TYPE_POSTS,
)
@ -46,9 +47,10 @@ class MenuTest(BaseTest):
for lang in ('en', 'it'):
with smart_override(lang):
self._reset_menus()
request = self.get_page_request(pages[1], self.user, pages[1].get_absolute_url(lang))
request = self.get_page_request(pages[1], self.user, pages[1].get_absolute_url(lang), edit=True)
nodes = menu_pool.get_nodes(request)
nodes_url = set([node.url for node in nodes])
self.assertTrue(len(nodes), BlogCategory.objects.all().count() + len(pages))
nodes_url = set([node.get_absolute_url() for node in nodes])
cats_url = set([cat.get_absolute_url() for cat in self.cats if cat.has_translation(lang)])
self.assertTrue(cats_url.issubset(nodes_url))
@ -57,9 +59,11 @@ class MenuTest(BaseTest):
for lang in ('en', 'it'):
with smart_override(lang):
self._reset_menus()
request = self.get_page_request(pages[1], self.user, pages[1].get_absolute_url(lang))
request = self.get_page_request(pages[1].get_draft_object(), self.user, pages[1].get_draft_object().get_absolute_url(lang))
nodes = menu_pool.get_nodes(request)
nodes_url = set([node.url for node in nodes])
urls = [node.get_absolute_url() for node in nodes]
nodes_url = [node.get_absolute_url() for node in nodes]
self.assertTrue(len(nodes_url), BlogCategory.objects.all().count() + len(pages))
self.assertFalse(posts[0].get_absolute_url(lang) in nodes_url)
self.assertTrue(posts[1].get_absolute_url(lang) in nodes_url)
@ -90,7 +94,7 @@ class MenuTest(BaseTest):
with smart_override(lang):
self._reset_menus()
nodes = menu_pool.get_nodes(request)
nodes_url = set([node.url for node in nodes])
nodes_url = set([node.get_absolute_url() for node in nodes])
self.assertFalse(cats_url[lang].issubset(nodes_url))
self.assertFalse(posts_url[lang].issubset(nodes_url))
@ -103,7 +107,7 @@ class MenuTest(BaseTest):
with smart_override(lang):
self._reset_menus()
nodes = menu_pool.get_nodes(request)
nodes_url = set([node.url for node in nodes])
nodes_url = set([node.get_absolute_url() for node in nodes])
self.assertFalse(cats_url[lang].issubset(nodes_url))
self.assertTrue(posts_url[lang].issubset(nodes_url))
@ -116,7 +120,7 @@ class MenuTest(BaseTest):
with smart_override(lang):
self._reset_menus()
nodes = menu_pool.get_nodes(request)
nodes_url = set([node.url for node in nodes])
nodes_url = set([node.get_absolute_url() for node in nodes])
self.assertTrue(cats_url[lang].issubset(nodes_url))
self.assertFalse(posts_url[lang].issubset(nodes_url))
@ -129,7 +133,7 @@ class MenuTest(BaseTest):
with smart_override(lang):
self._reset_menus()
nodes = menu_pool.get_nodes(request)
nodes_url = set([node.url for node in nodes])
nodes_url = set([node.get_absolute_url() for node in nodes])
self.assertTrue(cats_url[lang].issubset(nodes_url))
self.assertTrue(posts_url[lang].issubset(nodes_url))