fix unit tests

Author: Ostap-Zherebetskyi

api_tests/institutions/views/test_institution_auth.py

@@ -497,6 +497,7 @@ def test_user_external_unconfirmed(self, app, institution, url_auth_institution)
 
 
 @pytest.mark.django_db
+@pytest.mark.usefixtures('mock_notification_send')
 class TestInstitutionStorageRegion:
 
     def test_region_updated_for_new_user(self, app, institution_region_preferred, institution_without_user_default_region, url_auth_institution):
@@ -541,6 +542,7 @@ def test_region_not_updated_for_existing_user_not_affiliated(self, app, institut
 
 
 @pytest.mark.django_db
+@pytest.mark.usefixtures('mock_notification_send')
 class TestInstitutionAuthnSharedSSOCriteriaType2:
 
     def test_new_user_primary_only(self, app, url_auth_institution, type_2_ineligible_user_roles,
@@ -795,6 +797,7 @@ def test_empty_criteria_value(self, app, url_auth_institution,
 
 
 @pytest.mark.django_db
+@pytest.mark.usefixtures('mock_notification_send')
 class TestInstitutionAuthnSharedSSOCriteriaType1:
 
     def test_new_user_primary_only(self, app, url_auth_institution,
@@ -1044,6 +1047,7 @@ def test_invalid_criteria_value(self, app, url_auth_institution,
 
 
 @pytest.mark.django_db
+@pytest.mark.usefixtures('mock_notification_send')
 class TestInstitutionAuthnSelectiveSSOCriteriaType1:
 
     def test_selective_sso_allowed_new_user(self, app, url_auth_institution, institution_selective_type_1):
@@ -1133,6 +1137,7 @@ def test_selective_sso_denied_invalid_filter(self, app, url_auth_institution, in
 
 
 @pytest.mark.django_db
+@pytest.mark.usefixtures('mock_notification_send')
 class TestInstitutionAuthnSelectiveSSOCriteriaType2:
 
     def test_selective_sso_allowed_new_user(self, app, url_auth_institution, institution_selective_type_2):
@@ -1222,6 +1227,7 @@ def test_selective_sso_denied_invalid_filter(self, app, url_auth_institution, in
 
 
 @pytest.mark.django_db
+@pytest.mark.usefixtures('mock_notification_send')
 class TestInstitutionAuthnWithIdentity:
 
     def test_new_user(self, app, url_auth_institution, institution):

api_tests/logs/views/test_log_params.py

@@ -12,6 +12,7 @@
 
 
 @pytest.mark.django_db
+@pytest.mark.usefixtures('mock_notification_send')
 class TestLogContributors(LogsTestCase):
 
     def test_contributor_added_log_has_contributor_info_in_params(

api_tests/nodes/views/test_node_contributors_detail.py

@@ -67,6 +67,7 @@ def url_private(self, node, user_id):
 
 @pytest.mark.django_db
 @pytest.mark.enable_implicit_clean
+@pytest.mark.usefixtures('mock_notification_send')
 class TestContributorDetail(ContributorDetailMixin):
     def test_get_public_contributor_detail(self, app, user, project_public, project_private, url_public):
         res = app.get(url_public)
@@ -169,6 +170,7 @@ def test_detail_includes_index(self, app, user, project_public, url_public):
         assert res.json['data']['attributes']['index'] == 1
 
 
+@pytest.mark.usefixtures('mock_notification_send')
 class TestNodeContributorDetail(TestContributorDetail):
 
     def test_detail_includes_is_curator(

api_tests/nodes/views/test_node_contributors_list.py

@@ -27,6 +27,7 @@ def user():
 
 @pytest.mark.django_db
 @pytest.mark.enable_implicit_clean
+@pytest.mark.usefixtures('mock_notification_send')
 class NodeCRUDTestCase:
 
     @pytest.fixture()
@@ -1202,15 +1203,14 @@ def test_add_contributor_validation(
 @pytest.mark.django_db
 @pytest.mark.enable_bookmark_creation
 @pytest.mark.enable_enqueue_task
-@pytest.mark.usefixtures('mock_send_grid')
 class TestNodeContributorCreateEmail(NodeCRUDTestCase):
 
     @pytest.fixture()
     def url_project_contribs(self, project_public):
         return f'/{API_BASE}nodes/{project_public._id}/contributors/'
 
     def test_add_contributor_no_email_if_false(
-        self, mock_send_grid, app, user, url_project_contribs
+        self, mock_notification_send, app, user, url_project_contribs
     ):
         url = f'{url_project_contribs}?send_email=false'
         payload = {
@@ -1221,10 +1221,10 @@ def test_add_contributor_no_email_if_false(
         }
         res = app.post_json_api(url, payload, auth=user.auth)
         assert res.status_code == 201
-        assert mock_send_grid.call_count == 0
+        assert mock_notification_send.call_count == 0
 
     def test_add_contributor_sends_email(
-        self, mock_send_grid, app, user, user_two, url_project_contribs
+        self, mock_notification_send, app, user, user_two, url_project_contribs
     ):
         url = f'{url_project_contribs}?send_email=default'
         payload = {
@@ -1239,7 +1239,6 @@ def test_add_contributor_sends_email(
 
         res = app.post_json_api(url, payload, auth=user.auth)
         assert res.status_code == 201
-        assert mock_send_grid.call_count == 1
 
     @mock.patch('website.project.signals.contributor_added.send')
     def test_add_contributor_signal_if_default(
@@ -1281,7 +1280,7 @@ def test_add_contributor_signal_preprint_email_disallowed(
         )
 
     def test_add_unregistered_contributor_sends_email(
-        self, mock_send_grid, app, user, url_project_contribs
+        self, mock_notification_send, app, user, url_project_contribs
     ):
         url = f'{url_project_contribs}?send_email=default'
         payload = {
@@ -1292,7 +1291,7 @@ def test_add_unregistered_contributor_sends_email(
         }
         res = app.post_json_api(url, payload, auth=user.auth)
         assert res.status_code == 201
-        assert mock_send_grid.call_count == 1
+        assert mock_notification_send.call_count == 1
 
     @mock.patch('website.project.signals.unreg_contributor_added.send')
     def test_add_unregistered_contributor_signal_if_default(
@@ -1328,7 +1327,7 @@ def test_add_unregistered_contributor_signal_preprint_email_disallowed(
         )
 
     def test_add_contributor_invalid_send_email_param(
-        self, mock_send_grid, app, user, url_project_contribs
+        self, mock_notification_send, app, user, url_project_contribs
     ):
         url = f'{url_project_contribs}?send_email=true'
         payload = {
@@ -1342,10 +1341,10 @@ def test_add_contributor_invalid_send_email_param(
         assert (
             res.json['errors'][0]['detail'] == 'true is not a valid email preference.'
         )
-        assert mock_send_grid.call_count == 0
+        assert mock_notification_send.call_count == 0
 
     def test_add_unregistered_contributor_without_email_no_email(
-        self, mock_send_grid, app, user, url_project_contribs
+        self, mock_notification_send, app, user, url_project_contribs
     ):
         url = f'{url_project_contribs}?send_email=default'
         payload = {
@@ -1361,7 +1360,7 @@ def test_add_unregistered_contributor_without_email_no_email(
             res = app.post_json_api(url, payload, auth=user.auth)
         assert contributor_added in mock_signal.signals_sent()
         assert res.status_code == 201
-        assert mock_send_grid.call_count == 0
+        assert mock_notification_send.call_count == 0
 
 
 @pytest.mark.django_db

api_tests/nodes/views/test_node_list.py

@@ -1311,6 +1311,7 @@ def url(self):
 
 @pytest.mark.django_db
 @pytest.mark.enable_implicit_clean
+@pytest.mark.usefixtures('mock_notification_send')
 class TestNodeCreate:
 
     @pytest.fixture()
@@ -1600,7 +1601,7 @@ def test_create_component_with_tags(self, app, user_one, title, category):
         assert tag2.name == 'test tag 2'
 
     def test_create_component_inherit_contributors_with_blocked_email(
-            self, app, user_one, title, category):
+            self, app, user_one, title, category, mock_notification_send):
         parent_project = ProjectFactory(creator=user_one)
         parent_project.add_unregistered_contributor(
             fullname='far', email='[email protected]',

api_tests/preprints/views/test_preprint_contributors_detail.py

@@ -21,6 +21,7 @@ def user():
 
 @pytest.mark.django_db
 @pytest.mark.enable_implicit_clean
+@pytest.mark.usefixtures('mock_notification_send')
 class TestPreprintContributorDetail:
 
     @pytest.fixture()

api_tests/preprints/views/test_preprint_contributors_list.py

@@ -26,6 +26,7 @@
 
 
 @pytest.mark.django_db
+@pytest.mark.usefixtures('mock_notification_send')
 class NodeCRUDTestCase:
 
     @pytest.fixture()
@@ -1421,7 +1422,7 @@ def test_add_contributor_signal_if_preprint(
         assert 'preprint' == kwargs['email_template']
 
     def test_add_unregistered_contributor_sends_email(
-            self, mock_send_grid, app, user, url_preprint_contribs):
+            self, app, user, url_preprint_contribs, mock_notification_send):
         url = f'{url_preprint_contribs}?send_email=preprint'
         payload = {
             'data': {
@@ -1433,10 +1434,10 @@ def test_add_unregistered_contributor_sends_email(
             }
         }
 
-        mock_send_grid.reset_mock()
+        mock_notification_send.reset_mock()
         res = app.post_json_api(url, payload, auth=user.auth)
         assert res.status_code == 201
-        assert mock_send_grid.call_count == 1
+        assert mock_notification_send.call_count == 1
 
     @mock.patch('website.project.signals.unreg_contributor_added.send')
     def test_add_unregistered_contributor_signal_if_preprint(

api_tests/providers/tasks/test_bulk_upload.py

@@ -64,6 +64,7 @@ def test_error_message_default(self):
 
 @pytest.mark.django_db
 @pytest.mark.usefixtures('mock_send_grid')
+@pytest.mark.usefixtures('mock_notification_send')
 class TestBulkUploadTasks:
 
     @pytest.fixture()

api_tests/users/views/test_user_claim.py

@@ -13,6 +13,7 @@
 
 @pytest.mark.django_db
 @pytest.mark.usefixtures('mock_send_grid')
+@pytest.mark.usefixtures('mock_notification_send')
 class TestClaimUser:
 
     @pytest.fixture()
@@ -116,14 +117,14 @@ def test_claim_unauth_failure(self, app, url, unreg_user, project, wrong_preprin
         )
         assert res.status_code == 401
 
-    def test_claim_unauth_success_with_original_email(self, app, url, project, unreg_user, mock_send_grid):
-        mock_send_grid.reset_mock()
+    def test_claim_unauth_success_with_original_email(self, app, url, project, unreg_user, mock_notification_send):
+        mock_notification_send.reset_mock()
         res = app.post_json_api(
             url.format(unreg_user._id),
             self.payload(email='[email protected]', id=project._id),
         )
         assert res.status_code == 204
-        assert mock_send_grid.call_count == 1
+        assert mock_notification_send.call_count == 1
 
     def test_claim_unauth_success_with_claimer_email(self, app, url, unreg_user, project, claimer, mock_send_grid):
         mock_send_grid.reset_mock()
@@ -134,23 +135,23 @@ def test_claim_unauth_success_with_claimer_email(self, app, url, unreg_user, pro
         assert res.status_code == 204
         assert mock_send_grid.call_count == 2
 
-    def test_claim_unauth_success_with_unknown_email(self, app, url, project, unreg_user, mock_send_grid):
-        mock_send_grid.reset_mock()
+    def test_claim_unauth_success_with_unknown_email(self, app, url, project, unreg_user, mock_notification_send):
+        mock_notification_send.reset_mock()
         res = app.post_json_api(
             url.format(unreg_user._id),
             self.payload(email='[email protected]', id=project._id),
         )
         assert res.status_code == 204
-        assert mock_send_grid.call_count == 2
+        assert mock_notification_send.call_count == 2
 
-    def test_claim_unauth_success_with_preprint_id(self, app, url, preprint, unreg_user, mock_send_grid):
-        mock_send_grid.reset_mock()
+    def test_claim_unauth_success_with_preprint_id(self, app, url, preprint, unreg_user, mock_notification_send):
+        mock_notification_send.reset_mock()
         res = app.post_json_api(
             url.format(unreg_user._id),
             self.payload(email='[email protected]', id=preprint._id),
         )
         assert res.status_code == 204
-        assert mock_send_grid.call_count == 1
+        assert mock_notification_send.call_count == 1
 
     def test_claim_auth_failure(self, app, url, claimer, wrong_preprint, project, unreg_user, referrer):
         _url = url.format(unreg_user._id)

notifications.yaml

@@ -59,6 +59,11 @@ notification_types:
     object_content_type_model_name: osfuser
     template: 'website/templates/emails/forward_invite.html.mako'
     notification_freq_default: instantly
+  - name: external_confirm_success
+    __docs__: ...
+    object_content_type_model_name: osfuser
+    template: 'website/templates/emails/external_confirm_success.html.mako'
+    notification_freq_default: instantly
 
   #### PROVIDER
   - name: new_pending_submissions