diff options
author | Matthew Lemon <lemon@matthewlemon.com> | 2020-06-01 10:44:32 +0100 |
---|---|---|
committer | Matthew Lemon <lemon@matthewlemon.com> | 2020-06-01 10:44:32 +0100 |
commit | 93f5192a2fc8cc5d4977d766367fc2ba69c450b5 (patch) | |
tree | d6ba75b8840b437c664d9667eeb56cc5ab6a0b5c /ctrack/organisations/tests | |
parent | 4f82757fcfa10ad2ce796348d8097b6c4a82b283 (diff) |
tidy after merge
Diffstat (limited to 'ctrack/organisations/tests')
-rw-r--r-- | ctrack/organisations/tests/test_views.py | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/ctrack/organisations/tests/test_views.py b/ctrack/organisations/tests/test_views.py index a77afcc..3b8f938 100644 --- a/ctrack/organisations/tests/test_views.py +++ b/ctrack/organisations/tests/test_views.py @@ -66,13 +66,8 @@ def test_incident_report_create_view(stakeholder_user): assert response.status_code == 200 -<<<<<<< HEAD def test_only_member_of_cct_user_group_can_view_a_single_person( stakeholder_user, org_with_people, client -======= -def test_only_member_of_cct_user_group_can_view_person_list( - stakeholder_user, org_with_people ->>>>>>> b5fedc5817cde8732f47d608c6e8ccd274bb434e ): role = RoleFactory.create() submode = Submode.objects.create( @@ -93,7 +88,6 @@ def test_only_member_of_cct_user_group_can_view_person_list( group = Group.objects.create(name="cct_user") stakeholder_user.groups.add(group) -<<<<<<< HEAD person_list_permission = Permission.objects.get(name="Can view person") group.permissions.add(person_list_permission) @@ -105,13 +99,3 @@ def test_only_member_of_cct_user_group_can_view_person_list( # They get this permisson via the cct_user group assert stakeholder_user.has_perm("organisations.view_person") assert response.status_code == 200 -======= - person_list_permission = Permission.objects.get(name="Can view person") - group.permissions.add(person_list_permission) - - factory = RequestFactory() - request = factory.get(f"people/") - - # They get this permisson via the cct_user group - assert stakeholder_user.has_perm("organisations.view_person") ->>>>>>> b5fedc5817cde8732f47d608c6e8ccd274bb434e |