Fix tests

Author: st4lk

.python-version

@@ -0,0 +1 @@
+3.12.3

requirements_test.txt

@@ -1,5 +1,6 @@
 pytest-django==4.5.2
-httpretty==1.1.4
 unittest2==1.1.0
 django-sslserver>=0.22
-flake8==4.0.0
+flake8==7.2.0
+responses==0.25.7
+typing_extensions==4.13.2

tests/base.py

@@ -1,6 +1,6 @@
 import json
 
-from httpretty import HTTPretty
+import responses
 from social_core.backends.utils import load_backends
 from social_core.tests.backends.test_facebook import FacebookOAuth2Test
 from social_core.tests.backends.test_twitter import TwitterOAuth1Test
@@ -19,14 +19,20 @@
 
 # don't run third party tests
 for attr in (attr for attr in dir(FacebookOAuth2Test) if attr.startswith('test_')):
-    delattr(FacebookOAuth2Test, attr)
+    try:
+        delattr(FacebookOAuth2Test, attr)
+    except AttributeError:
+        pass
 for attr in (attr for attr in dir(TwitterOAuth1Test) if attr.startswith('test_')):
-    delattr(TwitterOAuth1Test, attr)
+    try:
+        delattr(TwitterOAuth1Test, attr)
+    except AttributeError:
+        pass
 
 
 class RestSocialMixin:
     def setUp(self):
-        HTTPretty.enable(allow_net_connect=False)
+        responses.start()
         Backend = module_member(self.backend_path)
         self.strategy = views.load_strategy()
         self.backend = Backend(self.strategy, redirect_uri=self.complete_url)
@@ -50,9 +56,8 @@ def setUp(self):
         self.do_rest_login()
 
     def tearDown(self):
-
-        HTTPretty.disable()
-        HTTPretty.reset()
+        responses.stop()
+        responses.reset()
         self.backend = None
         self.strategy = None
         self.name = None
@@ -71,6 +76,22 @@ def do_rest_login(self):
         self.auth_handlers(start_url)
         self.pre_complete_callback(start_url)
 
+    def setup_api_mocks(self):
+        # Add missing mocks for access token and user data endpoints
+        responses.reset()
+        responses.add(
+            responses.GET,
+            self.backend.access_token_url(),
+            body=self.access_token_body,
+            status=self.access_token_status
+        )
+        responses.add(
+            responses.GET,
+            self.user_data_url,
+            body=self.user_data_body,
+            status=200
+        )
+
 
 class BaseTwitterApiTestCase(RestSocialMixin, TwitterOAuth1Test):
 

tests/test_session.py

@@ -7,7 +7,7 @@
 from django.test.utils import override_settings
 from rest_framework.test import APITestCase
 from rest_framework.permissions import DjangoModelPermissionsOrAnonReadOnly
-from httpretty import HTTPretty
+import responses
 from social_core.utils import parse_qs
 
 from .base import BaseFacebookAPITestCase, BaseTwitterApiTestCase
@@ -43,6 +43,7 @@ class TestSocialAuth2(APITestCase, BaseFacebookAPITestCase):
 
     @modify_settings(**session_modify_settings)
     def _check_login_social_session(self, url, data):
+        self.setup_api_mocks()
         resp = self.client.post(url, data)
         self.assertEqual(resp.status_code, 200)
         self.assertEqual(resp.data['email'], self.email)
@@ -75,31 +76,34 @@ def test_unknown_provider_session(self):
         self.assertEqual(resp.status_code, 404)
 
     def test_login_social_http_origin(self):
+        self.setup_api_mocks()
         resp = self.client.post(
             reverse('login_social_session'),
             data={'provider': 'facebook', 'code': '3D52VoM1uiw94a1ETnGvYlCw'},
             HTTP_ORIGIN="http://frontend.com")
         self.assertEqual(resp.status_code, 200)
-        url_params = dict(parse_qsl(urlparse(HTTPretty.latest_requests[0].path).query))
+        url_params = dict(parse_qsl(urlparse(responses.calls[0].request.path_url).query))
         self.assertEqual(url_params['redirect_uri'], "http://frontend.com/")
 
     @override_settings(REST_SOCIAL_OAUTH_ABSOLUTE_REDIRECT_URI='http://myproject.com/')
     def test_login_absolute_redirect(self):
+        self.setup_api_mocks()
         resp = self.client.post(
             reverse('login_social_session'),
             data={'provider': 'facebook', 'code': '3D52VoM1uiw94a1ETnGvYlCw'})
         self.assertEqual(resp.status_code, 200)
-        url_params = dict(parse_qsl(urlparse(HTTPretty.latest_requests[0].path).query))
+        url_params = dict(parse_qsl(urlparse(responses.calls[0].request.path_url).query))
         self.assertEqual('http://myproject.com/', url_params['redirect_uri'])
 
     @override_settings(REST_SOCIAL_OAUTH_ABSOLUTE_REDIRECT_URI='http://myproject.com/')
     def test_login_manual_redirect(self):
+        self.setup_api_mocks()
         resp = self.client.post(
             reverse('login_social_session'),
             data={'provider': 'facebook', 'code': '3D52VoM1uiw94a1ETnGvYlCw',
                   'redirect_uri': 'http://manualdomain.com/'})
         self.assertEqual(resp.status_code, 200)
-        url_params = dict(parse_qsl(urlparse(HTTPretty.latest_requests[0].path).query))
+        url_params = dict(parse_qsl(urlparse(responses.calls[0].request.path_url).query))
         self.assertEqual('http://manualdomain.com/', url_params['redirect_uri'])
 
     @mock.patch('rest_framework.views.APIView.permission_classes')

tests/test_token.py

@@ -19,6 +19,20 @@
         'users',
     ],
     MIDDLEWARE=[],
+    SOCIAL_AUTH_PIPELINE=(
+        'users.social_pipeline.auto_logout',  # custom action
+        'social_core.pipeline.social_auth.social_details',
+        'social_core.pipeline.social_auth.social_uid',
+        'social_core.pipeline.social_auth.auth_allowed',
+        'users.social_pipeline.check_for_email',  # custom action
+        'social_core.pipeline.social_auth.social_user',
+        'social_core.pipeline.user.get_username',
+        'social_core.pipeline.user.create_user',
+        'social_core.pipeline.social_auth.associate_user',
+        'social_core.pipeline.social_auth.load_extra_data',
+        'social_core.pipeline.user.user_details',
+        'users.social_pipeline.save_avatar',  # custom action
+    ),
 )
 
 
@@ -42,6 +56,7 @@ def test_login_social_oauth1_token(self):
 class TestSocialAuth2Token(APITestCase, BaseFacebookAPITestCase):
 
     def _check_login_social_token_user(self, url, data):
+        self.setup_api_mocks()
         resp = self.client.post(url, data)
         self.assertEqual(resp.status_code, 200)
         self.assertEqual(resp.data['email'], self.email)
@@ -51,6 +66,7 @@ def _check_login_social_token_user(self, url, data):
         self.assertEqual(token.user.email, self.email)
 
     def _check_login_social_token_only(self, url, data):
+        self.setup_api_mocks()
         resp = self.client.post(url, data)
         self.assertEqual(resp.status_code, 200)
         # check token exists
@@ -79,10 +95,15 @@ def test_login_social_token_only_provider_in_url(self):
             data={'code': '3D52VoM1uiw94a1ETnGvYlCw'})
 
     def test_user_login_with_no_email(self):
+        # Modify user data to have no email BEFORE setting up the test
         user_data_body = json.loads(self.user_data_body)
         user_data_body['email'] = ''
         self.user_data_body = json.dumps(user_data_body)
+
+        # Set up mocks and do the rest login
         self.do_rest_login()
+        self.setup_api_mocks()
+
         resp = self.client.post(
             reverse('login_social_token'),
             data={'provider': 'facebook', 'code': '3D52VoM1uiw94a1ETnGvYlCw'},