Limit the scope of some of the users

DMOJ · Jun 4, 2020 · b8ab7fb · b8ab7fb
1 parent d603e36
commit b8ab7fb
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 32 deletions.
diff --git a/judge/models/tests/test_blogpost.py b/judge/models/tests/test_blogpost.py
@@ -1,12 +1,25 @@
 from django.test import TestCase
 
-from judge.models.tests.util import CommonDataMixin, create_blogpost
+from judge.models.tests.util import CommonDataMixin, create_blogpost, create_user
 
 
 class BlogPostTestCase(CommonDataMixin, TestCase):
     @classmethod
     def setUpTestData(self):
         super().setUpTestData()
+        self.users.update({
+            'staff_blogpost_edit_own': create_user(
+                username='staff_blogpost_edit_own',
+                is_staff=True,
+                user_permissions=('change_blogpost',),
+            ),
+            'staff_blogpost_edit_all': create_user(
+                username='staff_blogpost_edit_all',
+                is_staff=True,
+                user_permissions=('change_blogpost', 'edit_all_post'),
+            ),
+        })
+
         self.basic_blogpost = create_blogpost(
             title='basic',
             authors=('staff_blogpost_edit_own',),

diff --git a/judge/models/tests/test_contest.py b/judge/models/tests/test_contest.py
@@ -4,13 +4,30 @@
 
 from judge.models import Contest, ContestParticipation, ContestTag
 from judge.models.contest import MinValueOrNoneValidator
-from judge.models.tests.util import CommonDataMixin, create_contest, create_contest_participation
+from judge.models.tests.util import CommonDataMixin, create_contest, create_contest_participation, create_user
 
 
 class ContestTestCase(CommonDataMixin, TestCase):
     @classmethod
     def setUpTestData(self):
         super().setUpTestData()
+        self.users.update({
+            'staff_contest_edit_own': create_user(
+                username='staff_contest_edit_own',
+                is_staff=True,
+                user_permissions=('edit_own_contest',),
+            ),
+            'staff_contest_see_all': create_user(
+                username='staff_contest_see_all',
+                user_permissions=('see_private_contest',),
+            ),
+            'staff_contest_edit_all': create_user(
+                username='staff_contest_edit_all',
+                is_staff=True,
+                user_permissions=('edit_own_contest', 'edit_all_contest'),
+            ),
+        })
+
         _now = timezone.now()
 
         self.basic_contest = create_contest(

diff --git a/judge/models/tests/test_submission.py b/judge/models/tests/test_submission.py
@@ -2,14 +2,22 @@
 
 from judge.models import ContestSubmission, Language, Submission
 from judge.models.tests.util import CommonDataMixin, create_contest, create_contest_participation, \
-    create_contest_problem, create_problem
+    create_contest_problem, create_problem, create_user
 
 
 class SubmissionTestCase(CommonDataMixin, TestCase):
     @classmethod
     def setUpTestData(self):
         super().setUpTestData()
 
+        self.users.update({
+            'staff_submission_view_all': create_user(
+                username='staff_submission_view_all',
+                is_staff=True,
+                user_permissions=('view_all_submission',),
+            ),
+        })
+
         self.basic_submission = Submission.objects.create(
             user=self.profiles['normal'],
             problem=create_problem(code='basic'),

diff --git a/judge/models/tests/util.py b/judge/models/tests/util.py
@@ -237,30 +237,6 @@ def setUpTestData(self):
                 is_superuser=True,
                 is_staff=True,
             ),
-            'staff_blogpost_edit_own': create_user(
-                username='staff_blogpost_edit_own',
-                is_staff=True,
-                user_permissions=('change_blogpost',),
-            ),
-            'staff_blogpost_edit_all': create_user(
-                username='staff_blogpost_edit_all',
-                is_staff=True,
-                user_permissions=('change_blogpost', 'edit_all_post'),
-            ),
-            'staff_contest_edit_own': create_user(
-                username='staff_contest_edit_own',
-                is_staff=True,
-                user_permissions=('edit_own_contest',),
-            ),
-            'staff_contest_see_all': create_user(
-                username='staff_contest_see_all',
-                user_permissions=('see_private_contest',),
-            ),
-            'staff_contest_edit_all': create_user(
-                username='staff_contest_edit_all',
-                is_staff=True,
-                user_permissions=('edit_own_contest', 'edit_all_contest'),
-            ),
             'staff_problem_edit_own': create_user(
                 username='staff_problem_edit_own',
                 is_staff=True,
@@ -293,11 +269,6 @@ def setUpTestData(self):
                 username='staff_problem_edit_own_no_staff',
                 user_permissions=('edit_own_problem', 'rejudge_submission'),
             ),
-            'staff_submission_view_all': create_user(
-                username='staff_submission_view_all',
-                is_staff=True,
-                user_permissions=('view_all_submission',),
-            ),
             'normal': create_user(
                 username='normal',
             ),