change user_name still used as login and add display_name for dashboard view instead of username on login
This commit is contained in:
1 parent
7a562c18ec
commit
11b0ca26a5
33 files changed
+180
-145
No files matched your search
@@ -23,9 +23,9 @@ def _gm_visible_site(*, owner: User, site_name: str, code: str) -> Site:
|
||||
|
||||
class FarmAPITests(TestCase):
|
||||
def setUp(self):
|
||||
self.user = User.objects.create_user(user_login="tester", password="secret")
|
||||
self.user = User.objects.create_user(user_name="tester", password="secret")
|
||||
self.admin = User.objects.create_user(
|
||||
user_login="admin",
|
||||
user_name="admin",
|
||||
password="secret",
|
||||
status=User.STATUS_DIRECTOR_ADMIN,
|
||||
)
|
||||
@@ -124,7 +124,7 @@ class FarmAPITests(TestCase):
|
||||
self.assertEqual(cycle.status, Cycle.STATUS_ACTIVE)
|
||||
|
||||
def test_gm_can_approve_cycle_close(self):
|
||||
gm = User.objects.create_user(user_login="gm_approver", password="x", status=User.STATUS_GM)
|
||||
gm = User.objects.create_user(user_name="gm_approver", password="x", status=User.STATUS_GM)
|
||||
site = _gm_visible_site(owner=gm, site_name="GM Site", code="gm-approve")
|
||||
kandang = Kandang.objects.create(kandang_name="Kandang GM", site=site)
|
||||
self.client.force_authenticate(gm)
|
||||
@@ -154,7 +154,7 @@ class FarmAPITests(TestCase):
|
||||
self.assertEqual(cycle.end_date, proposed)
|
||||
|
||||
def test_gm_can_reject_cycle_close(self):
|
||||
gm = User.objects.create_user(user_login="gm_rejector", password="x", status=User.STATUS_GM)
|
||||
gm = User.objects.create_user(user_name="gm_rejector", password="x", status=User.STATUS_GM)
|
||||
site = _gm_visible_site(owner=gm, site_name="GM Reject Site", code="gm-reject")
|
||||
kandang = Kandang.objects.create(kandang_name="Kandang R", site=site)
|
||||
self.client.force_authenticate(gm)
|
||||
@@ -181,7 +181,7 @@ class FarmAPITests(TestCase):
|
||||
|
||||
def test_gm_admin_cannot_approve_cycle_close(self):
|
||||
gm_admin = User.objects.create_user(
|
||||
user_login="gm_admin_user", password="x", status=User.STATUS_GM_ADMIN
|
||||
user_name="gm_admin_user", password="x", status=User.STATUS_GM_ADMIN
|
||||
)
|
||||
site = _gm_visible_site(
|
||||
owner=gm_admin, site_name="GM Admin Site", code="gm-admin-site"
|
||||
|
||||
Reference in new issue
Block a user