http://cdn.wallpapersafari.com/13/6/16eVjx.jpeg
' content = 'http://cdn.wallpapersafari.com/13/6/16eVjx.jpeg' - sender_user_profile = get_user_profile_by_email("othello@zulip.com") + sender_user_profile = self.example_user('othello') msg = Message(sender=sender_user_profile, sending_client=get_client("test")) converted = render_markdown(msg, content) self.assertEqual(converted, with_preview) @@ -245,7 +245,7 @@ class BugdownTest(TestCase): setattr(realm, 'inline_image_preview', False) realm.save() - sender_user_profile = get_user_profile_by_email("othello@zulip.com") + sender_user_profile = self.example_user('othello') msg = Message(sender=sender_user_profile, sending_client=get_client("test")) converted = render_markdown(msg, content) self.assertEqual(converted, without_preview) @@ -256,7 +256,7 @@ class BugdownTest(TestCase): content = 'http://imaging.nikon.com/lineup/dslr/df/img/sample/img_01.jpg\nhttp://imaging.nikon.com/lineup/dslr/df/img/sample/img_02.jpg\nhttp://imaging.nikon.com/lineup/dslr/df/img/sample/img_03.jpg' expected = 'http://imaging.nikon.com/lineup/dslr/df/img/sample/img_01.jpg
\nhttp://imaging.nikon.com/lineup/dslr/df/img/sample/img_02.jpg
\nhttp://imaging.nikon.com/lineup/dslr/df/img/sample/img_03.jpg
%s
' % (emoji_img(':test:', 'test.png', realm.id))) @@ -519,7 +519,7 @@ class BugdownTest(TestCase): 'This mentions #Denmark and @King Hamlet.
' % (get_stream("Denmark", get_realm("zulip")).id, 'hamlet@zulip.com', user_id)) @@ -973,10 +973,10 @@ class BugdownErrorTests(ZulipTestCase): class BugdownAvatarTestCase(ZulipTestCase): def test_avatar_with_id(self): # type: () -> None - sender_user_profile = get_user_profile_by_email("othello@zulip.com") + sender_user_profile = self.example_user('othello') message = Message(sender=sender_user_profile, sending_client=get_client("test")) - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') msg = '!avatar({0})'.format(user_profile.email) converted = bugdown.convert(msg, message=message) values = {'email': user_profile.email, 'id': user_profile.id} @@ -986,7 +986,7 @@ class BugdownAvatarTestCase(ZulipTestCase): def test_avatar_of_unregistered_user(self): # type: () -> None - sender_user_profile = get_user_profile_by_email("othello@zulip.com") + sender_user_profile = self.example_user('othello') message = Message(sender=sender_user_profile, sending_client=get_client("test")) email = 'fakeuser@example.com' diff --git a/zerver/tests/test_custom_profile_data.py b/zerver/tests/test_custom_profile_data.py index 8dd4d1ea06..c638b7d86b 100644 --- a/zerver/tests/test_custom_profile_data.py +++ b/zerver/tests/test_custom_profile_data.py @@ -248,7 +248,7 @@ class CustomProfileDataTest(ZulipTestCase): def test_delete(self): # type: () -> None - user_profile = get_user_profile_by_email('iago@zulip.com') + user_profile = self.example_user('iago') realm = user_profile.realm field = try_add_realm_custom_profile_field( realm, diff --git a/zerver/tests/test_email_change.py b/zerver/tests/test_email_change.py index 941f88bbef..6edd8aae8a 100644 --- a/zerver/tests/test_email_change.py +++ b/zerver/tests/test_email_change.py @@ -102,7 +102,7 @@ class EmailChangeTestCase(ZulipTestCase): def test_start_email_change_process(self): # type: () -> None - user_profile = get_user_profile_by_email('hamlet@zulip.com') + user_profile = self.example_user('hamlet') do_start_email_change_process(user_profile, 'hamlet-new@zulip.com') self.assertEqual(EmailChangeStatus.objects.count(), 1) diff --git a/zerver/tests/test_email_mirror.py b/zerver/tests/test_email_mirror.py index da0ecd4bc1..8d7f20138e 100644 --- a/zerver/tests/test_email_mirror.py +++ b/zerver/tests/test_email_mirror.py @@ -87,7 +87,7 @@ class TestStreamEmailMessagesSuccess(ZulipTestCase): # build dummy messages for stream # test valid incoming stream message is processed properly self.login("hamlet@zulip.com") - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') self.subscribe_to_stream(user_profile.email, "Denmark") stream = get_stream("Denmark", user_profile.realm) @@ -116,7 +116,7 @@ class TestStreamEmailMessagesEmptyBody(ZulipTestCase): # build dummy messages for stream # test message with empty body is not sent self.login("hamlet@zulip.com") - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') self.subscribe_to_stream(user_profile.email, "Denmark") stream = get_stream("Denmark", user_profile.realm) @@ -161,7 +161,7 @@ class TestMissedPersonalMessageEmailMessages(ZulipTestCase): "to": "othello@zulip.com"}) self.assert_json_success(result) - user_profile = get_user_profile_by_email("othello@zulip.com") + user_profile = self.example_user('othello') usermessage = most_recent_usermessage(user_profile) # we don't want to send actual emails but we do need to create and store the @@ -179,11 +179,11 @@ class TestMissedPersonalMessageEmailMessages(ZulipTestCase): # self.login("hamlet@zulip.com") # confirm that Hamlet got the message - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') message = most_recent_message(user_profile) self.assertEqual(message.content, "TestMissedMessageEmailMessages Body") - self.assertEqual(message.sender, get_user_profile_by_email("othello@zulip.com")) + self.assertEqual(message.sender, self.example_user('othello')) self.assertEqual(message.recipient.id, user_profile.id) self.assertEqual(message.recipient.type, Recipient.PERSONAL) @@ -202,7 +202,7 @@ class TestMissedHuddleMessageEmailMessages(ZulipTestCase): "iago@zulip.com"])}) self.assert_json_success(result) - user_profile = get_user_profile_by_email("cordelia@zulip.com") + user_profile = self.example_user('cordelia') usermessage = most_recent_usermessage(user_profile) # we don't want to send actual emails but we do need to create and store the @@ -219,19 +219,19 @@ class TestMissedHuddleMessageEmailMessages(ZulipTestCase): process_message(incoming_valid_message) # Confirm Iago received the message. - user_profile = get_user_profile_by_email("iago@zulip.com") + user_profile = self.example_user('iago') message = most_recent_message(user_profile) self.assertEqual(message.content, "TestMissedHuddleMessageEmailMessages Body") - self.assertEqual(message.sender, get_user_profile_by_email("cordelia@zulip.com")) + self.assertEqual(message.sender, self.example_user('cordelia')) self.assertEqual(message.recipient.type, Recipient.HUDDLE) # Confirm Othello received the message. - user_profile = get_user_profile_by_email("othello@zulip.com") + user_profile = self.example_user('othello') message = most_recent_message(user_profile) self.assertEqual(message.content, "TestMissedHuddleMessageEmailMessages Body") - self.assertEqual(message.sender, get_user_profile_by_email("cordelia@zulip.com")) + self.assertEqual(message.sender, self.example_user('cordelia')) self.assertEqual(message.recipient.type, Recipient.HUDDLE) class TestMissedMessageAddressWithEmptyGateway(ZulipTestCase): @@ -245,7 +245,7 @@ class TestMissedMessageAddressWithEmptyGateway(ZulipTestCase): "iago@zulip.com"])}) self.assert_json_success(result) - user_profile = get_user_profile_by_email("cordelia@zulip.com") + user_profile = self.example_user('cordelia') usermessage = most_recent_usermessage(user_profile) with self.settings(EMAIL_GATEWAY_PATTERN=''): mm_address = create_missed_message_address(user_profile, usermessage.message) @@ -268,7 +268,7 @@ class TestDigestEmailMessages(ZulipTestCase): "to": "othello@zulip.com"}) self.assert_json_success(result) - user_profile = get_user_profile_by_email("othello@zulip.com") + user_profile = self.example_user('othello') cutoff = time.mktime(datetime.datetime(year=2016, month=1, day=1).timetuple()) handle_digest_email(user_profile.id, cutoff) @@ -282,7 +282,7 @@ class TestReplyExtraction(ZulipTestCase): # build dummy messages for stream # test valid incoming stream message is processed properly self.login("hamlet@zulip.com") - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') self.subscribe_to_stream(user_profile.email, "Denmark") stream = get_stream("Denmark", user_profile.realm) @@ -313,7 +313,7 @@ class TestReplyExtraction(ZulipTestCase): # build dummy messages for stream # test valid incoming stream message is processed properly self.login("hamlet@zulip.com") - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') self.subscribe_to_stream(user_profile.email, "Denmark") stream = get_stream("Denmark", user_profile.realm) @@ -420,7 +420,7 @@ class TestEmailMirrorTornadoView(ZulipTestCase): }) self.assert_json_success(result) - user_profile = get_user_profile_by_email("cordelia@zulip.com") + user_profile = self.example_user('cordelia') user_message = most_recent_usermessage(user_profile) return create_missed_message_address(user_profile, user_message.message) diff --git a/zerver/tests/test_events.py b/zerver/tests/test_events.py index 795782f8df..a865e63db1 100644 --- a/zerver/tests/test_events.py +++ b/zerver/tests/test_events.py @@ -195,7 +195,7 @@ class EventsEndpointTest(ZulipTestCase): event=dict( type='other' ), - users=[get_user_profile_by_email('hamlet@zulip.com').id], + users=[self.example_user('hamlet').id], ), ), ) @@ -348,7 +348,7 @@ class GetEventsTest(ZulipTestCase): self.assertEqual(events[0]["message"]["display_recipient"], "Denmark") class EventsRegisterTest(ZulipTestCase): - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = get_user_profile_by_email('hamlet@zulip.com') maxDiff = None # type: Optional[int] def create_bot(self, email): @@ -534,7 +534,7 @@ class EventsRegisterTest(ZulipTestCase): ]) message = self.send_message("cordelia@zulip.com", "hamlet@zulip.com", Recipient.PERSONAL, "hello") - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') events = self.do_test( lambda: do_update_message_flags(user_profile, 'add', 'starred', [message], False, None, None), @@ -1351,8 +1351,8 @@ class EventsRegisterTest(ZulipTestCase): ('owner_id', check_int), ])), ]) - self.user_profile = get_user_profile_by_email('iago@zulip.com') - owner = get_user_profile_by_email('hamlet@zulip.com') + self.user_profile = self.example_user('iago') + owner = self.example_user('hamlet') bot = self.create_bot('test-bot@zulip.com') action = lambda: do_change_bot_owner(bot, owner, self.user_profile) events = self.do_test(action) @@ -1561,7 +1561,7 @@ class EventsRegisterTest(ZulipTestCase): # Now remove the first user, to test the normal unsubscribe flow action = lambda: bulk_remove_subscriptions( - [get_user_profile_by_email("othello@zulip.com")], + [self.example_user('othello')], [stream]) events = self.do_test(action, include_subscribers=include_subscribers, @@ -1572,7 +1572,7 @@ class EventsRegisterTest(ZulipTestCase): # Now remove the second user, to test the 'vacate' event flow action = lambda: bulk_remove_subscriptions( - [get_user_profile_by_email("hamlet@zulip.com")], + [self.example_user('hamlet')], [stream]) events = self.do_test(action, include_subscribers=include_subscribers, @@ -1596,7 +1596,7 @@ class EventsRegisterTest(ZulipTestCase): # Subscribe to a totally new invite-only stream, so it's just Hamlet on it stream = self.make_stream("private", get_realm("zulip"), invite_only=True) - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') action = lambda: bulk_add_subscriptions([stream], [user_profile]) events = self.do_test(action, include_subscribers=include_subscribers, num_events=2) diff --git a/zerver/tests/test_export.py b/zerver/tests/test_export.py index aed2f2f6ac..20adff9670 100644 --- a/zerver/tests/test_export.py +++ b/zerver/tests/test_export.py @@ -60,8 +60,8 @@ class QueryUtilTest(ZulipTestCase): # type: () -> None self._create_messages() - cordelia = get_user_profile_by_email('cordelia@zulip.com') - hamlet = get_user_profile_by_email('hamlet@zulip.com') + cordelia = self.example_user('cordelia') + hamlet = self.example_user('hamlet') def get_queries(): # type: () -> List[Any] @@ -177,7 +177,7 @@ class QueryUtilTest(ZulipTestCase): self.assertEqual(actual_msg.sender_id, expected_msg.sender_id) -class ExportTest(TestCase): +class ExportTest(ZulipTestCase): def setUp(self): # type: () -> None @@ -289,8 +289,8 @@ class ExportTest(TestCase): # TODO, extract get_set/find_by_id, so we can split this test up # Now, restrict users - cordelia = get_user_profile_by_email('cordelia@zulip.com') - hamlet = get_user_profile_by_email('hamlet@zulip.com') + cordelia = self.example_user('cordelia') + hamlet = self.example_user('hamlet') user_ids = set([cordelia.id, hamlet.id]) full_data = self._export_realm(realm, exportable_user_ids=user_ids) diff --git a/zerver/tests/test_messages.py b/zerver/tests/test_messages.py index d6699a2417..7e78f14924 100644 --- a/zerver/tests/test_messages.py +++ b/zerver/tests/test_messages.py @@ -71,7 +71,7 @@ class TopicHistoryTest(ZulipTestCase): def create_test_message(topic, read, starred=False): # type: (str, bool, bool) -> None - hamlet = get_user_profile_by_email('hamlet@zulip.com') + hamlet = self.example_user('hamlet') message = Message.objects.create( sender=hamlet, recipient=recipient, @@ -469,7 +469,7 @@ class StreamMessagesTest(ZulipTestCase): def test_stream_message_dict(self): # type: () -> None - user_profile = get_user_profile_by_email("iago@zulip.com") + user_profile = self.example_user('iago') self.subscribe_to_stream(user_profile.email, "Denmark") self.send_message("hamlet@zulip.com", "Denmark", Recipient.STREAM, content="whatever", subject="my topic") @@ -483,7 +483,7 @@ class StreamMessagesTest(ZulipTestCase): def test_stream_message_unicode(self): # type: () -> None - user_profile = get_user_profile_by_email("iago@zulip.com") + user_profile = self.example_user('iago') self.subscribe_to_stream(user_profile.email, "Denmark") self.send_message("hamlet@zulip.com", "Denmark", Recipient.STREAM, content="whatever", subject="my topic") @@ -494,7 +494,7 @@ class StreamMessagesTest(ZulipTestCase): def test_message_mentions(self): # type: () -> None - user_profile = get_user_profile_by_email("iago@zulip.com") + user_profile = self.example_user('iago') self.subscribe_to_stream(user_profile.email, "Denmark") self.send_message("hamlet@zulip.com", "Denmark", Recipient.STREAM, content="test @**Iago** rules") @@ -560,8 +560,8 @@ class MessageDictTest(ZulipTestCase): @slow('builds lots of messages') def test_bulk_message_fetching(self): # type: () -> None - sender = get_user_profile_by_email('othello@zulip.com') - receiver = get_user_profile_by_email('hamlet@zulip.com') + sender = self.example_user('othello') + receiver = self.example_user('hamlet') pm_recipient = Recipient.objects.get(type_id=receiver.id, type=Recipient.PERSONAL) stream_name = u'Çiğdem' stream = self.make_stream(stream_name) @@ -606,8 +606,8 @@ class MessageDictTest(ZulipTestCase): def test_applying_markdown(self): # type: () -> None - sender = get_user_profile_by_email('othello@zulip.com') - receiver = get_user_profile_by_email('hamlet@zulip.com') + sender = self.example_user('othello') + receiver = self.example_user('hamlet') recipient = Recipient.objects.get(type_id=receiver.id, type=Recipient.PERSONAL) sending_client = make_client(name="test suite") message = Message( @@ -637,8 +637,8 @@ class MessageDictTest(ZulipTestCase): # type: (Any) -> None # pretend the converter returned an invalid message without raising an exception convert_mock.return_value = None - sender = get_user_profile_by_email('othello@zulip.com') - receiver = get_user_profile_by_email('hamlet@zulip.com') + sender = self.example_user('othello') + receiver = self.example_user('hamlet') recipient = Recipient.objects.get(type_id=receiver.id, type=Recipient.PERSONAL) sending_client = make_client(name="test suite") message = Message( @@ -662,8 +662,8 @@ class MessageDictTest(ZulipTestCase): def test_reaction(self): # type: () -> None - sender = get_user_profile_by_email('othello@zulip.com') - receiver = get_user_profile_by_email('hamlet@zulip.com') + sender = self.example_user('othello') + receiver = self.example_user('hamlet') recipient = Recipient.objects.get(type_id=receiver.id, type=Recipient.PERSONAL) sending_client = make_client(name="test suite") message = Message( @@ -697,8 +697,8 @@ class MessageDictTest(ZulipTestCase): class SewMessageAndReactionTest(ZulipTestCase): def test_sew_messages_and_reaction(self): # type: () -> None - sender = get_user_profile_by_email('othello@zulip.com') - receiver = get_user_profile_by_email('hamlet@zulip.com') + sender = self.example_user('othello') + receiver = self.example_user('hamlet') pm_recipient = Recipient.objects.get(type_id=receiver.id, type=Recipient.PERSONAL) stream_name = u'Çiğdem' stream = self.make_stream(stream_name) @@ -1246,7 +1246,7 @@ class EditMessageTest(ZulipTestCase): """This test verifies the accuracy of construction of Zulip's edit history data structures.""" self.login("hamlet@zulip.com") - hamlet = get_user_profile_by_email("hamlet@zulip.com") + hamlet = self.example_user('hamlet') msg_id = self.send_message("hamlet@zulip.com", "Scotland", Recipient.STREAM, subject="subject 1", content="content 1") result = self.client_patch("/json/messages/" + str(msg_id), { @@ -1302,7 +1302,7 @@ class EditMessageTest(ZulipTestCase): self.assert_json_success(result) history = ujson.loads(Message.objects.get(id=msg_id).edit_history) self.assertEqual(history[0]['prev_subject'], 'subject 3') - self.assertEqual(history[0]['user_id'], get_user_profile_by_email("iago@zulip.com").id) + self.assertEqual(history[0]['user_id'], self.example_user('iago').id) history = ujson.loads(Message.objects.get(id=msg_id).edit_history) self.assertEqual(history[0]['prev_subject'], 'subject 3') @@ -1480,13 +1480,13 @@ class EditMessageTest(ZulipTestCase): self.check_message(id5, subject="edited") self.check_message(id6, subject="topic3") -class MirroredMessageUsersTest(TestCase): +class MirroredMessageUsersTest(ZulipTestCase): class Request(object): pass def test_invalid_sender(self): # type: () -> None - user = get_user_profile_by_email('hamlet@zulip.com') + user = self.example_user('hamlet') recipients = [] # type: List[Text] request = self.Request() request.POST = dict() # no sender @@ -1501,7 +1501,7 @@ class MirroredMessageUsersTest(TestCase): # type: () -> None client = get_client(name='banned_mirror') # Invalid!!! - user = get_user_profile_by_email('hamlet@zulip.com') + user = self.example_user('hamlet') sender = user recipients = [] # type: List[Text] @@ -1603,7 +1603,7 @@ class MirroredMessageUsersTest(TestCase): # type: () -> None client = get_client(name='irc_mirror') - sender = get_user_profile_by_email('hamlet@zulip.com') + sender = self.example_user('hamlet') user = sender recipients = ['alice@zulip.com', 'bob@irc.zulip.com', 'cordelia@zulip.com'] @@ -1633,7 +1633,7 @@ class MirroredMessageUsersTest(TestCase): # type: () -> None client = get_client(name='jabber_mirror') - sender = get_user_profile_by_email('hamlet@zulip.com') + sender = self.example_user('hamlet') user = sender recipients = ['alice@zulip.com', 'bob@zulip.com', 'cordelia@zulip.com'] @@ -1886,7 +1886,7 @@ class LogDictTest(ZulipTestCase): class CheckMessageTest(ZulipTestCase): def test_basic_check_message_call(self): # type: () -> None - sender = get_user_profile_by_email('othello@zulip.com') + sender = self.example_user('othello') client = make_client(name="test suite") stream_name = u'España y Francia' self.make_stream(stream_name) @@ -1903,7 +1903,7 @@ class CheckMessageTest(ZulipTestCase): # type: () -> None """We send a PM to a bot's owner if their bot sends a message to an unsubscribed stream""" - parent = get_user_profile_by_email('othello@zulip.com') + parent = self.example_user('othello') bot = do_create_user( email='othello-bot@zulip.com', password='', diff --git a/zerver/tests/test_narrow.py b/zerver/tests/test_narrow.py index 315422e753..6775986712 100644 --- a/zerver/tests/test_narrow.py +++ b/zerver/tests/test_narrow.py @@ -72,7 +72,7 @@ class NarrowBuilderTest(ZulipTestCase): def setUp(self): # type: () -> None self.realm = get_realm('zulip') - self.user_profile = get_user_profile_by_email("hamlet@zulip.com") + self.user_profile = self.example_user('hamlet') self.builder = NarrowBuilder(self.user_profile, column('id')) self.raw_query = select([column("id")], None, table("zerver_message")) @@ -420,8 +420,8 @@ class GetOldMessagesTest(ZulipTestCase): def get_query_ids(self): # type: () -> Dict[Text, int] - hamlet_user = get_user_profile_by_email('hamlet@zulip.com') - othello_user = get_user_profile_by_email('othello@zulip.com') + hamlet_user = self.example_user('hamlet') + othello_user = self.example_user('othello') query_ids = {} # type: Dict[Text, int] @@ -543,7 +543,7 @@ class GetOldMessagesTest(ZulipTestCase): # narrow view. self.subscribe_to_stream("hamlet@zulip.com", 'Scotland') self.send_message("hamlet@zulip.com", "Scotland", Recipient.STREAM) - messages = get_user_messages(get_user_profile_by_email("hamlet@zulip.com")) + messages = get_user_messages(self.example_user('hamlet')) stream_messages = [msg for msg in messages if msg.recipient.type == Recipient.STREAM] stream_name = get_display_recipient(stream_messages[0].recipient) stream_id = stream_messages[0].recipient.id @@ -1066,7 +1066,7 @@ class GetOldMessagesTest(ZulipTestCase): def common_check_get_messages_query(self, query_params, expected): # type: (Dict[str, object], Text) -> None - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') request = POSTRequestMock(query_params, user_profile) with queries_captured() as queries: get_messages_backend(request, user_profile) @@ -1080,7 +1080,7 @@ class GetOldMessagesTest(ZulipTestCase): def test_use_first_unread_anchor_with_some_unread_messages(self): # type: () -> None - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') # Have Othello send messages to Hamlet that he hasn't read. self.send_message("othello@zulip.com", "Scotland", Recipient.STREAM) @@ -1117,7 +1117,7 @@ class GetOldMessagesTest(ZulipTestCase): def test_use_first_unread_anchor_with_no_unread_messages(self): # type: () -> None - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') query_params = dict( use_first_unread_anchor='true', @@ -1155,7 +1155,7 @@ class GetOldMessagesTest(ZulipTestCase): realm = get_realm('zulip') self.make_stream('web stuff') - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') user_profile.muted_topics = ujson.dumps([['Scotland', 'golf'], ['web stuff', 'css'], ['bogus', 'bogus']]) user_profile.save() @@ -1192,7 +1192,7 @@ class GetOldMessagesTest(ZulipTestCase): # type: () -> None realm = get_realm('zulip') self.make_stream('web stuff') - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') # Test the do-nothing case first. user_profile.muted_topics = ujson.dumps([['irrelevant_stream', 'irrelevant_topic']]) diff --git a/zerver/tests/test_notifications.py b/zerver/tests/test_notifications.py index 34a62f32b2..9c98b02ee8 100644 --- a/zerver/tests/test_notifications.py +++ b/zerver/tests/test_notifications.py @@ -31,8 +31,8 @@ class TestMissedMessages(ZulipTestCase): def _test_cases(self, tokens, msg_id, body, send_as_user): # type: (List[str], int, str, bool) -> None - othello = get_user_profile_by_email('othello@zulip.com') - hamlet = get_user_profile_by_email('hamlet@zulip.com') + othello = self.example_user('othello') + hamlet = self.example_user('hamlet') handle_missedmessage_emails(hamlet.id, [{'message_id': msg_id}]) if settings.EMAIL_GATEWAY_PATTERN != "": reply_to_addresses = [settings.EMAIL_GATEWAY_PATTERN % (u'mm' + t) for t in tokens] @@ -122,7 +122,7 @@ class TestMissedMessages(ZulipTestCase): msg_id = self.send_message("othello@zulip.com", "denmark", Recipient.STREAM, '@**hamlet** to be deleted') - hamlet = get_user_profile_by_email('hamlet@zulip.com') + hamlet = self.example_user('hamlet') self.login("othello@zulip.com") result = self.client_patch('/json/messages/' + str(msg_id), {'message_id': msg_id, 'content': ' '}) @@ -139,7 +139,7 @@ class TestMissedMessages(ZulipTestCase): msg_id = self.send_message("othello@zulip.com", "hamlet@zulip.com", Recipient.PERSONAL, 'Extremely personal message! to be deleted!') - hamlet = get_user_profile_by_email('hamlet@zulip.com') + hamlet = self.example_user('hamlet') self.login("othello@zulip.com") result = self.client_patch('/json/messages/' + str(msg_id), {'message_id': msg_id, 'content': ' '}) @@ -156,8 +156,8 @@ class TestMissedMessages(ZulipTestCase): msg_id = self.send_message("othello@zulip.com", ["hamlet@zulip.com", "iago@zulip.com"], Recipient.PERSONAL, 'Group personal message!') - hamlet = get_user_profile_by_email('hamlet@zulip.com') - iago = get_user_profile_by_email('iago@zulip.com') + hamlet = self.example_user('hamlet') + iago = self.example_user('iago') self.login("othello@zulip.com") result = self.client_patch('/json/messages/' + str(msg_id), {'message_id': msg_id, 'content': ' '}) diff --git a/zerver/tests/test_presence.py b/zerver/tests/test_presence.py index b3310da7ac..2f2526c0f5 100644 --- a/zerver/tests/test_presence.py +++ b/zerver/tests/test_presence.py @@ -233,7 +233,7 @@ class SingleUserPresenceTests(ZulipTestCase): result = self.client_get("/json/users/cordelia@zulip.com/presence") self.assert_json_error(result, "No presence data for cordelia@zulip.com") - do_deactivate_user(get_user_profile_by_email("cordelia@zulip.com")) + do_deactivate_user(self.example_user('cordelia')) result = self.client_get("/json/users/cordelia@zulip.com/presence") self.assert_json_error(result, "No such user") diff --git a/zerver/tests/test_queue_worker.py b/zerver/tests/test_queue_worker.py index e5c090b58c..0548501660 100644 --- a/zerver/tests/test_queue_worker.py +++ b/zerver/tests/test_queue_worker.py @@ -16,7 +16,7 @@ from zerver.lib.test_classes import ZulipTestCase from zerver.models import get_client, get_user_profile_by_email, UserActivity from zerver.worker import queue_processors -class WorkerTest(TestCase): +class WorkerTest(ZulipTestCase): class FakeClient(object): def __init__(self): # type: () -> None @@ -66,7 +66,7 @@ class WorkerTest(TestCase): # type: () -> None fake_client = self.FakeClient() - user = get_user_profile_by_email('hamlet@zulip.com') + user = self.example_user('hamlet') UserActivity.objects.filter( user_profile = user.id, client = get_client('ios') diff --git a/zerver/tests/test_realm.py b/zerver/tests/test_realm.py index 60afdfea29..1b171782cd 100644 --- a/zerver/tests/test_realm.py +++ b/zerver/tests/test_realm.py @@ -29,7 +29,7 @@ class RealmTest(ZulipTestCase): """The main complicated thing about setting realm names is fighting the cache, and we start by populating the cache for Hamlet, and we end by checking the cache to ensure that the new value is there.""" - get_user_profile_by_email('hamlet@zulip.com') + self.example_user('hamlet') realm = get_realm('zulip') new_name = u'Zed You Elle Eye Pea' do_set_realm_property(realm, 'name', new_name) @@ -135,10 +135,10 @@ class RealmTest(ZulipTestCase): Hamlet, and we end by checking the cache to ensure that his realm appears to be deactivated. You can make this test fail by disabling cache.flush_realm().""" - get_user_profile_by_email('hamlet@zulip.com') + self.example_user('hamlet') realm = get_realm('zulip') do_deactivate_realm(realm) - user = get_user_profile_by_email('hamlet@zulip.com') + user = self.example_user('hamlet') self.assertTrue(user.realm.deactivated) def test_change_realm_default_language(self): diff --git a/zerver/tests/test_settings.py b/zerver/tests/test_settings.py index 0f7b46bd31..afcf279dec 100644 --- a/zerver/tests/test_settings.py +++ b/zerver/tests/test_settings.py @@ -23,19 +23,19 @@ class ChangeSettingsTest(ZulipTestCase): def check_for_toggle_param(self, pattern, param): # type: (str, str) -> None self.login("hamlet@zulip.com") - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') json_result = self.client_post(pattern, {param: ujson.dumps(True)}) self.assert_json_success(json_result) # refetch user_profile object to correctly handle caching - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') self.assertEqual(getattr(user_profile, param), True) json_result = self.client_post(pattern, {param: ujson.dumps(False)}) self.assert_json_success(json_result) # refetch user_profile object to correctly handle caching - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') self.assertEqual(getattr(user_profile, param), False) # TODO: requires method consolidation, right now, there's no alternative @@ -43,19 +43,19 @@ class ChangeSettingsTest(ZulipTestCase): def check_for_toggle_param_patch(self, pattern, param): # type: (str, str) -> None self.login("hamlet@zulip.com") - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') json_result = self.client_patch(pattern, {param: ujson.dumps(True)}) self.assert_json_success(json_result) # refetch user_profile object to correctly handle caching - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') self.assertEqual(getattr(user_profile, param), True) json_result = self.client_patch(pattern, {param: ujson.dumps(False)}) self.assert_json_success(json_result) # refetch user_profile object to correctly handle caching - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') self.assertEqual(getattr(user_profile, param), False) def test_successful_change_settings(self): @@ -76,11 +76,11 @@ class ChangeSettingsTest(ZulipTestCase): self.assert_json_success(json_result) result = ujson.loads(json_result.content) self.check_well_formed_change_settings_response(result) - self.assertEqual(get_user_profile_by_email("hamlet@zulip.com"). + self.assertEqual(self.example_user('hamlet'). full_name, "Foo Bar") self.logout() self.login("hamlet@zulip.com", "foobar1") - user_profile = get_user_profile_by_email('hamlet@zulip.com') + user_profile = self.example_user('hamlet') self.assertEqual(get_session_dict_user(self.client.session), user_profile.id) def test_illegal_name_changes(self): diff --git a/zerver/tests/test_signup.py b/zerver/tests/test_signup.py index a221461bfb..5954d1e7a3 100644 --- a/zerver/tests/test_signup.py +++ b/zerver/tests/test_signup.py @@ -146,7 +146,7 @@ class PasswordResetTest(ZulipTestCase): # log back in with new password self.login(email, password='new_password') - user_profile = get_user_profile_by_email('hamlet@zulip.com') + user_profile = self.example_user('hamlet') self.assertEqual(get_session_dict_user(self.client.session), user_profile.id) # make sure old password no longer works @@ -234,7 +234,7 @@ class LoginTest(ZulipTestCase): def test_login(self): # type: () -> None self.login("hamlet@zulip.com") - user_profile = get_user_profile_by_email('hamlet@zulip.com') + user_profile = self.example_user('hamlet') self.assertEqual(get_session_dict_user(self.client.session), user_profile.id) def test_login_bad_password(self): @@ -473,7 +473,7 @@ class InviteUserTest(ZulipTestCase): history but only from public streams. """ self.login("hamlet@zulip.com") - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') private_stream_name = "Secret" self.make_stream(private_stream_name, invite_only=True) self.subscribe_to_stream(user_profile.email, private_stream_name) @@ -667,7 +667,7 @@ so we didn't send them an invitation. We did send invitations to everyone else!" def test_refer_friend(self): # type: () -> None self.login("hamlet@zulip.com") - user = get_user_profile_by_email('hamlet@zulip.com') + user = self.example_user('hamlet') user.invites_granted = 1 user.invites_used = 0 user.save() @@ -679,13 +679,13 @@ so we didn't send them an invitation. We did send invitations to everyone else!" # verify this works Referral.objects.get(user_profile=user, email=invitee) - user = get_user_profile_by_email('hamlet@zulip.com') + user = self.example_user('hamlet') self.assertEqual(user.invites_used, 1) def test_refer_friend_no_email(self): # type: () -> None self.login("hamlet@zulip.com") - user = get_user_profile_by_email('hamlet@zulip.com') + user = self.example_user('hamlet') user.invites_granted = 1 user.invites_used = 0 user.save() @@ -694,13 +694,13 @@ so we didn't send them an invitation. We did send invitations to everyone else!" self.client_post('/json/refer_friend', dict(email='')), "No email address specified") - user = get_user_profile_by_email('hamlet@zulip.com') + user = self.example_user('hamlet') self.assertEqual(user.invites_used, 0) def test_refer_friend_no_invites(self): # type: () -> None self.login("hamlet@zulip.com") - user = get_user_profile_by_email('hamlet@zulip.com') + user = self.example_user('hamlet') user.invites_granted = 1 user.invites_used = 1 user.save() @@ -710,7 +710,7 @@ so we didn't send them an invitation. We did send invitations to everyone else!" self.client_post('/json/refer_friend', dict(email=invitee)), "Insufficient invites") - user = get_user_profile_by_email('hamlet@zulip.com') + user = self.example_user('hamlet') self.assertEqual(user.invites_used, 1) def test_invitation_reminder_email(self): @@ -790,7 +790,7 @@ class EmailUnsubscribeTests(ZulipTestCase): self.assert_in_response('Unknown email unsubscribe request', result) # An unknown message type "fake" produces an error. - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') unsubscribe_link = one_click_unsubscribe_link(user_profile, "fake") result = self.client_get(urllib.parse.urlparse(unsubscribe_link).path) self.assert_in_response('Unknown email unsubscribe request', result) @@ -802,7 +802,7 @@ class EmailUnsubscribeTests(ZulipTestCase): e-mails that you can click even when logged out to update your email notification settings. """ - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') user_profile.enable_offline_email_notifications = True user_profile.save() @@ -822,7 +822,7 @@ class EmailUnsubscribeTests(ZulipTestCase): click even when logged out to stop receiving them. """ email = "hamlet@zulip.com" - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') # Simulate a new user signing up, which enqueues 2 welcome e-mails. enqueue_welcome_emails(email, "King Hamlet") @@ -848,7 +848,7 @@ class EmailUnsubscribeTests(ZulipTestCase): have been queued. """ email = "hamlet@zulip.com" - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') self.assertTrue(user_profile.enable_digest_emails) # Enqueue a fake digest email. @@ -1599,11 +1599,11 @@ class DeactivateUserTest(ZulipTestCase): # type: () -> None email = 'hamlet@zulip.com' self.login(email) - user = get_user_profile_by_email('hamlet@zulip.com') + user = self.example_user('hamlet') self.assertTrue(user.is_active) result = self.client_delete('/json/users/me') self.assert_json_success(result) - user = get_user_profile_by_email('hamlet@zulip.com') + user = self.example_user('hamlet') self.assertFalse(user.is_active) self.login(email, fails=True) @@ -1611,15 +1611,15 @@ class DeactivateUserTest(ZulipTestCase): # type: () -> None email = 'iago@zulip.com' self.login(email) - user = get_user_profile_by_email('iago@zulip.com') + user = self.example_user('iago') self.assertTrue(user.is_active) result = self.client_delete('/json/users/me') self.assert_json_error(result, "Cannot deactivate the only organization administrator") - user = get_user_profile_by_email('iago@zulip.com') + user = self.example_user('iago') self.assertTrue(user.is_active) self.assertTrue(user.is_realm_admin) email = 'hamlet@zulip.com' - user_2 = get_user_profile_by_email('hamlet@zulip.com') + user_2 = self.example_user('hamlet') do_change_is_admin(user_2, True) self.assertTrue(user_2.is_realm_admin) result = self.client_delete('/json/users/me') @@ -1757,7 +1757,7 @@ class MobileAuthOTPTest(ZulipTestCase): def test_otp_encrypt_api_key(self): # type: () -> None - hamlet = get_user_profile_by_email("hamlet@zulip.com") + hamlet = self.example_user('hamlet') hamlet.api_key = '12ac' * 8 otp = '7be38894' * 8 result = otp_encrypt_api_key(hamlet, otp) diff --git a/zerver/tests/test_subs.py b/zerver/tests/test_subs.py index ed990d6483..cfc8a895eb 100644 --- a/zerver/tests/test_subs.py +++ b/zerver/tests/test_subs.py @@ -260,8 +260,8 @@ class StreamAdminTest(ZulipTestCase): # Should be just a description change event self.assert_length(events, 1) - cordelia = get_user_profile_by_email('cordelia@zulip.com') - prospero = get_user_profile_by_email('prospero@zulip.com') + cordelia = self.example_user('cordelia') + prospero = self.example_user('prospero') notified_user_ids = set(events[-1]['users']) self.assertIn(user_profile.id, notified_user_ids) @@ -332,7 +332,7 @@ class StreamAdminTest(ZulipTestCase): self.assertEqual(notified_user_ids, set(active_user_ids(realm))) self.assertIn(user_profile.id, notified_user_ids) - self.assertIn(get_user_profile_by_email('prospero@zulip.com').id, + self.assertIn(self.example_user('prospero').id, notified_user_ids) # Test case to handle unicode stream name change @@ -421,7 +421,7 @@ class StreamAdminTest(ZulipTestCase): self.assertEqual(notified_user_ids, set(active_user_ids(realm))) self.assertIn(user_profile.id, notified_user_ids) - self.assertIn(get_user_profile_by_email('prospero@zulip.com').id, + self.assertIn(self.example_user('prospero').id, notified_user_ids) self.assertEqual('Test description', stream.description) @@ -780,7 +780,7 @@ class DefaultStreamTest(ZulipTestCase): def test_api_calls(self): # type: () -> None self.login("hamlet@zulip.com") - user_profile = get_user_profile_by_email('hamlet@zulip.com') + user_profile = self.example_user('hamlet') do_change_is_admin(user_profile, True) stream_name = 'stream ADDED via api' (stream, _) = create_stream_if_needed(user_profile.realm, stream_name) @@ -1166,7 +1166,7 @@ class SubscriptionRestApiTest(ZulipTestCase): here with a simple scenario to avoid false positives related to subscription complications. ''' - user_profile = get_user_profile_by_email('hamlet@zulip.com') + user_profile = self.example_user('hamlet') user_profile.full_name = 'Hamlet' user_profile.save() @@ -1183,7 +1183,7 @@ class SubscriptionRestApiTest(ZulipTestCase): with self.assertRaises(JsonableError): compose_views(None, user_profile, [(method1, {}), (method2, {})]) - user_profile = get_user_profile_by_email('hamlet@zulip.com') + user_profile = self.example_user('hamlet') self.assertEqual(user_profile.full_name, 'Hamlet') class SubscriptionAPITest(ZulipTestCase): @@ -1386,7 +1386,7 @@ class SubscriptionAPITest(ZulipTestCase): invite_streams = ["cross_stream"] - user = get_user_profile_by_email("AARON@zulip.com") + user = self.example_user('AARON') user.realm = realm user.save() diff --git a/zerver/tests/test_unread.py b/zerver/tests/test_unread.py index c4363e3639..9109604c72 100644 --- a/zerver/tests/test_unread.py +++ b/zerver/tests/test_unread.py @@ -22,11 +22,11 @@ class PointerTest(ZulipTestCase): the pointer we store for your UserProfile. """ self.login("hamlet@zulip.com") - self.assertEqual(get_user_profile_by_email("hamlet@zulip.com").pointer, -1) + self.assertEqual(self.example_user('hamlet').pointer, -1) msg_id = self.send_message("othello@zulip.com", "Verona", Recipient.STREAM) result = self.client_post("/json/users/me/pointer", {"pointer": msg_id}) self.assert_json_success(result) - self.assertEqual(get_user_profile_by_email("hamlet@zulip.com").pointer, msg_id) + self.assertEqual(self.example_user('hamlet').pointer, msg_id) def test_api_update_pointer(self): # type: () -> None @@ -48,10 +48,10 @@ class PointerTest(ZulipTestCase): returns a 400 and error message. """ self.login("hamlet@zulip.com") - self.assertEqual(get_user_profile_by_email("hamlet@zulip.com").pointer, -1) + self.assertEqual(self.example_user('hamlet').pointer, -1) result = self.client_post("/json/users/me/pointer", {"foo": 1}) self.assert_json_error(result, "Missing 'pointer' argument") - self.assertEqual(get_user_profile_by_email("hamlet@zulip.com").pointer, -1) + self.assertEqual(self.example_user('hamlet').pointer, -1) def test_invalid_pointer(self): # type: () -> None @@ -60,10 +60,10 @@ class PointerTest(ZulipTestCase): message. """ self.login("hamlet@zulip.com") - self.assertEqual(get_user_profile_by_email("hamlet@zulip.com").pointer, -1) + self.assertEqual(self.example_user('hamlet').pointer, -1) result = self.client_post("/json/users/me/pointer", {"pointer": "foo"}) self.assert_json_error(result, "Bad value for 'pointer': foo") - self.assertEqual(get_user_profile_by_email("hamlet@zulip.com").pointer, -1) + self.assertEqual(self.example_user('hamlet').pointer, -1) def test_pointer_out_of_range(self): # type: () -> None @@ -72,10 +72,10 @@ class PointerTest(ZulipTestCase): and error message. """ self.login("hamlet@zulip.com") - self.assertEqual(get_user_profile_by_email("hamlet@zulip.com").pointer, -1) + self.assertEqual(self.example_user('hamlet').pointer, -1) result = self.client_post("/json/users/me/pointer", {"pointer": -2}) self.assert_json_error(result, "Bad value for 'pointer': -2") - self.assertEqual(get_user_profile_by_email("hamlet@zulip.com").pointer, -1) + self.assertEqual(self.example_user('hamlet').pointer, -1) def test_use_first_unread_anchor_interaction_with_pointer(self): # type: () -> None @@ -86,7 +86,7 @@ class PointerTest(ZulipTestCase): """ self.login("hamlet@zulip.com") # Ensure the pointer is not set (-1) - self.assertEqual(get_user_profile_by_email("hamlet@zulip.com").pointer, -1) + self.assertEqual(self.example_user('hamlet').pointer, -1) # Mark all existing messages as read result = self.client_post("/json/messages/flags", {"messages": ujson.dumps([]), "op": "add", @@ -115,7 +115,7 @@ class PointerTest(ZulipTestCase): # Verify the message is marked as read user_message = UserMessage.objects.get( message_id=old_message_id, - user_profile=get_user_profile_by_email("hamlet@zulip.com")) + user_profile=self.example_user('hamlet')) self.assertTrue(user_message.flags.read) # Let's set this old message to be unread @@ -127,7 +127,7 @@ class PointerTest(ZulipTestCase): # Verify it's now marked as unread user_message = UserMessage.objects.get( message_id=old_message_id, - user_profile=get_user_profile_by_email("hamlet@zulip.com")) + user_profile=self.example_user('hamlet')) self.assert_json_success(result) self.assertFalse(user_message.flags.read) @@ -142,13 +142,13 @@ class PointerTest(ZulipTestCase): result = self.client_post("/json/users/me/pointer", {"pointer": next_old_message_id}) self.assert_json_success(result) - self.assertEqual(get_user_profile_by_email("hamlet@zulip.com").pointer, + self.assertEqual(self.example_user('hamlet').pointer, next_old_message_id) # Verify that moving the pointer didn't mark our message as read. user_message = UserMessage.objects.get( message_id=old_message_id, - user_profile=get_user_profile_by_email("hamlet@zulip.com")) + user_profile=self.example_user('hamlet')) self.assertFalse(user_message.flags.read) # Now if we call get_messages with use_first_unread_anchor=True, @@ -236,7 +236,7 @@ class UnreadCountTests(ZulipTestCase): def test_mark_all_in_stream_read(self): # type: () -> None self.login("hamlet@zulip.com") - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') self.subscribe_to_stream(user_profile.email, "test_stream", user_profile.realm) self.subscribe_to_stream("cordelia@zulip.com", "test_stream", user_profile.realm) @@ -288,7 +288,7 @@ class UnreadCountTests(ZulipTestCase): def test_mark_all_in_stream_topic_read(self): # type: () -> None self.login("hamlet@zulip.com") - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') self.subscribe_to_stream(user_profile.email, "test_stream", user_profile.realm) message_id = self.send_message("hamlet@zulip.com", "test_stream", Recipient.STREAM, "hello", "test_topic") diff --git a/zerver/tests/test_upload.py b/zerver/tests/test_upload.py index a3b4eef974..aca44bc6d6 100644 --- a/zerver/tests/test_upload.py +++ b/zerver/tests/test_upload.py @@ -96,7 +96,7 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase): and does so in a way that preserves 100% test coverage for Python 3. """ - user_profile = get_user_profile_by_email('hamlet@zulip.com') + user_profile = self.example_user('hamlet') mock_file = mock.Mock() mock_file._get_size = mock.Mock(return_value=1024) @@ -638,7 +638,7 @@ class AvatarTest(UploadSerializeMixin, ZulipTestCase): def test_get_gravatar_avatar(self): # type: () -> None self.login("hamlet@zulip.com") - cordelia = get_user_profile_by_email('cordelia@zulip.com') + cordelia = self.example_user('cordelia') cordelia.avatar_source = UserProfile.AVATAR_FROM_GRAVATAR cordelia.save() @@ -655,7 +655,7 @@ class AvatarTest(UploadSerializeMixin, ZulipTestCase): def test_get_user_avatar(self): # type: () -> None self.login("hamlet@zulip.com") - cordelia = get_user_profile_by_email('cordelia@zulip.com') + cordelia = self.example_user('cordelia') cordelia.avatar_source = UserProfile.AVATAR_FROM_USER cordelia.save() @@ -670,7 +670,7 @@ class AvatarTest(UploadSerializeMixin, ZulipTestCase): def test_get_user_avatar_medium(self): # type: () -> None self.login("hamlet@zulip.com") - cordelia = get_user_profile_by_email('cordelia@zulip.com') + cordelia = self.example_user('cordelia') cordelia.avatar_source = UserProfile.AVATAR_FROM_USER cordelia.save() @@ -720,7 +720,7 @@ class AvatarTest(UploadSerializeMixin, ZulipTestCase): self.assertEqual(Image.open(io.BytesIO(data)).size, (100, 100)) # Verify that the medium-size avatar was created - user_profile = get_user_profile_by_email('hamlet@zulip.com') + user_profile = self.example_user('hamlet') medium_avatar_disk_path = avatar_disk_path(user_profile, medium=True) self.assertTrue(os.path.exists(medium_avatar_disk_path)) @@ -747,7 +747,7 @@ class AvatarTest(UploadSerializeMixin, ZulipTestCase): result = self.client_put_multipart("/json/users/me/avatar", {'file': fp}) self.assert_json_error(result, "Could not decode image; did you upload an image file?") - user_profile = get_user_profile_by_email("hamlet@zulip.com") + user_profile = self.example_user('hamlet') self.assertEqual(user_profile.avatar_version, 1) def test_delete_avatar(self): @@ -756,12 +756,12 @@ class AvatarTest(UploadSerializeMixin, ZulipTestCase): A DELETE request to /json/users/me/avatar should delete the user avatar and return gravatar URL """ self.login("hamlet@zulip.com") - hamlet = get_user_profile_by_email("hamlet@zulip.com") + hamlet = self.example_user('hamlet') hamlet.avatar_source = UserProfile.AVATAR_FROM_USER hamlet.save() result = self.client_delete("/json/users/me/avatar") - user_profile = get_user_profile_by_email('hamlet@zulip.com') + user_profile = self.example_user('hamlet') self.assert_json_success(result) json = ujson.loads(result.content) diff --git a/zerver/tests/test_users.py b/zerver/tests/test_users.py index 9ac16cc457..e282c5cabf 100644 --- a/zerver/tests/test_users.py +++ b/zerver/tests/test_users.py @@ -51,7 +51,7 @@ def find_dict(lst, k, v): class PermissionTest(ZulipTestCase): def test_get_admin_users(self): # type: () -> None - user_profile = get_user_profile_by_email('hamlet@zulip.com') + user_profile = self.example_user('hamlet') do_change_is_admin(user_profile, False) admin_users = user_profile.realm.get_admin_users() self.assertFalse(user_profile in admin_users) @@ -62,7 +62,7 @@ class PermissionTest(ZulipTestCase): def test_updating_non_existent_user(self): # type: () -> None self.login('hamlet@zulip.com') - admin = get_user_profile_by_email('hamlet@zulip.com') + admin = self.example_user('hamlet') do_change_is_admin(admin, True) result = self.client_patch('/json/users/nonexistentuser@zulip.com', {}) @@ -71,8 +71,8 @@ class PermissionTest(ZulipTestCase): def test_admin_api(self): # type: () -> None self.login('hamlet@zulip.com') - admin = get_user_profile_by_email('hamlet@zulip.com') - user = get_user_profile_by_email('othello@zulip.com') + admin = self.example_user('hamlet') + user = self.example_user('othello') realm = admin.realm do_change_is_admin(admin, True) @@ -138,7 +138,7 @@ class PermissionTest(ZulipTestCase): req = dict(full_name=ujson.dumps(new_name)) result = self.client_patch('/json/users/hamlet@zulip.com', req) self.assertTrue(result.status_code == 200) - hamlet = get_user_profile_by_email('hamlet@zulip.com') + hamlet = self.example_user('hamlet') self.assertEqual(hamlet.full_name, new_name) def test_non_admin_cannot_change_full_name(self): @@ -238,11 +238,11 @@ class AdminCreateUserTest(ZulipTestCase): self.assert_json_error(result, "Email 'romeo@zulip.net' already in use") -class UserProfileTest(TestCase): +class UserProfileTest(ZulipTestCase): def test_get_emails_from_user_ids(self): # type: () -> None - hamlet = get_user_profile_by_email('hamlet@zulip.com') - othello = get_user_profile_by_email('othello@zulip.com') + hamlet = self.example_user('hamlet') + othello = self.example_user('othello') dct = get_emails_from_user_ids([hamlet.id, othello.id]) self.assertEqual(dct[hamlet.id], 'hamlet@zulip.com') self.assertEqual(dct[othello.id], 'othello@zulip.com') @@ -250,7 +250,7 @@ class UserProfileTest(TestCase): class ActivateTest(ZulipTestCase): def test_basics(self): # type: () -> None - user = get_user_profile_by_email('hamlet@zulip.com') + user = self.example_user('hamlet') do_deactivate_user(user) self.assertFalse(user.is_active) do_reactivate_user(user) @@ -258,21 +258,21 @@ class ActivateTest(ZulipTestCase): def test_api(self): # type: () -> None - admin = get_user_profile_by_email('othello@zulip.com') + admin = self.example_user('othello') do_change_is_admin(admin, True) self.login('othello@zulip.com') - user = get_user_profile_by_email('hamlet@zulip.com') + user = self.example_user('hamlet') self.assertTrue(user.is_active) result = self.client_delete('/json/users/hamlet@zulip.com') self.assert_json_success(result) - user = get_user_profile_by_email('hamlet@zulip.com') + user = self.example_user('hamlet') self.assertFalse(user.is_active) result = self.client_post('/json/users/hamlet@zulip.com/reactivate') self.assert_json_success(result) - user = get_user_profile_by_email('hamlet@zulip.com') + user = self.example_user('hamlet') self.assertTrue(user.is_active) def test_api_me_user(self): @@ -294,7 +294,7 @@ class ActivateTest(ZulipTestCase): def test_api_with_nonexistent_user(self): # type: () -> None - admin = get_user_profile_by_email('othello@zulip.com') + admin = self.example_user('othello') do_change_is_admin(admin, True) self.login('othello@zulip.com') @@ -318,7 +318,7 @@ class ActivateTest(ZulipTestCase): def test_api_with_insufficient_permissions(self): # type: () -> None - non_admin = get_user_profile_by_email('othello@zulip.com') + non_admin = self.example_user('othello') do_change_is_admin(non_admin, False) self.login('othello@zulip.com') @@ -370,7 +370,7 @@ class GetProfileTest(ZulipTestCase): # type: () -> None with queries_captured() as queries: with simulated_empty_cache() as cache_queries: - user_profile = get_user_profile_by_email('hamlet@zulip.com') + user_profile = self.example_user('hamlet') self.assert_length(queries, 1) self.assert_length(cache_queries, 1) @@ -426,7 +426,7 @@ class GetProfileTest(ZulipTestCase): def test_get_all_profiles_avatar_urls(self): # type: () -> None - user_profile = get_user_profile_by_email('hamlet@zulip.com') + user_profile = self.example_user('hamlet') result = self.client_get("/api/v1/users", **self.api_auth('hamlet@zulip.com')) self.assert_json_success(result) json = ujson.loads(result.content)