@@ -1609,6 +1609,29 @@ def test_add_page_no_redirect(self):
1609
1609
self .assertEqual (Page .objects .all ().count (), 2 )
1610
1610
1611
1611
class PermissionsTestCase (PageTestBase ):
1612
+ def assertContainsPermissions (self , response ):
1613
+ try :
1614
+ # Django >= 5.1
1615
+ self .assertContains (
1616
+ response ,
1617
+ '<h2 id="pagepermission_set-2-heading" class="inline-heading">Page permissions</h2>' ,
1618
+ html = True ,
1619
+ )
1620
+ except AssertionError :
1621
+ # Django < 5.1
1622
+ self .assertContains (response , '<h2>Page permissions</h2>' , html = True )
1623
+
1624
+ def assertNotContainsPermissions (self , response ):
1625
+ try :
1626
+ # Django >= 5.1
1627
+ self .assertNotContains (
1628
+ response ,
1629
+ '<h2 id="pagepermission_set-1-heading" class="inline-heading">Page permissions</h2>' ,
1630
+ html = True ,
1631
+ )
1632
+ except AssertionError :
1633
+ # Django < 5.1
1634
+ self .assertNotContains (response , '<h2>Page permissions</h2>' , html = True )
1612
1635
1613
1636
def _add_translation_to_page (self , page ):
1614
1637
translation = create_page_content (
@@ -2186,7 +2209,7 @@ def test_user_can_add_page_permissions(self):
2186
2209
2187
2210
with self .login_user_context (staff_user ):
2188
2211
response = self .client .get (endpoint )
2189
- self .assertContains (response , '<h2>Page permissions</h2>' , html = True )
2212
+ self .assertContainsPermissions (response )
2190
2213
response = self .client .post (endpoint , data )
2191
2214
self .assertEqual (response .status_code , 302 )
2192
2215
self .assertRedirects (response , endpoint )
@@ -2223,7 +224
10000
6,7 @@ def test_user_cant_add_page_permissions(self):
2223
2246
2224
2247
with self .login_user_context (staff_user ):
2225
2248
response = self .client .get (endpoint )
2226
- self .assertNotContains (response , '<h2>Page permissions</h2>' , html = True )
2249
+ self .assertNotContainsPermissions (response )
2227
2250
self .client .post (endpoint , data )
2228
2251
self .assertFalse (self ._page_permission_exists (user = staff_user_2 ))
2229
2252
@@ -2265,7 +2288,7 @@ def test_user_can_edit_page_permissions(self):
2265
2288
2266
2289
with self .login_user_context (staff_user ):
2267
2290
response = self .client .get (endpoint )
2268
- self .assertContains (response , '<h2>Page permissions</h2>' , html = True )
2291
+ self .assertContainsPermissions (response )
2269
2292
response = self .client .post (endpoint , data )
2270
2293
self .assertEqual (response .status_code , 302 )
2271
2294
self .assertRedirects (response , endpoint )
@@ -2315,7 +2338,7 @@ def test_user_cant_edit_page_permissions(self):
2315
2338
2316
2339
with self .login_user_context (staff_user ):
2317
2340
response = self .client .get (endpoint )
2318
- self .assertNotContains (response , '<h2>Page permissions</h2>' , html = True )
2341
+ self .assertNotContainsPermissions (response )
2319
2342
self .client .post (endpoint , data )
2320
2343
self .assertFalse (
2321
2344
self ._page_permission_exists (
@@ -2357,7 +2380,7 @@ def test_user_can_delete_page_permissions(self):
2357
2380
2358
2381
with self .login_user_context (staff_user ):
2359
2382
response = self .client .get (endpoint )
2360
- self .assertContains (response , '<h2>Page permissions</h2>' , html = True )
2383
+ self .assertContainsPermissions (response )
2361
2384
response = self .client .post (endpoint , data )
2362
2385
self .assertEqual (response .status_code , 302 )
2363
2386
self .assertRedirects (response , endpoint )
@@ -2397,7 +2420,7 @@ def test_user_cant_delete_page_permissions(self):
2397
2420
2398
2421
with self .login_user_context (staff_user ):
2399
2422
response = self .client .get (endpoint )
2400
- self .assertNotContains (response , '<h2>Page permissions</h2>' , html = True )
2423
+ self .assertNotContainsPermissions (response )
2401
24
F42D
24
self .client .post (endpoint , data )
2402
2425
self .assertTrue (self ._page_permission_exists (user = staff_user_2 ))
2403
2426
@@ -2431,7 +2454,7 @@ def test_user_can_add_page_view_restrictions(self):
2431
2454
2432
2455
with self .login_user_context (staff_user ):
2433
2456
response = self .client .get (endpoint )
2434
- self .assertContains (response , '<h2>Page permissions</h2>' , html = True )
2457
+ self .assertContainsPermissions (response )
2435
2458
response = self .client .post (endpoint , data )
2436
2459
self .assertEqual (response .status_code , 302 )
2437
2460
self .assertRedirects (response , endpoint )
@@ -2468,7 +2491,7 @@ def test_user_cant_add_page_view_restrictions(self):
2468
2491
2469
2492
with self .login_user_context (staff_user ):
2470
2493
response = self .client .get (endpoint )
2471
- self .assertNotContains (response , '<h2>Page permissions</h2>' , html = True )
2494
+ self .assertNotContainsPermissions (response )
2472
2495
self .client .post (endpoint , data )
2473
2496
self .assertFalse (self ._page_permission_exists (user = staff_user_2 , can_view = True ))
2474
2497
@@ -2509,7 +2532,7 @@ def test_user_can_edit_page_view_restrictions(self):
2509
2532
2510
2533
with self .login_user_context (staff_user ):
2511
2534
response = self .client .get (endpoint )
2512
- self .assertContains (response , '<h2>Page permissions</h2>' , html = True )
2535
+ self .assertContainsPermissions (response )
2513
2536
response = self .client .post (endpoint , data )
2514
2537
self .assertEqual (response .status_code , 302 )
2515
2538
self .assertRedirects (response , endpoint )
@@ -2557,7 +2580,7 @@ def test_user_cant_edit_page_view_restrictions(self):
2557
2580
2558
2581
with self .login_user_context (staff_user ):
2559
2582
response = self .client .get (endpoint )
2560
- self .assertNotContains (response , '<h2>Page permissions</h2>' , html = True )
2583
+ self .assertNotContainsPermissions (response )
2561
2584
self .client .post (endpoint , data )
2562
2585
self .assertFalse (
2563
2586
self ._page_permission_exists (
@@ -2601,7 +2624,7 @@ def test_user_can_delete_page_view_restrictions(self):
2601
2624
2602
2625
with self .login_user_context (staff_user ):
2603
2626
response = self .client .get (endpoint )
2604
- self .assertContains (response , '<h2>Page permissions</h2>' , html = True )
2627
+ self .assertContainsPermissions (response )
2605
2628
response = self .client .post (endpoint , data )
2606
2629
self .assertEqual (response .status_code , 302 )
2607
2630
self .assertRedirects (response , endpoint )
@@ -2643,7 +2666,7 @@ def test_user_cant_delete_page_view_restrictions(self):
2643
2666
2644
2667
with self .login_user_context (staff_user ):
2645
2668
response = self .client .get (endpoint )
2646
- self .assertNotContains (response , '<h2>Page permissions</h2>' , html = True )
2669
+ self .assertNotContainsPermissions (response )
2647
2670
self .client .post (endpoint , data )
2648
2671
self .assertTrue (self ._page_permission_exists (user = staff_user_2 , can_view = True ))
2649
2672
@@ -3630,7 +3653,7 @@ def test_user_can_add_page_permissions(self):
3630
3653
3631
3654
with self .login_user_context (staff_user ):
3632
3655
response = self .client .get (endpoint )
3633
- self .assertContains (response , '<h2>Page permissions</h2>' , html = True )
3656
+ self .assertContainsPermissions (response )
3634
3657
response = self .client .post (endpoint , data )
3635
3658
self .assertEqual (response .status_code , 302 )
3636
3659
self .assertRedirects (response , endpoint )
@@ -3667,7 +3690,7 @@ def test_user_cant_add_page_permissions(self):
3667
3690
3668
3691
with self .login_user_context (staff_user ):
3669
3692
response = self .client .get (endpoint )
3670
- self .assertNotContains (response , '<h2>Page permissions</h2>' , html = True )
3693
+ self .assertNotContainsPermissions (response )
3671
3694
self .client .post (endpoint , data )
3672
3695
self .assertFalse (self ._page_permission_exists (user = staff_user_2 ))
3673
3696
@@ -3709,7 +3732,7 @@ def test_user_can_edit_page_permissions(self):
3709
3732
3710
3733
with self .login_user_context (staff_user ):
3711
3734
response = self .client .get (endpoint )
3712
- self .assertContains (response , '<h2>Page permissions</h2>' , html = True )
3735
+ self .assertContainsPermissions (response )
3713
3736
response = self .client .post (endpoint , data )
3714
3737
self .assertEqual (response .status_code , 302 )
3715
3738
self .assertRedirects (response , endpoint )
@@ -3759,7 +3782,7 @@ def test_user_cant_edit_page_permissions(self):
3759
3782
3760
3783
with self .login_user_context (staff_user ):
3761
3784
response = self .client .get (endpoint )
3762
- self .assertNotContains (response , '<h2>Page permissions</h2>' , html = True )
3785
+ self .assertNotContainsPermissions (response )
3763
3786
self .client .post (endpoint , data )
3764
3787
self .assertFalse (
3765
3788
self ._page_permission_exists (
@@ -3801,7 +3824,7 @@ def test_user_can_delete_page_permissions(self):
3801
3824
3802
3825
with self .login_user_context (staff_user ):
3803
3826
response = self .client .get (endpoint )
3804
- self .assertContains (response , '<h2>Page permissions</h2>' , html = True )
3827
+ self .assertContainsPermissions (response )
3805
3828
response = self .client .post (endpoint , data )
3806
3829
self .assertEqual (response .status_code , 302 )
3807
3830
self .assertRedirects (response , endpoint )
@@ -3841,7 +3864,7 @@ def test_user_cant_delete_page_permissions(self):
3841
3864
3842
3865
with self .login_user_context (staff_user ):
3843
3866
response = self .client .get (endpoint )
3844
- self .assertNotContains (response , '<h2>Page permissions</h2>' , html = True )
3867
+ self .assertNotContainsPermissions (response )
3845
3868
self .client .post (endpoint , data )
3846
3869
self .assertTrue (self ._page_permission_exists (user = staff_user_2 ))
3847
3870
@@ -3875,7 +3898,7 @@ def test_user_can_add_page_view_restrictions(self):
3875
3898
3876
3899
with self .login_user_context (staff_user ):
3877
3900
response = self .client .get (endpoint )
3878
- self .assertContains (response , '<h2>Page permissions</h2>' , html = True )
3901
+ self .assertContainsPermissions (response )
3879
3902
response = self .client .post (endpoint , data )
3880
3903
self .assertEqual (response .status_code , 302 )
3881
3904
self .assertRedirects (response , endpoint )
@@ -3912,7 +3935,7 @@ def test_user_cant_add_page_view_restrictions(self):
3912
3935
3913
3936
with self .login_user_context (staff_user ):
3914
3937
response = self .client .get (endpoint )
3915
- self .assertNotContains (response , '<h2>Page permissions</h2>' , html = True )
3938
+ self .assertNotContainsPermissions (response )
3916
3939
self .client .post (endpoint , data )
3917
3940
self .assertFalse (self ._page_permission_exists (user = staff_user_2 , can_view = True ))
3918
3941
@@ -3953,7 +3976,7 @@ def test_user_can_edit_page_view_restrictions(self):
3953
3976
3954
3977
with self .login_user_context (staff_user ):
3955
3978
response = self .client .get (endpoint )
3956
- self .assertContains (response , '<h2>Page permissions</h2>' , html = True )
3979
+ self .assertContainsPermissions (response )
3957
3980
response = self .client .post (endpoint , data )
3958
3981
self .assertEqual (response .status_code , 302 )
3959
3982
self .assertRedirects (response , endpoint )
@@ -4001,7 +4024,7 @@ def test_user_cant_edit_page_view_restrictions(self):
4001
4024
4002
4025
with self .login_user_context (staff_user ):
4003
4026
response = self .client .get (endpoint )
4004
- self .assertNotContains (response , '<h2>Page permissions</h2>' , html = True )
4027
+ self .assertNotContainsPermissions (response )
4005
4028
self .client .post (endpoint , data )
4006
4029
self .assertFalse (
4007
4030
self ._page_permission_exists (
@@ -4045,7 +4068,7 @@ def test_user_can_delete_page_view_restrictions(self):
4045
4068
4046
4069
with self .login_user_context (staff_user ):
4047
4070
response = self .client .get (endpoint )
4048
- self .assertContains (response , '<h2>Page permissions</h2>' , html = True )
4071
+ self .assertContainsPermissions (response )
4049
4072
response = self .client .post (endpoint , data )
4050
4073
self .assertEqual (response .status_code , 302 )
4051
4074
self .assertRedirects (response , endpoint )
@@ -4087,7 +4110,7 @@ def test_user_cant_delete_page_view_restrictions(self):
4087
4110
4088
4111
with self .login_user_context (staff_user ):
4089
4112
response = self .client .get (endpoint )
4090
- self .assertNotContains (response , '<h2>Page permissions</h2>' , html = True )
4113
+ self .assertNotContainsPermissions (response )
4091
4114
self .client .post (endpoint , data )
4092
4115
self .assertTrue (self ._page_permission_exists (user = staff_user_2 , can_view = True ))
4093
4116
0 commit comments