Skip to content

Commit b241b26

Browse files
author
John Tordoff
committed
update tests
1 parent a98d958 commit b241b26

File tree

16 files changed

+86
-87
lines changed

16 files changed

+86
-87
lines changed

‎api_tests/registrations/views/test_registration_list.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,8 +1936,7 @@ def test_bulk_update_embargo_logged_in_contrib(
19361936
assert registration_one.is_pending_embargo_termination is False
19371937
assert registration_two.is_pending_embargo_termination is False
19381938

1939-
with capture_notifications():
1940-
res = app.put_json_api(url, public_payload, auth=user.auth, bulk=True)
1939+
res = app.put_json_api(url, public_payload, auth=user.auth, bulk=True)
19411940
assert res.status_code == 200
19421941
assert ({registration_one._id, registration_two._id} == {
19431942
res.json['data'][0]['id'], res.json['data'][1]['id']})
@@ -1992,8 +1991,7 @@ def add_contributor_request(self, auth_user, contributor, permission='write', ex
19921991
'type': 'contributors'
19931992
}
19941993
}
1995-
with capture_notifications():
1996-
return self.app.post_json_api(url, payload, auth=auth_user.auth, expect_errors=expect_errors)
1994+
return self.app.post_json_api(url, payload, auth=auth_user.auth, expect_errors=expect_errors)
19971995

19981996
def remove_contributor_request(self, auth_user, contributor, expect_errors=False):
19991997
url = f'/{API_BASE}registrations/{self.public_registration._id}/contributors/{contributor._id}/'

‎api_tests/registries_moderation/test_submissions.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,7 @@ def test_registries_moderation_post_embargo(self, app, embargo_registration, mod
362362
actions_payload_base['data']['attributes']['trigger'] = RegistrationModerationTriggers.ACCEPT_SUBMISSION.db_name
363363
actions_payload_base['data']['attributes']['comment'] = 'Looks good! (Embargo)'
364364
actions_payload_base['data']['relationships']['target']['data']['id'] = embargo_registration._id
365-
with capture_notifications():
366-
resp = app.post_json_api(embargo_registration_actions_url, actions_payload_base, auth=moderator.auth)
365+
resp = app.post_json_api(embargo_registration_actions_url, actions_payload_base, auth=moderator.auth)
367366
assert resp.status_code == 201
368367
assert resp.json['data']['attributes']['trigger'] == RegistrationModerationTriggers.ACCEPT_SUBMISSION.db_name
369368
embargo_registration.refresh_from_db()
@@ -519,8 +518,7 @@ def test_registries_moderation_post_admin_cant_force_withdraw(self, app, registr
519518
actions_payload_base['data']['attributes']['comment'] = 'Bye bye'
520519
actions_payload_base['data']['relationships']['target']['data']['id'] = registration._id
521520

522-
with capture_notifications():
523-
resp = app.post_json_api(registration_actions_url, actions_payload_base, auth=reg_creator.auth, expect_errors=True)
521+
resp = app.post_json_api(registration_actions_url, actions_payload_base, auth=reg_creator.auth, expect_errors=True)
524522
assert resp.status_code == 403
525523

526524
@pytest.mark.parametrize(
@@ -559,13 +557,15 @@ def test_post_withdrawal_action_persists_comment(self, app, registration, modera
559557
assert registration.actions.count() == 0
560558
registration.is_public = True
561559
registration.retract_registration(user=registration.creator)
562-
registration.retraction.accept()
560+
with capture_notifications():
561+
registration.retraction.accept()
563562

564563
moderator_comment = 'inane comment'
565564
actions_payload_base['data']['attributes']['trigger'] = moderator_trigger.db_name
566565
actions_payload_base['data']['attributes']['comment'] = moderator_comment
567566
actions_payload_base['data']['relationships']['target']['data']['id'] = registration._id
568-
resp = app.post_json_api(registration_actions_url, actions_payload_base, auth=moderator.auth)
567+
with capture_notifications():
568+
resp = app.post_json_api(registration_actions_url, actions_payload_base, auth=moderator.auth)
569569
assert resp.json['data']['attributes']['comment'] == moderator_comment
570570

571571
persisted_action = registration.actions.get(trigger=moderator_trigger.db_name)
@@ -656,7 +656,8 @@ def test_private_project_with_embargo_still_private_after_spam_and_ham_and_moder
656656
registration.refresh_from_db()
657657
assert registration.moderation_state == RegistrationModerationStates.INITIAL.db_name
658658

659-
registration.sanction.accept()
659+
with capture_notifications():
660+
registration.sanction.accept()
660661
registration.refresh_from_db()
661662
assert registration.moderation_state == RegistrationModerationStates.PENDING.db_name
662663

@@ -665,8 +666,7 @@ def test_private_project_with_embargo_still_private_after_spam_and_ham_and_moder
665666
actions_payload_base['data']['attributes']['comment'] = 'The best registration Ive ever seen'
666667
actions_payload_base['data']['relationships']['target']['data']['id'] = registration._id
667668

668-
with capture_notifications():
669-
resp = app.post_json_api(registration_actions_url, actions_payload_base, auth=moderator.auth)
669+
resp = app.post_json_api(registration_actions_url, actions_payload_base, auth=moderator.auth)
670670
assert resp.status_code == 201
671671
assert resp.json['data']['attributes']['trigger'] == RegistrationModerationTriggers.ACCEPT_SUBMISSION.db_name
672672
registration.refresh_from_db()
@@ -740,16 +740,16 @@ def test_private_project_without_embargo_is_public_after_spam_and_ham_and_modera
740740

741741
# approve the project
742742
registration.require_approval(user=registration.creator)
743-
registration.registration_approval.accept()
743+
with capture_notifications():
744+
registration.registration_approval.accept()
744745
registration.refresh_from_db()
745746
assert registration.moderation_state == RegistrationModerationStates.PENDING.db_name
746747

747748
# approve in moderation
748749
actions_payload_base['data']['attributes']['trigger'] = RegistrationModerationTriggers.ACCEPT_SUBMISSION.db_name
749750
actions_payload_base['data']['attributes']['comment'] = 'The best registration Ive ever seen'
750751
actions_payload_base['data']['relationships']['target']['data']['id'] = registration._id
751-
with capture_notifications():
752-
resp = app.post_json_api(registration_actions_url, actions_payload_base, auth=moderator.auth)
752+
resp = app.post_json_api(registration_actions_url, actions_payload_base, auth=moderator.auth)
753753
assert resp.status_code == 201
754754
assert resp.json['data']['attributes']['trigger'] == RegistrationModerationTriggers.ACCEPT_SUBMISSION.db_name
755755
registration.refresh_from_db()

‎framework/auth/views.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -865,6 +865,7 @@ def send_confirm_email(user, email, renew=False, external_id_provider=None, exte
865865
'user_fullname': user.fullname,
866866
'confirmation_url': confirmation_url,
867867
'can_change_preferences': False,
868+
'external_id_provider': external_id_provider,
868869
'osf_contact_email': settings.OSF_CONTACT_EMAIL,
869870
},
870871
)

‎notifications/file_event_notifications.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
"""
2-
This system was adapted from the highly extendable Event system to only incorporate file notifications
3-
as
4-
52
Event system + File events
63
74
- Provides a simple event registry (`event_registry`) and `@register` decorator.

‎osf/metrics/reporters/osfstorage_file_count.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,3 @@ def report(self, date):
4545
)
4646

4747
return [report]
48-
49-
def keen_events_from_report(self, report):
50-
event = {
51-
'osfstorage_files': report.files.to_dict(),
52-
}
53-
return {'file_summary': [event]}

‎osf/migrations/0001_initial.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class Migration(migrations.Migration):
116116
('category', models.CharField(blank=True, choices=[('analysis', 'Analysis'), ('communication', 'Communication'), ('data', 'Data'), ('hypothesis', 'Hypothesis'), ('instrumentation', 'Instrumentation'), ('methods and measures', 'Methods and Measures'), ('procedure', 'Procedure'), ('project', 'Project'), ('software', 'Software'), ('other', 'Other'), ('', 'Uncategorized')], default='', max_length=255)),
117117
('registration_responses', osf.utils.datetime_aware_jsonfield.DateTimeAwareJSONField(blank=True, default=dict, encoder=osf.utils.datetime_aware_jsonfield.DateTimeAwareJSONEncoder)),
118118
('registration_responses_migrated', models.NullBooleanField(db_index=True, default=True)),
119-
('type', models.CharField(choices=[('osf.node', 'node'), ('osf.draftnode', 'draft node'), ('osf.registration', 'registration')], db_index=True, max_length=255)),
119+
('type', models.CharField(choices=[('osf.node', 'node'), ('osf.draftnode', 'draft node'), ('osf.registration', 'registration'), ('osf.quickfilesnode', 'quick files node')], db_index=True, max_length=255)),
120120
('child_node_subscriptions', osf.utils.datetime_aware_jsonfield.DateTimeAwareJSONField(blank=True, default=dict, encoder=osf.utils.datetime_aware_jsonfield.DateTimeAwareJSONEncoder)),
121121
('deleted_date', osf.utils.fields.NonNaiveDateTimeField(blank=True, null=True)),
122122
('deleted', osf.utils.fields.NonNaiveDateTimeField(blank=True, null=True)),
@@ -2225,6 +2225,16 @@ class Migration(migrations.Migration):
22252225
},
22262226
bases=('osf.abstractprovider',),
22272227
),
2228+
migrations.CreateModel(
2229+
name='QuickFilesNode',
2230+
fields=[
2231+
],
2232+
options={
2233+
'proxy': True,
2234+
'indexes': [],
2235+
},
2236+
bases=('osf.abstractnode',),
2237+
),
22282238
migrations.CreateModel(
22292239
name='Registration',
22302240
fields=[

‎osf/models/sanctions.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,12 +1036,14 @@ def _email_template_context(self, user, node, is_authorizer=False, urls=None):
10361036
disapproval_link = urls.get('reject', '')
10371037

10381038
context.update({
1039+
'domain': osf_settings.DOMAIN,
10391040
'is_initiator': self.initiated_by == user,
10401041
'is_moderated': self.is_moderated,
10411042
'reviewable_title': registration.title,
10421043
'reviewable__id': self._get_registration()._id,
10431044
'reviewable_provider_name': self._get_registration().provider.name,
10441045
'reviewable_absolute_url': registration.absolute_url,
1046+
'reviewable_provider__id': registration.provider._id,
10451047
'initiated_by_fullname': self.initiated_by.fullname,
10461048
'approval_link': approval_link,
10471049
'project_name': registration.title,
@@ -1060,6 +1062,7 @@ def _email_template_context(self, user, node, is_authorizer=False, urls=None):
10601062
'is_moderated': self.is_moderated,
10611063
'reviewable_title': registration.title,
10621064
'reviewable__id': self._get_registration()._id,
1065+
'reviewable_provider__id': registration.provider._id,
10631066
'reviewable_absolute_url': registration.absolute_url,
10641067
'reviewable_provider_name': self.target_registration.provider.name,
10651068
'approval_time_span': approval_time_span,

‎tests/test_preprints.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,13 +1276,14 @@ def test_can_set_contributor_order(self, preprint):
12761276
def test_move_contributor(self, user, preprint, auth):
12771277
user1 = UserFactory()
12781278
user2 = UserFactory()
1279-
preprint.add_contributors(
1280-
[
1281-
{'user': user1, 'permissions': WRITE, 'visible': True},
1282-
{'user': user2, 'permissions': WRITE, 'visible': True}
1283-
],
1284-
auth=auth
1285-
)
1279+
with capture_notifications():
1280+
preprint.add_contributors(
1281+
[
1282+
{'user': user1, 'permissions': WRITE, 'visible': True},
1283+
{'user': user2, 'permissions': WRITE, 'visible': True}
1284+
],
1285+
auth=auth
1286+
)
12861287

12871288
user_contrib_id = preprint.preprintcontributor_set.get(user=user).id
12881289
user1_contrib_id = preprint.preprintcontributor_set.get(user=user1).id
@@ -1637,7 +1638,8 @@ def test_admin_can_publish(self):
16371638
def test_admin_cannot_unpublish(self):
16381639
assert not self.preprint.is_published
16391640

1640-
self.preprint.set_published(True, auth=Auth(self.user), save=True)
1641+
with capture_notifications():
1642+
self.preprint.set_published(True, auth=Auth(self.user), save=True)
16411643

16421644
assert self.preprint.is_published
16431645

‎tests/test_project_creation_view.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,8 @@ def test_can_template(self):
211211
'title': 'Im a real title',
212212
'template': other_node._id
213213
}
214-
res = self.app.post(self.url, json=payload, auth=self.creator.auth)
214+
with capture_notifications():
215+
res = self.app.post(self.url, json=payload, auth=self.creator.auth)
215216
assert res.status_code == 201
216217
node = AbstractNode.load(res.json['projectUrl'].replace('/', ''))
217218
assert node
@@ -240,7 +241,8 @@ def test_project_new_from_template_public_non_contributor(self):
240241
non_contributor = AuthUserFactory()
241242
project = ProjectFactory(is_public=True)
242243
url = api_url_for('project_new_from_template', nid=project._id)
243-
res = self.app.post(url, auth=non_contributor.auth)
244+
with capture_notifications():
245+
res = self.app.post(url, auth=non_contributor.auth)
244246
assert res.status_code == 201
245247

246248
def test_project_new_from_template_contributor(self):

‎tests/test_project_views.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,8 @@ def test_fork_grandcomponents_has_correct_root(self):
360360
grand_child = NodeFactory(parent=child, creator=user)
361361
project.save()
362362

363-
fork = project.fork_node(auth)
363+
with capture_notifications():
364+
fork = project.fork_node(auth)
364365
fork.save()
365366
grand_child_fork = fork.nodes[0].nodes[0]
366367
assert grand_child_fork.root == fork

0 commit comments

Comments
 (0)