paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-29 02:53:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

test_email_change: Extract generate_email_change_link helper.

Browse Source
This commit is contained in:
Mateusz Mandera
2022-07-25 19:22:41 +02:00
committed by Tim Abbott
parent fe9ed2e69d
commit 9992c7b6cc
1 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
zerver/tests/test_email_change.py
View File

@@ -27,6 +27,26 @@ from zerver.models import (
class EmailChangeTestCase(ZulipTestCase): class EmailChangeTestCase(ZulipTestCase):
def generate_email_change_link(self, new_email: str) -> str:
data = {"email": new_email}
url = "/json/settings"
self.assert_length(mail.outbox, 0)
result = self.client_patch(url, data)
self.assert_length(mail.outbox, 1)
self.assert_json_success(result)
email_message = mail.outbox[0]
self.assertEqual(
email_message.subject,
"Verify your new email address",
)
body = email_message.body
self.assertIn("We received a request to change the email", body)
mail.outbox.pop()
activation_url = [s for s in body.split("\n") if s][2]
return activation_url
def test_confirm_email_change_with_non_existent_key(self) -> None: def test_confirm_email_change_with_non_existent_key(self) -> None:
self.login("hamlet") self.login("hamlet")
key = generate_key() key = generate_key()
@@ -96,23 +116,11 @@ class EmailChangeTestCase(ZulipTestCase):
self.assertEqual(obj.status, 1) self.assertEqual(obj.status, 1)
def test_change_email_deactivated_user_realm(self) -> None: def test_change_email_deactivated_user_realm(self) -> None:
data = {"email": "hamlet-new@zulip.com"} new_email = "hamlet-new@zulip.com"
user_profile = self.example_user("hamlet") user_profile = self.example_user("hamlet")
self.login_user(user_profile) self.login_user(user_profile)
url = "/json/settings"
self.assert_length(mail.outbox, 0)
result = self.client_patch(url, data)
self.assert_length(mail.outbox, 1)
self.assert_json_success(result)
email_message = mail.outbox[0]
self.assertEqual(
email_message.subject,
"Verify your new email address",
)
body = email_message.body
self.assertIn("We received a request to change the email", body)
activation_url = [s for s in body.split("\n") if s][2] activation_url = self.generate_email_change_link(new_email)
do_deactivate_user(user_profile, acting_user=None) do_deactivate_user(user_profile, acting_user=None)
response = self.client_get(activation_url) response = self.client_get(activation_url)
@@ -195,21 +203,11 @@ class EmailChangeTestCase(ZulipTestCase):
self.assert_in_response("Already has an account", result) self.assert_in_response("Already has an account", result)
def test_unauthorized_email_change_from_email_confirmation_link(self) -> None: def test_unauthorized_email_change_from_email_confirmation_link(self) -> None:
data = {"email": "hamlet-new@zulip.com"} new_email = "hamlet-new@zulip.com"
user_profile = self.example_user("hamlet") user_profile = self.example_user("hamlet")
self.login_user(user_profile) self.login_user(user_profile)
url = "/json/settings"
self.assert_length(mail.outbox, 0) activation_url = self.generate_email_change_link(new_email)
result = self.client_patch(url, data)
self.assert_length(mail.outbox, 1)
self.assert_json_success(result)
email_message = mail.outbox[0]
self.assertEqual(
email_message.subject,
"Verify your new email address",
)
body = email_message.body
self.assertIn("We received a request to change the email", body)
do_set_realm_property( do_set_realm_property(
user_profile.realm, user_profile.realm,
@@ -218,7 +216,6 @@ class EmailChangeTestCase(ZulipTestCase):
acting_user=None, acting_user=None,
) )
activation_url = [s for s in body.split("\n") if s][2]
response = self.client_get(activation_url) response = self.client_get(activation_url)
self.assertEqual(response.status_code, 400) self.assertEqual(response.status_code, 400)