Skip to content

Commit eae2207

Browse files
JohnetordoffJohnetordoff
committed
stop notify contributors in tests
1 parent e7a8e3c commit eae2207

8 files changed

Lines changed: 155 additions & 36 deletions

‎api_tests/draft_registrations/views/test_draft_registration_contributor_detail.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ def test_get_contributor_detail_valid_response(
9393
# Overrides TestContributorDetail
9494
def test_node_contributor_detail_serializes_contributor_perms(self, app, user, make_resource_url, project_public):
9595
user_two = AuthUserFactory()
96-
project_public.add_contributor(user_two, permissions.WRITE)
96+
project_public.add_contributor(
97+
user_two,
98+
permissions=permissions.WRITE,
99+
notification_type=False,
100+
)
97101
project_public.save()
98102

99103
url = make_resource_url(project_public._id, user_two._id)

‎api_tests/draft_registrations/views/test_draft_registration_contributor_list.py‎

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@ def test_return(
9999
# Overrides TestNodeContributorList
100100
def test_return_public_contributor_list_logged_out(
101101
self, app, user, user_two, project_public, url_public, make_contrib_id):
102-
project_public.add_contributor(user_two, save=True)
102+
project_public.add_contributor(user_two, save=True, notification_type=False)
103103

104104
res = app.get(url_public, expect_errors=True)
105105
assert res.status_code == 401
106106

107107
# Overrides TestNodeContributorList
108108
def test_disabled_contributors_contain_names_under_meta(
109109
self, app, user, user_two, project_public, url_public, make_contrib_id):
110-
project_public.add_contributor(user_two, save=True)
110+
project_public.add_contributor(user_two, save=True, notification_type=False)
111111

112112
user_two.is_disabled = True
113113
user_two.save()
@@ -130,7 +130,9 @@ def test_total_bibliographic_contributor_count_returned_in_metadata(
130130
project_public.add_contributor(
131131
non_bibliographic_user,
132132
visible=False,
133-
auth=Auth(project_public.creator))
133+
auth=Auth(project_public.creator),
134+
notification_type=False
135+
)
134136
project_public.save()
135137
res = app.get(url_public, auth=user.auth)
136138
assert res.status_code == 200
@@ -143,7 +145,8 @@ def test_contributors_order_is_the_same_over_multiple_requests(
143145
project_public.add_unregistered_contributor(
144146
'Robert Jackson',
145147
'robert@gmail.com',
146-
auth=Auth(user)
148+
auth=Auth(user),
149+
notification_type=False,
147150
)
148151

149152
for i in range(0, 10):
@@ -156,6 +159,7 @@ def test_contributors_order_is_the_same_over_multiple_requests(
156159
new_user,
157160
visible=visible,
158161
auth=Auth(project_public.creator),
162+
notification_type=False,
159163
save=True
160164
)
161165
req_one = app.get(
@@ -347,11 +351,17 @@ def project_public(
347351
project_public.add_contributor(
348352
user_two,
349353
permissions=permissions.READ,
350-
visible=True, save=True)
354+
visible=True,
355+
notification_type=False,
356+
save=True
357+
)
351358
project_public.add_contributor(
352359
user_three,
353360
permissions=permissions.READ,
354-
visible=True, save=True)
361+
visible=True,
362+
notification_type=False,
363+
save=True
364+
)
355365
return project_public
356366

357367
@pytest.fixture()
@@ -391,11 +401,17 @@ def project_public(
391401
project_public.add_contributor(
392402
user_two,
393403
permissions=permissions.READ,
394-
visible=True, save=True)
404+
visible=True,
405+
save=True,
406+
notification_type=False
407+
)
395408
project_public.add_contributor(
396409
user_three,
397410
permissions=permissions.READ,
398-
visible=True, save=True)
411+
visible=True,
412+
save=True,
413+
notification_type=False
414+
)
399415
return project_public
400416

401417
@pytest.fixture()
@@ -408,11 +424,17 @@ def project_private(
408424
project_private.add_contributor(
409425
user_two,
410426
permissions=permissions.READ,
411-
visible=True, save=True)
427+
visible=True,
428+
notification_type=False,
429+
save=True
430+
)
412431
project_private.add_contributor(
413432
user_three,
414433
permissions=permissions.READ,
415-
visible=True, save=True)
434+
visible=True,
435+
notification_type=False,
436+
save=True
437+
)
416438
return project_private
417439

418440
@pytest.fixture()

‎api_tests/draft_registrations/views/test_draft_registration_detail.py‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,11 @@ def test_admin_node_and_draft(self, app, user, project_public, draft_registratio
9595

9696
def test_admin_node_not_draft(self, app, user, project_public, draft_registration, url_draft_registrations):
9797
node_admin = AuthUserFactory()
98-
project_public.add_contributor(node_admin, ADMIN)
98+
project_public.add_contributor(
99+
node_admin,
100+
ADMIN,
101+
notification_type=False,
102+
)
99103
assert project_public.has_permission(node_admin, ADMIN) is True
100104
assert draft_registration.has_permission(node_admin, ADMIN) is False
101105
res = app.get(url_draft_registrations, auth=node_admin.auth, expect_errors=True)
@@ -117,7 +121,11 @@ def test_write_node_and_draft(self, app, user, project_public, draft_registratio
117121

118122
def test_write_node_not_draft(self, app, user, project_public, draft_registration, url_draft_registrations):
119123
node_admin = AuthUserFactory()
120-
project_public.add_contributor(node_admin, WRITE)
124+
project_public.add_contributor(
125+
node_admin,
126+
WRITE,
127+
notification_type=False
128+
)
121129
assert project_public.has_permission(node_admin, WRITE) is True
122130
assert draft_registration.has_permission(node_admin, WRITE) is False
123131
res = app.get(url_draft_registrations, auth=node_admin.auth, expect_errors=True)
@@ -139,7 +147,11 @@ def test_read_node_and_draft(self, app, user, project_public, draft_registration
139147

140148
def test_read_node_not_draft(self, app, user, project_public, draft_registration, url_draft_registrations):
141149
node_admin = AuthUserFactory()
142-
project_public.add_contributor(node_admin, READ)
150+
project_public.add_contributor(
151+
node_admin,
152+
READ,
153+
notification_type=False
154+
)
143155
assert project_public.has_permission(node_admin, READ) is True
144156
assert draft_registration.has_permission(node_admin, READ) is False
145157
res = app.get(url_draft_registrations, auth=node_admin.auth, expect_errors=True)

‎api_tests/draft_registrations/views/test_draft_registration_list.py‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,16 @@ def test_draft_registration_attributes_copied_from_node(
265265
save=True
266266
)
267267

268-
project_public.add_contributor(write_contrib, WRITE)
269-
project_public.add_contributor(read_contrib, READ)
268+
project_public.add_contributor(
269+
write_contrib,
270+
WRITE,
271+
notification_type=False
272+
)
273+
project_public.add_contributor(
274+
read_contrib,
275+
READ,
276+
notification_type=False
277+
)
270278

271279
# Only an admin can create a DraftRegistration
272280
res = app.post_json_api(url_draft_registrations, payload_alt, auth=write_contrib.auth, expect_errors=True)

‎api_tests/nodes/views/test_node_comments_list.py‎

Lines changed: 38 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,11 @@ def project_private_comment_private(
639639
def project_public_comment_private(self, user, user_read_contrib, payload):
640640
project_public = ProjectFactory(
641641
is_public=True, creator=user, comment_level='private')
642-
project_public.add_contributor(user_read_contrib, permissions=READ)
642+
project_public.add_contributor(
643+
user_read_contrib,
644+
permissions=READ,
645+
notification_type=False,
646+
)
643647
project_public.save()
644648
url_public = '/{}nodes/{}/comments/'.format(
645649
API_BASE, project_public._id)
@@ -653,7 +657,11 @@ def project_public_comment_private(self, user, user_read_contrib, payload):
653657
def project_public_comment_public(self, user, user_read_contrib, payload):
654658
""" Public project configured so that any logged-in user can comment."""
655659
project_public = ProjectFactory(is_public=True, creator=user)
656-
project_public.add_contributor(user_read_contrib, permissions=READ)
660+
project_public.add_contributor(
661+
user_read_contrib,
662+
permissions=READ,
663+
notification_type=False,
664+
)
657665
project_public.save()
658666
url_public = '/{}nodes/{}/comments/'.format(
659667
API_BASE, project_public._id)
@@ -1070,7 +1078,11 @@ def project_private_comment_private(
10701078
def project_public_comment_private(self, user, user_read_contrib, payload):
10711079
project_public = ProjectFactory(
10721080
is_public=True, creator=user, comment_level='private')
1073-
project_public.add_contributor(user_read_contrib, permissions=READ)
1081+
project_public.add_contributor(
1082+
user_read_contrib,
1083+
permissions=READ,
1084+
notification_type=False,
1085+
)
10741086
project_public.save()
10751087
url_public = '/{}nodes/{}/comments/'.format(
10761088
API_BASE, project_public._id)
@@ -1086,7 +1098,11 @@ def project_public_comment_private(self, user, user_read_contrib, payload):
10861098
def project_public_comment_public(self, user, user_read_contrib, payload):
10871099
""" Public project configured so that any logged-in user can comment."""
10881100
project_public = ProjectFactory(is_public=True, creator=user)
1089-
project_public.add_contributor(user_read_contrib, permissions=READ)
1101+
project_public.add_contributor(
1102+
user_read_contrib,
1103+
permissions=READ,
1104+
notification_type=False,
1105+
)
10901106
project_public.save()
10911107
url_public = '/{}nodes/{}/comments/'.format(
10921108
API_BASE, project_public._id)
@@ -1201,7 +1217,11 @@ def project_private_comment_private(
12011217
def project_public_comment_private(self, user, user_read_contrib, payload):
12021218
project_public = ProjectFactory(
12031219
is_public=True, creator=user, comment_level='private')
1204-
project_public.add_contributor(user_read_contrib, permissions=READ)
1220+
project_public.add_contributor(
1221+
user_read_contrib,
1222+
permissions=READ,
1223+
notification_type=False,
1224+
)
12051225
project_public.save()
12061226
url_public = '/{}nodes/{}/comments/'.format(
12071227
API_BASE, project_public._id)
@@ -1218,7 +1238,11 @@ def project_public_comment_private(self, user, user_read_contrib, payload):
12181238
def project_public_comment_public(self, user, user_read_contrib, payload):
12191239
""" Public project configured so that any logged-in user can comment."""
12201240
project_public = ProjectFactory(is_public=True, creator=user)
1221-
project_public.add_contributor(user_read_contrib, permissions=READ)
1241+
project_public.add_contributor(
1242+
user_read_contrib,
1243+
permissions=READ,
1244+
notification_type=False,
1245+
)
12221246
project_public.save()
12231247
url_public = '/{}nodes/{}/comments/'.format(
12241248
API_BASE, project_public._id)
@@ -1337,7 +1361,10 @@ def project_public_comment_private(self, user, user_read_contrib, payload):
13371361
project_public = ProjectFactory.create(
13381362
is_public=True, creator=user, comment_level='private')
13391363
project_public.add_contributor(
1340-
user_read_contrib, permissions=READ, save=True)
1364+
user_read_contrib,
1365+
permissions=READ,
1366+
notification_type=False,
1367+
)
13411368
comment_public = CommentFactory(node=project_public, user=user)
13421369
url_public = '/{}nodes/{}/comments/'.format(
13431370
API_BASE, project_public._id)
@@ -1372,7 +1399,10 @@ def project_private_comment_public(self, user, user_read_contrib, payload):
13721399
def project_public_comment_public(self, user, user_read_contrib, payload):
13731400
project_public = ProjectFactory(is_public=True, creator=user)
13741401
project_public.add_contributor(
1375-
user_read_contrib, permissions=READ, save=True)
1402+
user_read_contrib,
1403+
permissions=READ,
1404+
notification_type=False,
1405+
)
13761406
comment_public = CommentFactory(node=project_public, user=user)
13771407
comment_reply = CommentFactory(
13781408
node=project_public,

‎api_tests/nodes/views/test_node_contributors_detail.py‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ def test_unregistered_contributor_detail_show_up_as_name_associated_with_project
124124
project_public.add_unregistered_contributor(
125125
'Rheisen Dennis',
126126
'reason@gmail.com',
127-
auth=Auth(user)
127+
auth=Auth(user),
128+
notification_type=False,
128129
)
129130
unregistered_contributor = project_public.contributors[1]
130131
url = self.make_resource_url(project_public._id, unregistered_contributor._id)
@@ -156,6 +157,7 @@ def test_detail_includes_index(self, app, user, project_public, url_public):
156157
project_public.add_contributor(
157158
other_contributor,
158159
auth=Auth(user),
160+
notification_type=False,
159161
save=True
160162
)
161163
res = app.get(
@@ -183,7 +185,11 @@ def test_detail_includes_is_curator(
183185

184186
other_contributor = AuthUserFactory()
185187
project_public.add_contributor(
186-
other_contributor, auth=Auth(user), save=True)
188+
other_contributor,
189+
auth=Auth(user),
190+
save=True,
191+
notification_type=False
192+
)
187193

188194
other_contributor_detail = self.make_resource_url(project_public._id, other_contributor._id)
189195

@@ -192,7 +198,13 @@ def test_detail_includes_is_curator(
192198

193199
curator_contributor = AuthUserFactory()
194200
project_public.add_contributor(
195-
curator_contributor, auth=Auth(user), save=True, make_curator=True, visible=False)
201+
curator_contributor,
202+
auth=Auth(user),
203+
save=True,
204+
make_curator=True,
205+
visible=False,
206+
notification_type=False
207+
)
196208

197209
curator_contributor_detail = self.make_resource_url(project_public._id, curator_contributor._id)
198210

0 commit comments

Comments
 (0)
⚡