fix tests

Author: arslanashraf7

src/ol_openedx_lti_utilities/ol_openedx_lti_utilities/views.py

@@ -59,13 +59,12 @@ def post(self, request):
         """
         Handle POST request to fix LTI user authentication record.
 
-        This endpoint fixes LTI-created users who have random 40-character usernames
-        by updating their username to a more user-friendly value.
+        This endpoint fixes LTI-created users who have lti_user_id as usernames
 
         Parameters
         ----------
         request : Request
-            The HTTP request object containing email and username in request.data
+            The HTTP request object containing email in the payload.
 
         Returns
         -------
@@ -98,7 +97,7 @@ def post(self, request):
             return HttpResponseBadRequest(
                 "User with the given email does not appear to be an LTI-created user."
             )
-        # Fix username of the LTI created user
+
         user = lti_user.edx_user
         user.email = user.email.split("@")[0] + "@" + PLACEHOLDER_EMAIL_DOMAIN
         user.save()

src/ol_openedx_lti_utilities/tests/test_views.py

@@ -1,6 +1,6 @@
 from unittest.mock import Mock, patch
 
-from ddt import data, ddt, unpack
+from ddt import ddt
 from django.contrib.auth.models import User
 from django.test import TestCase
 from rest_framework import status
@@ -16,10 +16,6 @@ def setUp(self):
         self.client = APIClient()
         self.url = "/api/lti-user-fix/"  # Use direct URL path instead of reverse
         self.valid_email = "[email protected]"
-        self.valid_username = "testuser"
-        self.lti_username = (
-            "A1B2C3D4E5F6G7H8I9J0K1L2M3N4O5P6Q7R8S9T0"  # pragma: allowlist secret
-        )
 
         # Create and authenticate a staff user for API access
         self.user = User.objects.create_user(
@@ -31,8 +27,10 @@ def setUp(self):
         self.client.force_authenticate(user=self.user)
 
     @patch("ol_openedx_lti_utilities.views.LtiUser")
-    @patch("ol_openedx_lti_utilities.views.User")
-    def test_successful_lti_user_fix(self, mock_user_model, mock_lti_user_model):
+    @patch(
+        "ol_openedx_lti_utilities.views.create_retirement_request_and_deactivate_account"
+    )
+    def test_successful_lti_user_fix(self, mock_retirement_user, mock_lti_user_model):
         """Test successful LTI user fix."""
         # Mock LTI user with bad username
         mock_lti_user = Mock()
@@ -47,29 +45,19 @@ def test_successful_lti_user_fix(self, mock_user_model, mock_lti_user_model):
         mock_qs.first.return_value = mock_lti_user
         mock_lti_user_model.objects.filter.return_value = mock_qs
 
-        # Mock User.objects.get
-        mock_user = Mock()
-        mock_user_model.objects.get.return_value = mock_user
-
-        payload = {"email": self.valid_email, "username": self.valid_username}
+        payload = {"email": self.valid_email}
 
         response = self.client.post(self.url, payload)
+        mock_edx_user.save.assert_called_once()
+        mock_retirement_user.assert_called_once_with(mock_edx_user)
 
         assert response.status_code == status.HTTP_200_OK
-        mock_user_model.objects.get.assert_called_once_with(email=self.valid_email)
-        mock_user.save.assert_called_once()
 
-    @data(
-        ({"username": "testuser"}, "email and username are required"),
-        ({"email": "[email protected]"}, "email and username are required"),
-        ({}, "email and username are required"),
-    )
-    @unpack
-    def test_missing_required_fields(self, test_data, expected_message):
+    def test_missing_required_fields(self):
         """Test request with missing required fields."""
-        response = self.client.post(self.url, test_data)
+        response = self.client.post(self.url, {})
         assert response.status_code == status.HTTP_400_BAD_REQUEST
-        assert expected_message in response.content.decode()
+        assert "email is required" in response.content.decode()
 
     @patch("ol_openedx_lti_utilities.views.LtiUser")
     def test_no_lti_user_found(self, mock_lti_user_model):
@@ -78,7 +66,7 @@ def test_no_lti_user_found(self, mock_lti_user_model):
         mock_qs.first.return_value = None
         mock_lti_user_model.objects.filter.return_value = mock_qs
 
-        payload = {"email": self.valid_email, "username": self.valid_username}
+        payload = {"email": self.valid_email}
 
         response = self.client.post(self.url, payload)
 
@@ -89,7 +77,7 @@ def test_user_does_not_need_fixing(self, mock_lti_user_model):
         """Test when LTI user has normal username (doesn't need fixing)."""
         # Mock LTI user with normal username
         mock_edx_user = Mock()
-        mock_edx_user.username = "normalusername"  # Not 40-char random
+        mock_edx_user.username = "normalusername"
         mock_edx_user.email = self.valid_email
 
         mock_lti_user = Mock()
@@ -100,7 +88,7 @@ def test_user_does_not_need_fixing(self, mock_lti_user_model):
         mock_qs.first.return_value = mock_lti_user
         mock_lti_user_model.objects.filter.return_value = mock_qs
 
-        payload = {"email": self.valid_email, "username": self.valid_username}
+        payload = {"email": self.valid_email}
 
         response = self.client.post(self.url, payload)
 
@@ -112,7 +100,7 @@ def test_user_does_not_need_fixing(self, mock_lti_user_model):
 
     def test_only_post_method_allowed(self):
         """Test that only POST method is allowed."""
-        payload = {"email": self.valid_email, "username": self.valid_username}
+        payload = {"email": self.valid_email}
 
         # Test GET
         response = self.client.get(self.url)
@@ -139,7 +127,7 @@ def test_logging_on_missing_fields(self, mock_lti_user_model, mock_log):  # noqa
         response = self.client.post(self.url, payload)
 
         assert response.status_code == status.HTTP_400_BAD_REQUEST
-        mock_log.error.assert_called_once_with("email and username are required")
+        mock_log.error.assert_called_once_with("email is required")
 
     @patch("ol_openedx_lti_utilities.views.log")
     @patch("ol_openedx_lti_utilities.views.LtiUser")
@@ -149,7 +137,7 @@ def test_logging_on_no_user_found(self, mock_lti_user_model, mock_log):
         mock_qs.first.return_value = None
         mock_lti_user_model.objects.filter.return_value = mock_qs
 
-        payload = {"email": self.valid_email, "username": self.valid_username}
+        payload = {"email": self.valid_email}
 
         response = self.client.post(self.url, payload)