Django 1.8: simplify ihtaruser management

1 files changed, 17 insertions, 5 deletions

diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py
index 01ff26c5e..d3ac4a4bd 100644
--- a/ishtar_common/tests.py
+++ b/ishtar_common/tests.py
@@ -74,6 +74,8 @@ def create_superuser():
     password = 'dcbqj756456!@%'
     user = User.objects.create_superuser(username, "nomail@nomail.com",
                                          password)
+    user.set_password(password)
+    user.save()
     return username, password, user
 
 
@@ -294,8 +296,15 @@ class AccessControlTest(TestCase):
         user, created = User.objects.get_or_create(username='myusername')
         user.is_superuser = True
         user.save()
-        ishtar_user = models.IshtarUser.objects.get(username=user.username)
+        ishtar_user = models.IshtarUser.objects.get(
+            user_ptr__username='myusername')
         self.assertIn(admin, ishtar_user.person.person_types.all())
+        user = ishtar_user.user_ptr
+        user.is_superuser = False
+        user.save()
+        ishtar_user = models.IshtarUser.objects.get(
+            user_ptr__username='myusername')
+        self.assertNotIn(admin, ishtar_user.person.person_types.all())
 
 
 class AdminGenTypeTest(TestCase):
@@ -318,11 +327,14 @@ class AdminGenTypeTest(TestCase):
     module_name = 'ishtar_common'
 
     def setUp(self):
-        password = 'mypassword'
-        my_admin = User.objects.create_superuser(
-            'myuser', 'myemail@test.com', password)
+        self.password = 'mypassword'
+        self.username = "myuser"
+        user = User.objects.create_superuser(
+            self.username, 'myemail@test.com', self.password)
+        user.set_password(self.password)
+        user.save()
         self.client = Client()
-        self.client.login(username=my_admin.username, password=password)
+        self.client.login(username=self.username, password=self.password)
 
     def test_listing_and_detail(self):
         for model in self.models: