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

test_audit_log: Fix unnecessary user creation.

Browse Source
This commit is contained in:
Tim Abbott
2017-03-27 13:09:56 -07:00
parent f213369e1d
commit 5776ecfac2
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zerver/tests/test_audit_log.py
View File

@@ -5,7 +5,7 @@ from zerver.lib.actions import do_create_user, do_deactivate_user, \
do_activate_user, do_reactivate_user, do_change_password, \
do_change_user_email, do_change_avatar_fields
from zerver.lib.test_classes import ZulipTestCase
from zerver.models import RealmAuditLog, get_realm
from zerver.models import RealmAuditLog, get_realm, get_user_profile_by_email
from datetime import timedelta
from django.contrib.auth.password_validation import validate_password
@@ -31,9 +31,8 @@ class TestUserActivation(ZulipTestCase):
class TestChangePassword(ZulipTestCase):
def test_change_password(self):
# type: () -> None
realm = get_realm('zulip')
now = timezone.now()
user = do_create_user('email', 'password', realm, 'full_name', 'short_name')
user = get_user_profile_by_email("hamlet@zulip.com")
password = 'test1'
do_change_password(user, password)
self.assertEqual(RealmAuditLog.objects.filter(event_type='user_change_password',
@@ -43,9 +42,8 @@ class TestChangePassword(ZulipTestCase):
class TestChangeEmail(ZulipTestCase):
def test_change_email(self):
# type: () -> None
realm = get_realm('zulip')
now = timezone.now()
user = do_create_user('email', 'password', realm, 'full_name', 'short_name')
user = get_user_profile_by_email("hamlet@zulip.com")
email = 'test@example.com'
do_change_user_email(user, email)
self.assertEqual(RealmAuditLog.objects.filter(event_type='user_email_changed',
@@ -55,9 +53,8 @@ class TestChangeEmail(ZulipTestCase):
class TestChangeAvatarFields(ZulipTestCase):
def test_change_avatar_source(self):
# type: () -> None
realm = get_realm('zulip')
now = timezone.now()
user = do_create_user('email', 'password', realm, 'full_name', 'short_name')
user = get_user_profile_by_email("hamlet@zulip.com")
avatar_source = u'G'
do_change_avatar_fields(user, avatar_source)
self.assertEqual(RealmAuditLog.objects.filter(event_type='user_change_avatar_source',