undid regressions from code merge with diego

This commit is contained in:
Sam
2021-02-04 13:19:43 +00:00
parent b11a5afa8b
commit 65c571a887
9 changed files with 44 additions and 33 deletions

View File

@@ -39,7 +39,7 @@ class CustomUserViewSetTest(APITestCase):
# anon user
def test_anon_user_can_create_active_instance(self):
"""Not logged-in user can create new instance of User, and it's active
"""Not logged-in user can create new instance of User but it's inactive
"""
data = {
'email': 'test@email.com',
@@ -428,9 +428,7 @@ class LoadCoopManagerTestCase(APITestCase):
# create admin user
self.admin_email = f"admin_user@mail.com"
self.password = ''.join(random.choices(string.ascii_uppercase, k = 10))
self.admin_user = self.user_factory(email=self.admin_email, is_staff=True, is_active=True)
self.admin_user.set_password(self.password)
self.admin_user.save()
self.admin_user = self.user_factory(email=self.admin_email, password=self.password, is_staff=True, is_active=True)
# create regular user
self.reg_email = f"user@mail.com"
self.user = self.user_factory(email=self.reg_email, is_active=True)