1- import uuid
21from decimal import Decimal
32
43from django .contrib .auth import get_user_model
3433from researchhub_document .related_models .researchhub_unified_document_model import (
3534 ResearchhubUnifiedDocument ,
3635)
37- from utils .test_helpers import AWSMockTestCase
36+ from utils .test_helpers import AWSMockTestCase , create_test_user
3837
3938User = get_user_model ()
4039ACTIVITY_LIST_URL = reverse ("activity_feed-list" )
4140
4241
43- def _make_user (username = None ):
44- return User .objects .create_user (
45- username = username or uuid .uuid4 ().hex ,
46- password = uuid .uuid4 ().hex ,
47- )
48-
49-
5042def _make_feed_entry (
5143 content_type_model ,
5244 object_id ,
@@ -72,7 +64,7 @@ class ActivityFeedBaseTests(AWSMockTestCase):
7264
7365 def setUp (self ):
7466 super ().setUp ()
75- self .user = _make_user ("activity_user" )
67+ self .user = create_test_user ("activity_user" )
7668 self .client = APIClient ()
7769
7870 self .prereg_doc = ResearchhubUnifiedDocument .objects .create (
@@ -200,7 +192,7 @@ class ActivityFeedGrantFilterTests(AWSMockTestCase):
200192
201193 def setUp (self ):
202194 super ().setUp ()
203- self .user = _make_user ()
195+ self .user = create_test_user ()
204196 self .client = APIClient ()
205197
206198 # Grant document + post + Grant object
@@ -427,7 +419,7 @@ class ActivityFeedScopeGrantsTests(AWSMockTestCase):
427419
428420 def setUp (self ):
429421 super ().setUp ()
430- self .user = _make_user ()
422+ self .user = create_test_user ()
431423 self .client = APIClient ()
432424
433425 # Grant A with an applied preregistration
@@ -596,7 +588,7 @@ class ActivityFeedActionDateOrderingTests(AWSMockTestCase):
596588
597589 def setUp (self ):
598590 super ().setUp ()
599- self .user = _make_user ()
591+ self .user = create_test_user ()
600592 self .client = APIClient ()
601593
602594 def test_action_date_determines_order_not_created_date (self ):
@@ -660,7 +652,7 @@ class ActivityFeedPeerReviewFilterTests(AWSMockTestCase):
660652
661653 def setUp (self ):
662654 super ().setUp ()
663- self .user = _make_user ()
655+ self .user = create_test_user ()
664656 self .client = APIClient ()
665657
666658 self .doc = ResearchhubUnifiedDocument .objects .create (
@@ -802,7 +794,7 @@ class ActivityFeedFinancialScopeTests(AWSMockTestCase):
802794
803795 def setUp (self ):
804796 super ().setUp ()
805- self .user = _make_user ( "financial_user" )
797+ self .user = create_test_user ( )
806798 self .client = APIClient ()
807799
808800 self .proposal_doc = ResearchhubUnifiedDocument .objects .create (
0 commit comments