fix unit tests

Author: Ostap-Zherebetskyi

api_tests/institutions/views/test_institution_auth.py

@@ -16,7 +16,7 @@
 
 from osf.models import OSFUser, InstitutionAffiliation, InstitutionStorageRegion
 from osf.models.institution import SsoFilterCriteriaAction
-from osf_tests.factories import InstitutionFactory, ProjectFactory, UserFactory, RegionFactory
+from osf_tests.factories import InstitutionFactory, ProjectFactory, UserFactory, RegionFactory, NotificationTypeFactory
 
 from tests.base import capture_signals
 
@@ -183,8 +183,14 @@ def type_2_ineligible_user_roles():
 
 
 @pytest.mark.django_db
+@pytest.mark.usefixtures('mock_notification_send')
 class TestInstitutionAuth:
 
+    @pytest.fixture()
+    def notification_type(self):
+        NotificationTypeFactory(name='password_reset', notification_interval_choices=['instantly'])
+        return
+
     def test_invalid_payload(self, app, url_auth_institution):
         res = app.post(url_auth_institution, 'INVALID_PAYLOAD', expect_errors=True)
         assert res.status_code == 403
@@ -280,7 +286,7 @@ def test_new_user_names_used_when_provided(self, app, institution, url_auth_inst
         assert user.given_name == 'Foo'
         assert user.family_name == 'Bar'
 
-    def test_user_active(self, app, institution, url_auth_institution):
+    def test_user_active(self, notification_type, mock_notification_send, app, institution, url_auth_institution):
 
         username, fullname, password = '[email protected]', 'Foo Bar', 'FuAsKeEr'
         user = make_user(username, fullname)
@@ -399,7 +405,7 @@ def test_user_unconfirmed(self, app, institution, url_auth_institution):
         # Confirm affiliation
         assert institution in user.get_affiliated_institutions()
 
-    def test_user_inactive(self, app, institution, url_auth_institution):
+    def test_user_inactive(self, notification_type, mock_notification_send, app, institution, url_auth_institution):
 
         username, fullname, password = '[email protected]', 'Foo Bar', 'FuAsKeEr'
         user = make_user(username, fullname)

api_tests/users/views/test_user_external_login.py

@@ -5,16 +5,22 @@
 from api.base.settings.defaults import API_BASE
 from api.base.settings import CSRF_COOKIE_NAME
 from osf.models import OSFUser
-from osf_tests.factories import UserFactory
+from osf_tests.factories import UserFactory, NotificationTypeFactory
 from importlib import import_module
 from django.conf import settings as django_conf_settings
 
 SessionStore = import_module(django_conf_settings.SESSION_ENGINE).SessionStore
 
 
 @pytest.mark.django_db
+@pytest.mark.usefixtures('mock_notification_send')
 class TestExternalLogin:
 
+    @pytest.fixture()
+    def notification_type(self):
+        NotificationTypeFactory(name='password_reset', notification_interval_choices=['instantly'])
+        return
+
     @pytest.fixture()
     def user_one(self):
         user = UserFactory()
@@ -73,7 +79,7 @@ def test_invalid_payload(self, app, url, session_data, csrf_token):
         res = app.post_json_api(url, payload, expect_errors=True, headers={'X-CSRFToken': csrf_token})
         assert res.status_code == 400
 
-    def test_existing_user(self, app, payload, url, user_one, session_data, csrf_token):
+    def test_existing_user(self, notification_type, mock_notification_send, app, payload, url, user_one, session_data, csrf_token):
         app.set_cookie(CSRF_COOKIE_NAME, csrf_token)
         app.set_cookie(settings.COOKIE_NAME, str(session_data))
         payload['data']['attributes']['email'] = user_one.username

api_tests/users/views/test_user_settings.py

@@ -29,13 +29,20 @@ def unconfirmed_address():
 
 
 @pytest.mark.django_db
+@pytest.mark.usefixtures('mock_notification_send')
 @pytest.mark.usefixtures('mock_send_grid')
 class TestUserRequestExport:
 
     @pytest.fixture()
     def url(self, user_one):
         return f'/{API_BASE}users/{user_one._id}/settings/export/'
 
+    @pytest.fixture()
+    def notification_type(self):
+        NotificationTypeFactory(name='forgot_password', notification_interval_choices=['instantly'])
+        NotificationTypeFactory(name='password_reset', notification_interval_choices=['instantly'])
+        return
+
     @pytest.fixture()
     def payload(self):
         return {
@@ -45,11 +52,11 @@ def payload(self):
             }
         }
 
-    def test_get(self, app, user_one, url):
+    def test_get(self, notification_type, app, user_one, url):
         res = app.get(url, auth=user_one.auth, expect_errors=True)
         assert res.status_code == 405
 
-    def test_post(self, mock_send_grid, app, user_one, user_two, url, payload):
+    def test_post(self, notification_type, mock_send_grid, mock_notification_send, app, user_one, user_two, url, payload):
         # Logged out
         res = app.post_json_api(url, payload, expect_errors=True)
         assert res.status_code == 401
@@ -66,16 +73,16 @@ def test_post(self, mock_send_grid, app, user_one, user_two, url, payload):
         assert user_one.email_last_sent is not None
         assert mock_send_grid.call_count == 1
 
-    def test_post_invalid_type(self, mock_send_grid, app, user_one, url, payload):
+    def test_post_invalid_type(self, notification_type, mock_notification_send, app, user_one, url, payload):
         assert user_one.email_last_sent is None
         payload['data']['type'] = 'Invalid Type'
         res = app.post_json_api(url, payload, auth=user_one.auth, expect_errors=True)
         assert res.status_code == 409
         user_one.reload()
         assert user_one.email_last_sent is None
-        assert mock_send_grid.call_count == 0
+        assert mock_notification_send.call_count == 0
 
-    def test_exceed_throttle(self, app, user_one, url, payload):
+    def test_exceed_throttle(self, notification_type, app, user_one, url, payload):
         assert user_one.email_last_sent is None
         res = app.post_json_api(url, payload, auth=user_one.auth)
         assert res.status_code == 204
@@ -88,6 +95,7 @@ def test_exceed_throttle(self, app, user_one, url, payload):
 
 
 @pytest.mark.django_db
+@pytest.mark.usefixtures('mock_notification_send')
 class TestUserChangePassword:
 
     @pytest.fixture()
@@ -98,6 +106,12 @@ def user_one(self):
         user.save()
         return user
 
+    @pytest.fixture()
+    def notification_type(self):
+        NotificationTypeFactory(name='forgot_password', notification_interval_choices=['instantly'])
+        NotificationTypeFactory(name='password_reset', notification_interval_choices=['instantly'])
+        return
+
     @pytest.fixture()
     def url(self, user_one):
         return f'/{API_BASE}users/{user_one._id}/settings/password/'
@@ -115,11 +129,11 @@ def payload(self, user_one):
             }
         }
 
-    def test_get(self, app, user_one, url):
+    def test_get(self, notification_type, app, user_one, url):
         res = app.get(url, auth=user_one.auth, expect_errors=True)
         assert res.status_code == 405
 
-    def test_post(self, app, user_one, user_two, url, payload):
+    def test_post(self, notification_type, app, user_one, user_two, url, payload):
         # Logged out
         res = app.post_json_api(url, payload, expect_errors=True)
         assert res.status_code == 401
@@ -134,12 +148,12 @@ def test_post(self, app, user_one, user_two, url, payload):
         user_one.reload()
         assert user_one.check_password('password2')
 
-    def test_post_invalid_type(self, app, user_one, url, payload):
+    def test_post_invalid_type(self, notification_type, app, user_one, url, payload):
         payload['data']['type'] = 'Invalid Type'
         res = app.post_json_api(url, payload, auth=user_one.auth, expect_errors=True)
         assert res.status_code == 409
 
-    def test_exceed_throttle_failed_attempts(self, app, user_one, url, payload):
+    def test_exceed_throttle_failed_attempts(self, notification_type, app, user_one, url, payload):
         payload['data']['attributes']['existing_password'] = 'wrong password'
         payload['data']['attributes']['new_password'] = 'password2'
         res = app.post_json_api(url, payload, auth=user_one.auth, expect_errors=True)
@@ -159,7 +173,7 @@ def test_exceed_throttle_failed_attempts(self, app, user_one, url, payload):
         # Expected time is omitted to prevent probabilistic failures.
         assert 'Request was throttled. Expected available in ' in res.json['errors'][0]['detail']
 
-    def test_multiple_errors(self, app, user_one, url, payload):
+    def test_multiple_errors(self, notification_type, app, user_one, url, payload):
         payload['data']['attributes']['existing_password'] = 'wrong password'
         payload['data']['attributes']['new_password'] = '!'
         res = app.post_json_api(url, payload, auth=user_one.auth, expect_errors=True)
@@ -203,13 +217,13 @@ def test_get(self, mock_notification_send, notification_type, app, url, user_one
         user_one.reload()
         assert mock_notification_send.called
 
-    def test_get_invalid_email(self, mock_notification_send, app, url, notification_type):
+    def test_get_invalid_email(self, notification_type, mock_notification_send, app, url):
         url = f'{url}?email={'invalid_email'}'
         res = app.get(url)
         assert res.status_code == 200
         assert not mock_notification_send.called
 
-    def test_post(self, mock_notification_send, app, url, user_one, csrf_token, notification_type):
+    def test_post(self, notification_type, mock_notification_send, app, url, user_one, csrf_token):
         app.set_cookie(CSRF_COOKIE_NAME, csrf_token)
         encoded_email = urllib.parse.quote(user_one.email)
         url = f'{url}?email={encoded_email}'
@@ -231,7 +245,7 @@ def test_post(self, mock_notification_send, app, url, user_one, csrf_token, noti
         assert user_one.check_password('password2')
         assert mock_notification_send.called
 
-    def test_post_empty_payload(self, app, url, csrf_token):
+    def test_post_empty_payload(self, notification_type, app, url, csrf_token):
         app.set_cookie(CSRF_COOKIE_NAME, csrf_token)
         payload = {
             'data': {
@@ -242,7 +256,7 @@ def test_post_empty_payload(self, app, url, csrf_token):
         res = app.post_json_api(url, payload, expect_errors=True, headers={'X-CSRFToken': csrf_token})
         assert res.status_code == 400
 
-    def test_post_invalid_token(self, app, url, user_one, csrf_token):
+    def test_post_invalid_token(self, notification_type, app, url, user_one, csrf_token):
         app.set_cookie(CSRF_COOKIE_NAME, csrf_token)
         payload = {
             'data': {
@@ -256,7 +270,7 @@ def test_post_invalid_token(self, app, url, user_one, csrf_token):
         res = app.post_json_api(url, payload, expect_errors=True, headers={'X-THROTTLE-TOKEN': 'test-token', 'X-CSRFToken': csrf_token})
         assert res.status_code == 400
 
-    def test_post_invalid_password(self, app, url, user_one, csrf_token, notification_type):
+    def test_post_invalid_password(self, notification_type, app, url, user_one, csrf_token):
         app.set_cookie(CSRF_COOKIE_NAME, csrf_token)
         encoded_email = urllib.parse.quote(user_one.email)
         url = f'{url}?email={encoded_email}'
@@ -275,7 +289,7 @@ def test_post_invalid_password(self, app, url, user_one, csrf_token, notificatio
         res = app.post_json_api(url, payload, expect_errors=True, headers={'X-THROTTLE-TOKEN': 'test-token', 'X-CSRFToken': csrf_token})
         assert res.status_code == 400
 
-    def test_throrrle(self, app, url, user_one, notification_type):
+    def test_throrrle(self, notification_type, app, url, user_one):
         encoded_email = urllib.parse.quote(user_one.email)
         url = f'{url}?email={encoded_email}'
         res = app.get(url)

osf_tests/test_auth_utils.py

@@ -2,18 +2,24 @@
 
 from framework.auth.core import get_user
 
-from .factories import UserFactory
+from .factories import UserFactory, NotificationTypeFactory
 
 # from tests/test_auth
 @pytest.mark.django_db
+@pytest.mark.usefixtures('mock_notification_send')
 class TestGetUser:
 
+    @pytest.fixture()
+    def notification_type(self):
+        NotificationTypeFactory(name='password_reset', notification_interval_choices=['instantly'])
+        return
+
     def test_get_user_by_email(self):
         user = UserFactory()
         assert get_user(email=user.username) == user
         assert get_user(email=user.username.upper()) == user
 
-    def test_get_user_with_wrong_password_returns_false(self):
+    def test_get_user_with_wrong_password_returns_false(self, mock_notification_send, notification_type):
         user = UserFactory.build()
         user.set_password('killerqueen')
         assert bool(