Merge pull request #113 from jproffitt/issue_112

Prevent Historian group being added when creating superuser fixes #112

fabric_bolt/accounts/managers.py

@@ -7,6 +7,8 @@ def create_user(self, email, password=None, **kwargs):
         user = super(DeployUserManager, self).create_user(email, password, **kwargs)
 
         try:
+            # make sure there are no groups defined already.
+            user.groups.clear()
             # just set as lowest level since we're not sure what you want.
             user.groups.add(Group.objects.get(name='Historian'))
         except Group.DoesNotExist:
@@ -19,6 +21,8 @@ def create_superuser(self, **kwargs):
         user = super(DeployUserManager, self).create_superuser(**kwargs)
 
         try:
+            # make sure there are no groups defined already.
+            user.groups.clear()
             # Grab the admin group and assign it.
             user.groups.add(Group.objects.get(name='Admin'))
         except Group.DoesNotExist:

fabric_bolt/accounts/tests.py

@@ -100,7 +100,11 @@ def test_user_gravatar(self):
     def test_createsuperuser(self):
         user = DeployUser.objects.create_superuser(email='test@test.com', password='password')
         self.assertTrue(user.user_is_admin())
+        self.assertFalse(user.user_is_deployer())
+        self.assertFalse(user.user_is_historian())
 
     def test_createuser(self):
         user = DeployUser.objects.create_user(email='test@test.com', password='password')
         self.assertTrue(user.user_is_historian())
+        self.assertFalse(user.user_is_deployer())
+        self.assertFalse(user.user_is_admin())