fix tests

Author: bodintsov

api_tests/registrations/views/test_registration_detail.py

@@ -755,14 +755,14 @@ def test_initiate_withdraw_registration_fails(
         res = app.put_json_api(public_url, public_payload, auth=user.auth, expect_errors=True)
         assert res.status_code == 400
 
-    def test_initiate_withdrawal_success(self, mock_notification_send, app, user, public_registration, public_url, public_payload):
+    def test_initiate_withdrawal_success(self, mock_send_grid, app, user, public_registration, public_url, public_payload):
         res = app.put_json_api(public_url, public_payload, auth=user.auth)
         assert res.status_code == 200
         assert res.json['data']['attributes']['pending_withdrawal'] is True
         public_registration.refresh_from_db()
         assert public_registration.is_pending_retraction
         assert public_registration.registered_from.logs.first().action == 'retraction_initiated'
-        assert mock_notification_send.called
+        assert mock_send_grid.called
 
     @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_initiate_withdrawal_with_embargo_ends_embargo(
@@ -787,7 +787,7 @@ def test_initiate_withdrawal_with_embargo_ends_embargo(
         assert not public_registration.is_pending_embargo
 
     def test_withdraw_request_does_not_send_email_to_unregistered_admins(
-            self, mock_notification_send, app, user, public_registration, public_url, public_payload):
+            self, mock_send_grid, app, user, public_registration, public_url, public_payload):
         unreg = UnregUserFactory()
         with disconnected_from_listeners(contributor_added):
             public_registration.add_unregistered_contributor(
@@ -804,7 +804,7 @@ def test_withdraw_request_does_not_send_email_to_unregistered_admins(
 
         # Only the creator gets an email; the unreg user does not get emailed
         assert public_registration._contributors.count() == 2
-        assert mock_notification_send.call_count == 3
+        assert mock_send_grid.call_count == 3
 
 
 @pytest.mark.django_db

api_tests/requests/views/test_request_detail.py

@@ -4,6 +4,7 @@
 from api_tests.requests.mixins import NodeRequestTestMixin, PreprintRequestTestMixin
 
 @pytest.mark.django_db
+@pytest.mark.usefixtures('mock_notification_send')
 class TestNodeRequestDetail(NodeRequestTestMixin):
     @pytest.fixture()
     def url(self, node_request):

api_tests/users/views/test_user_settings.py

@@ -188,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_notification_send, app, url, user_one):
+    def test_get(self, mock_send_grid, 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_notification_send.called
+        assert mock_send_grid.call_args[1]['to_addr'] == user_one.username
 
     def test_get_invalid_email(self, mock_send_grid, app, url):
         url = f'{url}?email={'invalid_email'}'
@@ -268,8 +268,7 @@ 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, csrf_token):
-        app.set_cookie(CSRF_COOKIE_NAME, csrf_token)
+    def test_throttle(self, app, url, user_one):
         encoded_email = urllib.parse.quote(user_one.email)
         url = f'{url}?email={encoded_email}'
         app.get(url)
@@ -283,12 +282,9 @@ def test_throttle(self, app, url, user_one, csrf_token):
                 }
             }
         }
-        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.'
 
+        res = app.post_json_api(url, payload, expect_errors=True)
+        assert res.status_code == 429
 
 @pytest.mark.django_db
 class TestUserEmailsList: