Merge branch 'release/0.8.x' into develop

This commit is contained in:
Iacopo Spalletti 2016-08-25 22:28:20 +02:00
commit 0ada77d2e7
No known key found for this signature in database
GPG key ID: BDCBC2EB289F60C6
9 changed files with 85 additions and 17 deletions

View file

@ -854,7 +854,7 @@ class ModelsTest2(BaseTest):
'path', 'depth', 'position'
))
copy_plugins_to(plugins, post2.content)
new = downcast_plugins(post2.content.cmsplugin_set.all())
new = list(downcast_plugins(post2.content.cmsplugin_set.all()))
self.assertEqual(set(new[0].tags.all()), set([tag1, tag2]))
self.assertEqual(set(new[0].tags.all()), set(plugin.tags.all()))
@ -895,7 +895,7 @@ class ModelsTest2(BaseTest):
'path', 'depth', 'position'
))
copy_plugins_to(plugins, post2.content)
new = downcast_plugins(post2.content.cmsplugin_set.all())
new = list(downcast_plugins(post2.content.cmsplugin_set.all()))
self.assertEqual(set(new[0].authors.all()), set([self.user]))
def test_multisite(self):