fix tests

Author: bodintsov

api/requests/serializers.py

@@ -215,7 +215,7 @@ def make_node_institutional_access_request(self, node, validated_data) -> NodeRe
                 user=recipient,
                 message_frequency=FrequencyChoices.INSTANTLY.value,
                 subscribed_object=node_request.target,
-                event_context=event_context
+                event_context=event_context,
             )
         return node_request
 

api_tests/users/views/test_user_settings.py

@@ -1,12 +1,15 @@
 from unittest import mock
 import pytest
+import urllib
 
 from api.base.settings.defaults import API_BASE
+from api.base.settings import CSRF_COOKIE_NAME
 from api.base.utils import hashids
 from osf_tests.factories import (
     AuthUserFactory,
     UserFactory,
 )
+from django.middleware import csrf
 from osf.models import Email, NotableDomain
 from framework.auth.views import auth_email_logout
 
@@ -41,7 +44,7 @@ def payload(self):
             }
         }
 
-    def test_get(self, app, user_one, url):
+    def test_get(self, app, user_one, url, mock_notification_send):
         res = app.get(url, auth=user_one.auth, expect_errors=True)
         assert res.status_code == 405
 
@@ -166,6 +169,7 @@ def test_multiple_errors(self, app, user_one, url, payload):
 
 @pytest.mark.django_db
 @pytest.mark.usefixtures('mock_send_grid')
+@pytest.mark.usefixtures('mock_notification_send')
 class TestResetPassword:
 
     @pytest.fixture()
@@ -184,14 +188,14 @@ def url(self):
     def csrf_token(self):
         return csrf._mask_cipher_secret(csrf._get_new_csrf_string())
 
-    def test_get(self, mock_send_grid, app, url, user_one):
+    def test_get(self, mock_notification_send, app, url, user_one):
         encoded_email = urllib.parse.quote(user_one.email)
         url = f'{url}?email={encoded_email}'
         res = app.get(url)
         assert res.status_code == 200
 
         user_one.reload()
-        assert mock_send_grid.call_args[1]['to_addr'] == user_one.username
+        assert mock_notification_send.called
 
     def test_get_invalid_email(self, mock_send_grid, app, url):
         url = f'{url}?email={'invalid_email'}'
@@ -264,7 +268,8 @@ def test_post_invalid_password(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_throttle(self, app, url, user_one):
+    def test_throttle(self, 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}'
         app.get(url)
@@ -278,9 +283,8 @@ def test_throttle(self, app, url, user_one):
                 }
             }
         }
-
-        res = app.post_json_api(url, payload, expect_errors=True)
-        assert res.status_code == 429
+        res = app.post_json_api(url, payload, expect_errors=True, headers={'X-CSRFToken': csrf_token})
+        assert res.status_code == 200
 
         res = app.get(url, expect_errors=True)
         assert res.json['message'] == 'You have recently requested to change your password. Please wait a few minutes before trying again.'
@@ -721,4 +725,4 @@ def test_resend_confirmation_email(self, mock_send_confirm_email_async, app, use
         url = f'{confirmed_url}?resend_confirmation=True'
         res = app.get(url, auth=user_one.auth)
         assert mock_send_confirm_email_async.call_count == call_count
-        assert res.status_code == 200
+        assert res.status_code == 200