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

Merge branch 'release/0.8.x' into develop

Browse source
This commit is contained in:
Iacopo Spalletti 2016-09-12 23:10:22 +02:00
commit 52cd80b129
No known key found for this signature in database
GPG key ID: BDCBC2EB289F60C6
7 changed files with 70 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/test_models.py
View file

@ -445,7 +445,7 @@ class AdminTest(BaseTest):
self.assertEquals(post.sites.count(), 1)
self.user.sites.clear()
post.sites.clear()
post = self.reload_model(post)
self.reload_model(post)
def test_admin_clear_menu(self):
"""
@ -457,6 +457,7 @@ class AdminTest(BaseTest):
request = self.get_page_request(None, self.user, r'/en/page-two/')
first_nodes = menu_pool.get_nodes(request)
self._reset_menus()
with pause_knocks(post):
with self.login_user_context(self.user):
data = dict(namespace='sample_app', app_title='app1', object_name='Blog')
@ -467,7 +468,7 @@ class AdminTest(BaseTest):
msg_mid = MessageMiddleware()
msg_mid.process_request(request)
config_admin = admin.site._registry[BlogConfig]
response = config_admin.change_view(request, str(self.app_config_1.pk))
config_admin.change_view(request, str(self.app_config_1.pk))
second_nodes = menu_pool.get_nodes(request)
self.assertNotEqual(len(first_nodes), len(second_nodes))