@@ -51,8 +51,9 @@ def _make_token(email, list_ids, user_id=None):
5151def test_anon_quick_subscribe_sends_email_and_returns_pending (client ):
5252 url = reverse ("mailing-list-quick-subscribe" )
5353 with patch ("mailing_list.views._send_confirmation_email" ) as mock_send , patch (
54- "mailing_list.views.mailman_is_confirmed" , return_value = False
55- ):
54+ "mailing_list.views.MailmanClient"
55+ ) as MockClient :
56+ MockClient .return_value .is_confirmed .return_value = False
5657 response = client .post (
5758 url ,
5859 {"email" : EMAIL , "list_id" : LIST_ID },
@@ -66,7 +67,8 @@ def test_anon_quick_subscribe_sends_email_and_returns_pending(client):
6667@pytest .mark .django_db
6768def test_anon_quick_subscribe_already_subscribed_returns_error (client ):
6869 url = reverse ("mailing-list-quick-subscribe" )
69- with patch ("mailing_list.views.mailman_is_confirmed" , return_value = True ):
70+ with patch ("mailing_list.views.MailmanClient" ) as MockClient :
71+ MockClient .return_value .is_confirmed .return_value = True
7072 response = client .post (
7173 url ,
7274 {"email" : EMAIL , "list_id" : LIST_ID },
@@ -80,8 +82,9 @@ def test_anon_quick_subscribe_already_subscribed_returns_error(client):
8082def test_anon_quick_subscribe_rate_limited (client ):
8183 url = reverse ("mailing-list-quick-subscribe" )
8284 with patch ("mailing_list.views._send_confirmation_email" ), patch (
83- "mailing_list.views.mailman_is_confirmed" , return_value = False
84- ):
85+ "mailing_list.views.MailmanClient"
86+ ) as MockClient :
87+ MockClient .return_value .is_confirmed .return_value = False
8588 for _ in range (5 ):
8689 client .post (
8790 url , {"email" : EMAIL , "list_id" : LIST_ID }, HTTP_HX_REQUEST = "true"
@@ -100,8 +103,9 @@ def test_auth_quick_subscribe_rate_limited(client, user):
100103 client .force_login (user )
101104 url = reverse ("mailing-list-quick-subscribe" )
102105 with patch ("mailing_list.views._send_confirmation_email" ), patch (
103- "mailing_list.views.mailman_is_confirmed" , return_value = False
104- ):
106+ "mailing_list.views.MailmanClient"
107+ ) as MockClient :
108+ MockClient .return_value .is_confirmed .return_value = False
105109 for _ in range (5 ):
106110 client .post (
107111 url , {"email" : EMAIL , "list_id" : LIST_ID }, HTTP_HX_REQUEST = "true"
@@ -121,8 +125,9 @@ def test_staff_quick_subscribe_bypasses_rate_limit(client, db):
121125 client .force_login (staff )
122126 url = reverse ("mailing-list-quick-subscribe" )
123127 with patch ("mailing_list.views._send_confirmation_email" ), patch (
124- "mailing_list.views.mailman_is_confirmed" , return_value = False
125- ):
128+ "mailing_list.views.MailmanClient"
129+ ) as MockClient :
130+ MockClient .return_value .is_confirmed .return_value = False
126131 for _ in range (10 ):
127132 response = client .post (
128133 url , {"email" : EMAIL , "list_id" : LIST_ID }, HTTP_HX_REQUEST = "true"
@@ -232,7 +237,7 @@ def test_confirm_valid_token_subscribes_and_shows_success(client, user):
232237 )
233238 token = _make_token (EMAIL , [LIST_ID ], user_id = user .pk )
234239 url = reverse ("mailing-list-confirm" , args = [token ])
235- with patch ("mailing_list.views.mailman_subscribe " ):
240+ with patch ("mailing_list.views.MailmanClient " ):
236241 response = client .get (url )
237242 assert response .status_code == 200
238243 assert (
@@ -267,7 +272,7 @@ def test_confirm_unknown_user_shows_invalid_page_with_expiry_label(client):
267272def test_confirm_anonymous_token_subscribes_without_db_record (client ):
268273 token = _make_token (EMAIL , [LIST_ID ])
269274 url = reverse ("mailing-list-confirm" , args = [token ])
270- with patch ("mailing_list.views.mailman_subscribe " ) as mock_sub :
275+ with patch ("mailing_list.views.MailmanClient " ) as MockClient :
271276 response = client .get (url )
272277 assert response .status_code == 200
273- mock_sub .assert_called_once_with (EMAIL , LIST_ID )
278+ MockClient . return_value . subscribe .assert_called_once_with (EMAIL , LIST_ID )
0 commit comments