Update failing test.

mozilla_django_oidc/views.py

@@ -7,19 +7,7 @@
 from django.shortcuts import resolve_url
 from django.urls import reverse
 from django.utils.crypto import get_random_string
-<<<<<<< HEAD
 from django.utils.http import url_has_allowed_host_and_scheme
-=======
-
-try:
-    from django.utils.http import url_has_allowed_host_and_scheme
-except ImportError:
-    # Django <= 2.2
-    from django.utils.http import is_safe_url as url_has_allowed_host_and_scheme
-
-from urllib.parse import urlencode
-
->>>>>>> 4254763 (Support for PKCE)
 from django.utils.module_loading import import_string
 from django.views.generic import View
 

tests/test_utils.py

@@ -120,15 +120,7 @@ def test_generate_code_challenge_invalid_method(self):
         Tests that an exception is raised when an invalid code challenge method is provided.
         """
         code_verifier = "dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk"
-
-        try:
-            generate_code_challenge(code_verifier, "INVALID")
-            self.fail(
-                "generate_code_challenge() should raise an exception when an invalid"
-                " code challenge method is provided."
-            )
-        except ValueError:
-            pass
+        self.assertRaises(ValueError, generate_code_challenge, code_verifier, "INVALID")
 
 
 class SessionStateTestCase(TestCase):

tests/test_views.py

@@ -338,7 +338,9 @@ def make_request():
             with patch("mozilla_django_oidc.views.auth.login") as mock_login:
                 mock_auth.return_value = user
                 response = callback_view(request)
-                mock_auth.assert_called_once_with(nonce=None, request=request)
+                mock_auth.assert_called_once_with(
+                    code_verifier=None, nonce=None, request=request
+                )
                 mock_login.assert_called_once_with(request, user)
         self.assertEqual(response.status_code, 302)
         self.assertEqual(response.url, "/success")
@@ -353,7 +355,9 @@ def make_request():
             with patch("mozilla_django_oidc.views.auth.login") as mock_login:
                 mock_auth.return_value = user
                 response = callback_view(request)
-                mock_auth.assert_called_once_with(nonce=None, request=request)
+                mock_auth.assert_called_once_with(
+                    code_verifier=None, nonce=None, request=request
+                )
                 mock_login.assert_not_called()
         self.assertEqual(response.status_code, 302)
         self.assertEqual(response.url, "/success")