improve notification mocking

Author: Johnetordoff

addons/boa/tests/test_tasks.py

@@ -68,8 +68,8 @@ def test_handle_boa_error(self):
                         output_file_name=self.output_file_name,
                         job_id=self.job_id
                     )
-                assert len(notifications) == 1
-                assert notifications[0]['type'] == NotificationType.Type.ADDONS_BOA_JOB_FAILURE
+                assert len(notifications['emits']) == 1
+                assert notifications['emits'][0]['type'] == NotificationType.Type.ADDONS_BOA_JOB_FAILURE
                 mock_sentry_log_message.assert_called_with(self.error_message, skip_session=True)
                 mock_logger_error.assert_called_with(self.error_message)
                 assert return_value == BoaErrorCode.UNKNOWN

admin_tests/users/test_views.py

@@ -624,7 +624,12 @@ def test_get_password_reset_link(self):
 
     def test_get_unclaimed_node_links(self):
         project = ProjectFactory()
-        unregistered_contributor = project.add_unregistered_contributor(fullname='Brother Nero', email='matt@hardyboyz.biz', auth=Auth(project.creator))
+        unregistered_contributor = project.add_unregistered_contributor(
+            fullname='Brother Nero',
+            email='matt@hardyboyz.biz',
+            auth=Auth(project.creator),
+            notification_type=False
+        )
         project.save()
 
         request = RequestFactory().get('/fake_path')

api_tests/cedar_metadata_records/views/test_record_detail_get.py

@@ -182,7 +182,7 @@ def test_record_detail_for_node_with_write_auth(self, app, node_pub, cedar_templ
     def test_record_detail_for_node_with_read_auth(self, app, node_pub, cedar_template, cedar_record_for_node_pub, cedar_record_metadata_json):
 
         read = AuthUserFactory()
-        node_pub.add_contributor(read, permissions=READ)
+        node_pub.add_contributor(read, permissions=READ, notification_type=False)
         node_pub.save()
         resp = app.get(f'/_/cedar_metadata_records/{cedar_record_for_node_pub._id}/', auth=read.auth)
         assert resp.status_code == 200
@@ -634,7 +634,7 @@ def test_record_detail_for_file_with_write_auth(self, app, node_pub, file_pub, c
     def test_record_detail_for_file_with_read_auth(self, app, node_pub, file_pub, cedar_template, cedar_record_for_file_pub, cedar_record_metadata_json):
 
         read = AuthUserFactory()
-        node_pub.add_contributor(read, permissions=READ)
+        node_pub.add_contributor(read, permissions=READ, notification_type=False)
         node_pub.save()
         resp = app.get(f'/_/cedar_metadata_records/{cedar_record_for_file_pub._id}/', auth=read.auth)
         assert resp.status_code == 200

api_tests/cedar_metadata_records/views/test_record_metadata_download_get.py

@@ -108,7 +108,7 @@ def test_record_metadata_download_for_node_with_write_auth(self, app, node_pub,
     def test_record_metadata_download_for_node_with_read_auth(self, app, node_pub, cedar_record_for_node_pub, cedar_record_metadata_json):
 
         read = AuthUserFactory()
-        node_pub.add_contributor(read, permissions=READ)
+        node_pub.add_contributor(read, permissions=READ, notification_type=False)
         node_pub.save()
         resp = app.get(f'/_/cedar_metadata_records/{cedar_record_for_node_pub._id}/metadata_download/', auth=read.auth)
         assert resp.status_code == 200
@@ -361,7 +361,7 @@ def test_record_metadata_download_for_node_with_write_auth(self, app, node_pub,
     def test_record_metadata_download_for_node_with_read_auth(self, app, node_pub, cedar_record_for_file_pub, cedar_record_metadata_json):
 
         read = AuthUserFactory()
-        node_pub.add_contributor(read, permissions=READ)
+        node_pub.add_contributor(read, permissions=READ, notification_type=False)
         node_pub.save()
         resp = app.get(f'/_/cedar_metadata_records/{cedar_record_for_file_pub._id}/metadata_download/', auth=read.auth)
         assert resp.status_code == 200

api_tests/crossref/views/test_crossref_email_response.py

@@ -162,8 +162,8 @@ def test_error_response_sends_message_does_not_set_doi(self, app, url, preprint,
         context_data = self.make_mailgun_payload(crossref_response=error_xml)
         with capture_notifications() as notifications:
             app.post(url, context_data)
-        assert len(notifications) == 1
-        assert notifications[0]['type'] == NotificationType.Type.PROVIDER_MODERATOR_ADDED
+        assert len(notifications['emits']) == 1
+        assert notifications['emits'][0]['type'] == NotificationType.Type.PROVIDER_MODERATOR_ADDED
         assert not preprint.get_identifier_value('doi')
 
     def test_success_response_sets_doi(self, app, url, preprint, success_xml):

api_tests/draft_registrations/views/test_draft_registration_contributor_list.py

@@ -183,7 +183,11 @@ def test_permissions_work_with_many_users(
             perm = random.choice(list(users.keys()))
             user = AuthUserFactory()
 
-            project_private.add_contributor(user, permissions=perm)
+            project_private.add_contributor(
+                user,
+                permissions=perm,
+                notification_type=False
+            )
             users[perm].append(user._id)
 
         res = app.get(url_private, auth=user.auth)
@@ -242,8 +246,8 @@ def test_add_contributor_sends_email(self, app, user, user_two, url_project_cont
                 auth=user.auth
             )
         assert res.status_code == 201
-        assert len(notifications) == 1
-        assert notifications[0]['type'] == NotificationType.Type.DRAFT_REGISTRATION_CONTRIBUTOR_ADDED_DEFAULT
+        assert len(notifications['emits']) == 1
+        assert notifications['emits'][0]['type'] == NotificationType.Type.DRAFT_REGISTRATION_CONTRIBUTOR_ADDED_DEFAULT
 
     # Overrides TestNodeContributorCreateEmail
     def test_add_contributor_signal_if_default(
@@ -285,8 +289,8 @@ def test_add_unregistered_contributor_sends_email(self, app, user, url_project_c
                 auth=user.auth
             )
         assert res.status_code == 201
-        assert len(notifications) == 1
-        assert notifications[0]['type'] == NotificationType.Type.DRAFT_REGISTRATION_CONTRIBUTOR_ADDED_DEFAULT
+        assert len(notifications['emits']) == 1
+        assert notifications['emits'][0]['type'] == NotificationType.Type.DRAFT_REGISTRATION_CONTRIBUTOR_ADDED_DEFAULT
 
     # Overrides TestNodeContributorCreateEmail
     def test_add_unregistered_contributor_signal_if_default(self, app, user, url_project_contribs):
@@ -304,8 +308,8 @@ def test_add_unregistered_contributor_signal_if_default(self, app, user, url_pro
                 }, auth=user.auth
             )
         assert res.status_code == 201
-        assert len(notifications) == 1
-        assert notifications[0]['type'] == NotificationType.Type.DRAFT_REGISTRATION_CONTRIBUTOR_ADDED_DEFAULT
+        assert len(notifications['emits']) == 1
+        assert notifications['emits'][0]['type'] == NotificationType.Type.DRAFT_REGISTRATION_CONTRIBUTOR_ADDED_DEFAULT
 
     # Overrides TestNodeContributorCreateEmail
     def test_add_unregistered_contributor_without_email_no_email(self, app, user, url_project_contribs):
@@ -374,11 +378,17 @@ def project_private(
         project_private.add_contributor(
             user_two,
             permissions=permissions.READ,
-            visible=True, save=True)
+            visible=True,
+            save=True,
+            notification_type=False
+        )
         project_private.add_contributor(
             user_three,
             permissions=permissions.READ,
-            visible=True, save=True)
+            visible=True,
+            save=True,
+            notification_type=False
+        )
         return project_private
 
     @pytest.fixture()
@@ -484,11 +494,17 @@ def project_private(
         project_private.add_contributor(
             user_two,
             permissions=permissions.READ,
-            visible=True, save=True)
+            visible=True,
+            save=True,
+            notification_type=False
+        )
         project_private.add_contributor(
             user_three,
             permissions=permissions.READ,
-            visible=True, save=True)
+            visible=True,
+            save=True,
+            notification_type=False
+        )
         return project_private
 
 

api_tests/draft_registrations/views/test_draft_registration_list.py

@@ -442,9 +442,9 @@ def test_create_no_project_draft_emails_initiator(self, app, user, url_draft_reg
                 payload,
                 auth=user.auth
             )
-        assert len(notifications) == 1
-        assert notifications[0]['type'] == NotificationType.Type.DRAFT_REGISTRATION_CONTRIBUTOR_ADDED_DEFAULT
-        assert notifications[0]['kwargs']['user'] == user
+        assert len(notifications['emits']) == 1
+        assert notifications['emits'][0]['type'] == NotificationType.Type.DRAFT_REGISTRATION_CONTRIBUTOR_ADDED_DEFAULT
+        assert notifications['emits'][0]['kwargs']['user'] == user
 
     def test_create_draft_with_provider(
             self, app, user, url_draft_registrations, non_default_provider, payload_with_non_default_provider

api_tests/draft_registrations/views/test_draft_registration_relationship_institutions.py

@@ -1,9 +1,11 @@
 import pytest
 
 from api.base.settings.defaults import API_BASE
+from osf.models import NotificationType
 
 from osf_tests.factories import DraftRegistrationFactory, AuthUserFactory, InstitutionFactory
 from osf.utils import permissions
+from tests.utils import capture_notifications
 
 
 @pytest.mark.django_db
@@ -139,18 +141,21 @@ def test_delete_user_is_read_write(
     # Overrides TestNodeRelationshipInstitutions
     def test_read_write_contributor_can_add_affiliated_institution(
             self, app, write_contrib, write_contrib_institution, node, node_institutions_url):
-        payload = {
-            'data': [{
-                'type': 'institutions',
-                'id': write_contrib_institution._id
-            }]
-        }
-        res = app.post_json_api(
-            node_institutions_url,
-            payload,
-            auth=write_contrib.auth,
-            expect_errors=True
-        )
+        with capture_notifications() as notifications:
+            res = app.post_json_api(
+                node_institutions_url,
+                {
+                    'data': [{
+                        'type': 'institutions',
+                        'id': write_contrib_institution._id
+                    }]
+                },
+                auth=write_contrib.auth,
+                expect_errors=True
+            )
+        assert len(notifications['emits']) == 1
+        assert notifications['emits'][0]['type'] == NotificationType.Type.NODE_AFFILIATION_CHANGED
+
         node.reload()
         assert res.status_code == 201
 
@@ -235,11 +240,14 @@ def test_user_with_institution_and_permissions(
         user.add_or_update_affiliated_institution(institution_three)
         assert institution_three not in node.affiliated_institutions.all()
 
-        res = app.post_json_api(
-            node_institutions_url,
-            create_payload(institution_three._id),
-            auth=user.auth
-        )
+        with capture_notifications() as notifications:
+            res = app.post_json_api(
+                node_institutions_url,
+                create_payload(institution_three._id),
+                auth=user.auth
+            )
+        assert len(notifications['emits']) == 1
+        assert notifications['emits'][0]['type'] == NotificationType.Type.NODE_AFFILIATION_CHANGED
 
         assert res.status_code == 201
         data = res.json['data']
@@ -276,11 +284,13 @@ def test_remove_institutions_with_affiliated_user(
         node.affiliated_institutions.add(institution_one)
         assert institution_one in node.affiliated_institutions.all()
 
-        res = app.put_json_api(
-            node_institutions_url,
-            {'data': []},
-            auth=user.auth
-        )
+        with capture_notifications() as notifications:
+            res = app.put_json_api(
+                node_institutions_url,
+                {'data': []},
+                auth=user.auth
+            )
+        assert not notifications
 
         assert res.status_code == 200
         node.reload()

api_tests/files/views/test_file_cedar_metadata_record_list.py

@@ -29,7 +29,7 @@ def test_record_list_with_invalid_auth(self, app, user_alt, file_pub, cedar_reco
     def test_record_list_with_read_auth(self, app, node_pub, file_pub, cedar_record_for_file_pub, cedar_draft_record_for_file_pub):
 
         read = AuthUserFactory()
-        node_pub.add_contributor(read, permissions=READ)
+        node_pub.add_contributor(read, permissions=READ, notification_type=False)
         node_pub.save()
         resp = app.get(f'/v2/files/{file_pub._id}/cedar_metadata_records/', auth=read.auth)
         assert resp.status_code == 200

api_tests/institutions/views/test_institution_auth.py

@@ -323,7 +323,8 @@ def test_user_unclaimed(self, app, institution, url_auth_institution):
         user = project.add_unregistered_contributor(
             fullname=fullname,
             email=username,
-            auth=Auth(project.creator)
+            auth=Auth(project.creator),
+            notification_type=False
         )
         user.save()
         # Unclaimed user is given an unusable password when being added as a contributor