fix: redact pending primary email before retirement deletion

Author: ktyagiapphelix2u

common/djangoapps/student/tests/test_email.py

@@ -610,8 +610,9 @@ def test_successful_email_change(self, test_body_type, test_marketing_enabled, m
         assert PendingEmailChange.objects.count() == 0
 
     @skip_unless_lms
+    @patch('common.djangoapps.student.signals.receivers.EmailChangeMiddleware.register_email_change')
     @patch('common.djangoapps.student.views.management.ace')
-    def test_successful_email_change_redacts_pending_email_before_delete(self, ace_mail):
+    def test_successful_email_change_redacts_pending_email_before_delete(self, ace_mail, mock_register):  # pylint: disable=unused-argument
         original_email = self.user.email
         expected_new_email = self.pending_change_request.new_email
         captured_state = {}

common/djangoapps/student/tests/test_models.py

@@ -31,7 +31,6 @@
     UserAttribute,
     UserCelebration,
     UserProfile,
-    get_retired_email_by_email,
 )
 from common.djangoapps.student.models_api import confirm_name_change, do_name_change_request, get_name
 from common.djangoapps.student.tests.factories import AccountRecoveryFactory, CourseEnrollmentFactory, UserFactory
@@ -608,24 +607,24 @@ def test_delete_by_user_value_redacts_pending_email_before_deletion(self):
         """
         expected_redacted_email = '[email protected]'
         captured_state = {}
-        
+
         def capture_before_delete(sender, instance, **kwargs):
             """
             Capture email and activation_key before deletion.
             """
             captured_state['new_email'] = instance.new_email
             captured_state['activation_key'] = instance.activation_key
-        
+
         pre_delete.connect(capture_before_delete, sender=PendingEmailChange)
         try:
             assert PendingEmailChange.objects.filter(user=self.user).exists()
-            
+
             record_was_deleted = PendingEmailChange.delete_by_user_value(self.user, field='user')
             assert record_was_deleted
-            
+
             assert captured_state['new_email'] == expected_redacted_email
             assert captured_state['activation_key'] == self.email_change.activation_key
-            
+
             assert not PendingEmailChange.objects.filter(user=self.user).exists()
         finally:
             pre_delete.disconnect(capture_before_delete, sender=PendingEmailChange)

openedx/core/djangoapps/user_api/accounts/tests/test_retirement_views.py

@@ -10,8 +10,8 @@
 import ddt
 from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
 from django.contrib.sites.models import Site
-from django.core import mail
 from django.core.cache import cache
+from django.core import mail
 from django.db.models.signals import pre_delete
 from django.test import TestCase
 from django.urls import reverse
@@ -1401,7 +1401,6 @@ def test_retire_user(
 
         self._entitlement_support_detail_assertions()
 
-        mock_redact_pending_email.assert_called_once_with(self.test_user, field="user")
         assert not PendingEmailChange.objects.filter(user=self.test_user).exists()
         assert not UserOrgTag.objects.filter(user=self.test_user).exists()
 
@@ -1430,14 +1429,14 @@ def capture_before_delete(sender, instance, **kwargs):
         try:
             # Verify the record exists with original email before retirement
             assert PendingEmailChange.objects.filter(user=self.test_user).exists()
-            
+
             # Retire the user
             data = {'username': self.original_username}
             self.post_and_assert_status(data)
-            
+
             # Verify the redaction happened before deletion
             assert captured_state.get('new_email') == expected_redacted_email
-            
+
             # Verify the record was deleted
             assert not PendingEmailChange.objects.filter(user=self.test_user).exists()
         finally: