Skip to content

Commit

Permalink
refactor(tests/oauth): move app_request to first parameter
Browse files Browse the repository at this point in the history
align all test function signatures to have this parameter first
  • Loading branch information
thekaveman committed Jul 18, 2024
1 parent 0fe5d03 commit 0cf0c18
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions tests/pytest/oauth/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ def test_authorize_success(mocked_oauth_client_or_error_redirect__client, mocked
@pytest.mark.django_db
@pytest.mark.usefixtures("mocked_analytics_module")
def test_authorize_success_with_claim_true(
mocked_session_verifier_uses_auth_verification, mocked_oauth_client_or_error_redirect__client, app_request
app_request, mocked_session_verifier_uses_auth_verification, mocked_oauth_client_or_error_redirect__client
):
verifier = mocked_session_verifier_uses_auth_verification.return_value
verifier.auth_provider.claim = "claim"
Expand All @@ -254,9 +254,7 @@ def test_authorize_success_with_claim_true(
@pytest.mark.django_db
@pytest.mark.usefixtures("mocked_analytics_module")
def test_authorize_success_with_claim_false(
mocked_session_verifier_uses_auth_verification,
mocked_oauth_client_or_error_redirect__client,
app_request,
app_request, mocked_session_verifier_uses_auth_verification, mocked_oauth_client_or_error_redirect__client
):
verifier = mocked_session_verifier_uses_auth_verification.return_value
verifier.auth_provider.claim = "claim"
Expand All @@ -273,10 +271,10 @@ def test_authorize_success_with_claim_false(

@pytest.mark.django_db
def test_authorize_success_with_claim_error(
app_request,
mocked_session_verifier_uses_auth_verification,
mocked_oauth_client_or_error_redirect__client,
mocked_analytics_module,
app_request,
):
verifier = mocked_session_verifier_uses_auth_verification.return_value
verifier.auth_provider.claim = "claim"
Expand All @@ -295,7 +293,7 @@ def test_authorize_success_with_claim_error(
@pytest.mark.django_db
@pytest.mark.usefixtures("mocked_analytics_module")
def test_authorize_success_without_verifier_claim(
mocked_session_verifier_uses_auth_verification, mocked_oauth_client_or_error_redirect__client, app_request
app_request, mocked_session_verifier_uses_auth_verification, mocked_oauth_client_or_error_redirect__client
):
verifier = mocked_session_verifier_uses_auth_verification.return_value
verifier.auth_provider.claim = ""
Expand All @@ -319,9 +317,9 @@ def test_authorize_success_without_verifier_claim(
],
)
def test_authorize_success_without_claim_in_response(
app_request,
mocked_session_verifier_uses_auth_verification,
mocked_oauth_client_or_error_redirect__client,
app_request,
access_token_response,
):
verifier = mocked_session_verifier_uses_auth_verification.return_value
Expand All @@ -339,7 +337,7 @@ def test_authorize_success_without_claim_in_response(

@pytest.mark.django_db
@pytest.mark.usefixtures("mocked_session_verifier_uses_auth_verification")
def test_cancel(mocked_analytics_module, app_request):
def test_cancel(app_request, mocked_analytics_module):
unverified_route = reverse(ROUTE_UNVERIFIED)

result = cancel(app_request)
Expand Down Expand Up @@ -376,7 +374,7 @@ def test_logout_no_session_verifier(app_request):

@pytest.mark.django_db
@pytest.mark.usefixtures("mocked_session_verifier_uses_auth_verification")
def test_logout(mocker, mocked_oauth_client_or_error_redirect__client, mocked_analytics_module, app_request):
def test_logout(app_request, mocker, mocked_oauth_client_or_error_redirect__client, mocked_analytics_module):
# logout internally calls deauthorize_redirect
# this mocks that function and a success response
# and returns a spy object we can use to validate calls
Expand All @@ -390,7 +388,7 @@ def test_logout(mocker, mocked_oauth_client_or_error_redirect__client, mocked_an

result = logout(app_request)

mocked_redirect.assert_called_with(mocked_oauth_client, token, "https://testserver/oauth/post-logout")
mocked_redirect.assert_called_with(app_request, mocked_oauth_client, token, "https://testserver/oauth/post-logout")
mocked_analytics_module.started_sign_out.assert_called_once()
assert result.status_code == 200
assert message in str(result.content)
Expand Down

0 comments on commit 0cf0c18

Please sign in to comment.