Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Jul 9, 2024
1 parent 6aad2d8 commit e95c4d8
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 12 deletions.
1 change: 0 additions & 1 deletion authentication/api_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from django.db import IntegrityError

from authentication import api
from courseware.api_test import mock_validate_user_registration
from users.factories import UserFactory
from users.serializers import UserSerializer

Expand Down
1 change: 0 additions & 1 deletion authentication/pipeline/user_test.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"""Tests of user pipeline actions"""

import pytest
from courseware.api_test import mock_validate_user_registration
from django.contrib.sessions.middleware import SessionMiddleware
from social_core.backends.email import EmailAuth
from social_core.exceptions import AuthAlreadyAssociated
Expand Down
6 changes: 4 additions & 2 deletions courseware/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,9 @@ def get_edx_api_registration_client():
EdxApi: edx api registration client instance
"""
registration_access_token = (
settings.MITXPRO_REGISTRATION_ACCESS_TOKEN if settings.MITXPRO_REGISTRATION_ACCESS_TOKEN else ""
settings.MITXPRO_REGISTRATION_ACCESS_TOKEN
if settings.MITXPRO_REGISTRATION_ACCESS_TOKEN
else ""
)

return EdxApi(
Expand Down Expand Up @@ -854,5 +856,5 @@ def validate_name_with_edx(name):
name=name,
)
).name
except Exception as exc: # noqa: BLE001
except Exception as exc:
raise EdxApiRegistrationValidationException(name, exc.response) from exc
14 changes: 7 additions & 7 deletions courseware/api_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,7 @@ def mock_validate_user_registration(mocker):
mock_client = mocker.MagicMock()
mock_client.user_validation.validate_user_registration.return_value = mock_response
mocker.patch(
"courseware.api.get_edx_api_registration_client",
return_value=mock_client
"courseware.api.get_edx_api_registration_client", return_value=mock_client
)

return mock_client
Expand Down Expand Up @@ -151,6 +150,7 @@ def test_validate_name_with_edx_failure(mocker):

class MockApiException(Exception): # noqa: N818
"""Mock exception for API errors with a response attribute."""

def __init__(self, message, response):
super().__init__(message)
self.response = response
Expand All @@ -161,12 +161,11 @@ def __init__(self, message, response):
mock_response.text = "Some error details"

mock_client = mocker.MagicMock()
mock_client.user_validation.validate_user_registration.side_effect = MockApiException(
"API error", response=mock_response
mock_client.user_validation.validate_user_registration.side_effect = (
MockApiException("API error", response=mock_response)
)
mocker.patch(
"courseware.api.get_edx_api_registration_client",
return_value=mock_client
"courseware.api.get_edx_api_registration_client", return_value=mock_client
)

with pytest.raises(EdxApiRegistrationValidationException) as exc_info:
Expand All @@ -177,9 +176,10 @@ def __init__(self, message, response):
assert (
str(exc_info.value)
== f"EdX API error validating registration name {name}.\nResponse - code: {mock_response.status_code}, "
f"content: {mock_response.text}"
f"content: {mock_response.text}"
)


@pytest.fixture
def create_token_responses(settings):
"""Mock responses for creating an auth token"""
Expand Down
1 change: 0 additions & 1 deletion users/views_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from rest_framework import status
from social_django.models import UserSocialAuth

from courseware.api_test import mock_validate_user_registration
from mitxpro.test_utils import drf_datetime
from mitxpro.utils import now_in_utc
from users.api import User
Expand Down

0 comments on commit e95c4d8

Please sign in to comment.