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

test_sessions.py: Use helpers instead of get_user_profile_by_email.

Browse Source
This commit is contained in:
Vishnu Ks
2017-05-23 14:52:41 -07:00
committed by Tim Abbott
parent dafa89d52b
commit 2b36df6b8f
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
zerver/tests/test_sessions.py
View File

@@ -11,8 +11,7 @@ from zerver.lib.sessions import (
)
from zerver.models import (
UserProfile, get_user_profile_by_id,
get_user_profile_by_email, get_realm
UserProfile, get_user_profile_by_id, get_realm
)
from zerver.lib.test_classes import ZulipTestCase
@@ -33,9 +32,10 @@ class TestSessions(ZulipTestCase):
def test_delete_session(self):
# type: () -> None
self.login('hamlet@zulip.com')
user_profile = self.example_user('hamlet')
email = user_profile.email
self.login(email)
self.assertIn('_auth_user_id', self.client.session)
user_profile = get_user_profile_by_email('hamlet@zulip.com')
for session in user_sessions(user_profile):
delete_session(session)
result = self.client_get("/")
@@ -43,26 +43,27 @@ class TestSessions(ZulipTestCase):
def test_delete_user_sessions(self):
# type: () -> None
user_profile = get_user_profile_by_email('hamlet@zulip.com')
self.do_test_session('hamlet@zulip.com', lambda: delete_user_sessions(user_profile), True)
self.do_test_session('othello@zulip.com', lambda: delete_user_sessions(user_profile), False)
user_profile = self.example_user('hamlet')
email = user_profile.email
self.do_test_session(str(email), lambda: delete_user_sessions(user_profile), True)
self.do_test_session(str(self.example_email("othello")), lambda: delete_user_sessions(user_profile), False)
def test_delete_realm_user_sessions(self):
# type: () -> None
realm = get_realm('zulip')
self.do_test_session('hamlet@zulip.com', lambda: delete_realm_user_sessions(realm), True)
self.do_test_session(str(self.mit_user("sipbtest").email), lambda: delete_realm_user_sessions(realm), False)
self.do_test_session(self.example_email("hamlet"), lambda: delete_realm_user_sessions(realm), True)
self.do_test_session(self.mit_email("sipbtest"), lambda: delete_realm_user_sessions(realm), False)
def test_delete_all_user_sessions(self):
# type: () -> None
self.do_test_session('hamlet@zulip.com', lambda: delete_all_user_sessions(), True)
self.do_test_session(str(self.mit_user("sipbtest").email), lambda: delete_all_user_sessions(), True)
self.do_test_session(self.example_email("hamlet"), lambda: delete_all_user_sessions(), True)
self.do_test_session(self.mit_email("sipbtest"), lambda: delete_all_user_sessions(), True)
def test_delete_all_deactivated_user_sessions(self):
# type: () -> None
# Test that no exception is thrown with a logged-out session
self.login('hamlet@zulip.com')
self.login(self.example_email("othello"))
self.assertIn('_auth_user_id', self.client.session)
self.client_post('/accounts/logout/')
delete_all_deactivated_user_sessions()
@@ -70,15 +71,16 @@ class TestSessions(ZulipTestCase):
self.assertEqual('/login', result.url)
# Test nothing happens to an active user's session
self.login('othello@zulip.com')
self.login(self.example_email("othello"))
self.assertIn('_auth_user_id', self.client.session)
delete_all_deactivated_user_sessions()
self.assertIn('_auth_user_id', self.client.session)
# Test that a deactivated session gets logged out
self.login('cordelia@zulip.com')
user_profile_3 = self.example_user('cordelia')
email_3 = user_profile_3.email
self.login(email_3)
self.assertIn('_auth_user_id', self.client.session)
user_profile_3 = get_user_profile_by_email('cordelia@zulip.com')
user_profile_3.is_active = False
user_profile_3.save()
delete_all_deactivated_user_sessions()