fix unit tests

Author: Ostap-Zherebetskyi

api_tests/draft_registrations/views/test_draft_registration_contributor_list.py

@@ -281,7 +281,7 @@ def test_add_unregistered_contributor_sends_email(self, app, user, url_project_c
             )
         assert res.status_code == 201
         assert len(notifications['emits']) == 1
-        assert notifications['emits'][0]['type'] == NotificationType.Type.DRAFT_REGISTRATION_CONTRIBUTOR_ADDED_DEFAULT
+        assert notifications['emits'][0]['type'] == NotificationType.Type.USER_INVITE_DRAFT_REGISTRATION
 
     # Overrides TestNodeContributorCreateEmail
     def test_add_unregistered_contributor_signal_if_default(self, app, user, url_project_contribs):
@@ -300,7 +300,7 @@ def test_add_unregistered_contributor_signal_if_default(self, app, user, url_pro
             )
         assert res.status_code == 201
         assert len(notifications['emits']) == 1
-        assert notifications['emits'][0]['type'] == NotificationType.Type.DRAFT_REGISTRATION_CONTRIBUTOR_ADDED_DEFAULT
+        assert notifications['emits'][0]['type'] == NotificationType.Type.USER_INVITE_DRAFT_REGISTRATION
 
     # Overrides TestNodeContributorCreateEmail
     def test_add_unregistered_contributor_without_email_no_email(self, app, user, url_project_contribs):

api_tests/nodes/views/test_node_list.py

@@ -1660,8 +1660,7 @@ def test_create_component_inherit_contributors(
                 }
             }
         }
-        with capture_notifications():
-            res = app.post_json_api(url, component_data, auth=user_one.auth)
+        res = app.post_json_api(url, component_data, auth=user_one.auth)
         assert res.status_code == 201
         json_data = res.json['data']
 

api_tests/preprints/views/test_preprint_contributors_list.py

@@ -1463,7 +1463,7 @@ def test_add_unregistered_contributor_sends_email(
                 auth=user.auth
             )
         assert len(notifications['emits']) == 1
-        assert notifications['emits'][0]['type'] == NotificationType.Type.PREPRINT_CONTRIBUTOR_ADDED_DEFAULT
+        assert notifications['emits'][0]['type'] == NotificationType.Type.PROVIDER_USER_INVITE_PREPRINT
         assert res.status_code == 201
 
     def test_add_unregistered_contributor_signal_if_preprint(self, app, user, url_preprint_contribs):
@@ -1483,7 +1483,7 @@ def test_add_unregistered_contributor_signal_if_preprint(self, app, user, url_pr
             )
         assert res.status_code == 201
         assert len(notifications['emits']) == 1
-        assert notifications['emits'][0]['type'] == NotificationType.Type.PREPRINT_CONTRIBUTOR_ADDED_DEFAULT
+        assert notifications['emits'][0]['type'] == NotificationType.Type.PROVIDER_USER_INVITE_PREPRINT
 
     def test_add_contributor_invalid_send_email_param(self, app, user, url_preprint_contribs):
         url = f'{url_preprint_contribs}?send_email=true'
@@ -1564,23 +1564,7 @@ def test_contributor_added_signal_not_specified(self, app, user, url_preprint_co
             )
         assert res.status_code == 201
         assert len(notifications['emits']) == 1
-        assert notifications['emits'][0]['type'] == NotificationType.Type.PREPRINT_CONTRIBUTOR_ADDED_DEFAULT
-
-    def test_contributor_added_not_sent_if_unpublished(self, app, user, preprint_unpublished):
-        res = app.post_json_api(
-            f'/{API_BASE}preprints/{preprint_unpublished._id}/contributors/?send_email=preprint',
-            {
-                'data': {
-                    'type': 'contributors',
-                    'attributes': {
-                        'full_name': 'Jalen Hurt',
-                        'email': '[email protected]'
-                    }
-                }
-            },
-            auth=user.auth
-        )
-        assert res.status_code == 201
+        assert notifications['emits'][0]['type'] == NotificationType.Type.PROVIDER_USER_INVITE_PREPRINT
 
 @pytest.mark.django_db
 class TestPreprintContributorBulkCreate(NodeCRUDTestCase):

osf/models/mixins.py

@@ -1499,6 +1499,7 @@ def add_contributors(
             auth=None,
             log=True,
             save=False,
+            notification_type=False,
     ):
         """Add multiple contributors
 
@@ -1520,6 +1521,7 @@ def add_contributors(
                 auth=auth,
                 log=False,
                 save=False,
+                notification_type=notification_type,
             )
         if log and contributors:
             params = self.log_params

website/project/views/contributor.py

@@ -620,6 +620,8 @@ def notify_added_contributor(resource, contributor, notification_type, auth=None
     """
     if not notification_type:
         return
+    if not contributor.email:
+        return
 
     logo = settings.OSF_LOGO
     if getattr(resource, 'has_linked_published_preprints', None):