Skip to content

Commit 2732bfe

Browse files
committed
Added assertions to enfore_history_permissions tests
Also corrected the overridden value of the `SIMPLE_HISTORY_REVERT_DISABLED` for `test_history_view__enforce_history_permissions_and_revert_enabled()`, to match with the name of the method.
1 parent 134afe9 commit 2732bfe

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

simple_history/tests/tests/test_admin.py

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ def test_history_view__no_perms_enforce_history_permissions(self):
851851
self.assertEqual(resp.status_code, 403)
852852

853853
@override_settings(
854-
SIMPLE_HISTORY_REVERT_DISABLED=False,
854+
SIMPLE_HISTORY_REVERT_DISABLED=True,
855855
SIMPLE_HISTORY_ENFORCE_HISTORY_MODEL_PERMISSIONS=True,
856856
)
857857
def test_history_view__enforce_history_permissions_and_revert_enabled(self):
@@ -879,7 +879,10 @@ def get_request(usr):
879879

880880
# no perms
881881
request = get_request(user)
882+
self.assertFalse(admin.has_view_permission(request))
883+
self.assertFalse(admin.has_change_permission(request))
882884
self.assertFalse(admin.has_view_history_permission(request))
885+
self.assertFalse(admin.has_change_history_permission(request))
883886

884887
# has concrete view/change only -> view_historical is false
885888
user.user_permissions.clear()
@@ -888,7 +891,10 @@ def get_request(usr):
888891
Permission.objects.get(codename="change_planet"),
889892
)
890893
request = get_request(user)
894+
self.assertTrue(admin.has_view_permission(request))
895+
self.assertTrue(admin.has_change_permission(request))
891896
self.assertEqual(admin.has_view_history_permission(request), not enforced)
897+
self.assertEqual(admin.has_change_history_permission(request), not enforced)
892898

893899
# has concrete view/change and historical change -> view_history is false
894900
user.user_permissions.clear()
@@ -898,7 +904,10 @@ def get_request(usr):
898904
Permission.objects.get(codename="change_historicalplanet"),
899905
)
900906
request = get_request(user)
907+
self.assertTrue(admin.has_view_permission(request))
908+
self.assertTrue(admin.has_change_permission(request))
901909
self.assertEqual(admin.has_view_history_permission(request), not enforced)
910+
self.assertTrue(admin.has_change_history_permission(request))
902911

903912
# has concrete view/change and historical view/change -> view_history is true
904913
user.user_permissions.clear()
@@ -909,15 +918,21 @@ def get_request(usr):
909918
Permission.objects.get(codename="change_historicalplanet"),
910919
)
911920
request = get_request(user)
921+
self.assertTrue(admin.has_view_permission(request))
922+
self.assertTrue(admin.has_change_permission(request))
912923
self.assertTrue(admin.has_view_history_permission(request))
924+
self.assertTrue(admin.has_change_history_permission(request))
913925

914926
# has historical view only -> view_history is true
915927
user.user_permissions.clear()
916928
user.user_permissions.add(
917929
Permission.objects.get(codename="view_historicalplanet"),
918930
)
919931
request = get_request(user)
932+
self.assertFalse(admin.has_view_permission(request))
933+
self.assertFalse(admin.has_change_permission(request))
920934
self.assertEqual(admin.has_view_history_permission(request), enforced)
935+
self.assertFalse(admin.has_change_history_permission(request))
921936

922937
@override_settings(SIMPLE_HISTORY_ENFORCE_HISTORY_MODEL_PERMISSIONS=True)
923938
def test_permission_combos__enforce_history_permissions(self):

0 commit comments

Comments
 (0)