Merge branch 'models' into qwann/html/base2

This commit is contained in:
Qwann 2017-03-05 13:25:42 +01:00
commit b40713be49

View file

@ -91,24 +91,24 @@ class ActivityInheritanceTest(TestCase):
def test_inherites_place(self):
self.template_act.place.add(self.loge)
self.assertEqual(
self.real_act.get_herited('place').get().name,
self.real_act.get_herited('place').get(),
self.loge
)
self.real_act.place.add(self.aqua)
self.assertEqual(
self.real_act.get_herited('place').get().name,
self.real_act.get_herited('place').get(),
self.aqua
)
def test_inherites_tags(self):
self.template_act.tags.add(self.tag_foo)
self.assertEqual(
self.real_act.get_herited('tags').get().name,
self.real_act.get_herited('tags').get(),
self.tag_foo
)
self.real_act.tags.add(self.tag_bar)
self.assertEqual(
self.real_act.get_herited('tags').get().name,
self.real_act.get_herited('tags').get(),
self.tag_bar
)