paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-10 08:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

test_classes: Use get_user in unsubscribe_from_stream.

Browse Source
This commit is contained in:
Vishnu Ks
2017-07-13 00:40:18 +05:30
committed by Tim Abbott
parent 99e78cbead
commit 098569ccb4
3 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/lib/test_classes.py
View File

@@ -496,10 +496,10 @@ class ZulipTestCase(TestCase):
bulk_add_subscriptions([stream], [user_profile], from_creation=from_creation) bulk_add_subscriptions([stream], [user_profile], from_creation=from_creation)
return stream return stream
def unsubscribe_from_stream(self, email, stream_name): def unsubscribe_from_stream(self, email, stream_name, realm):
# type: (Text, Text) -> None # type: (Text, Text, Realm) -> None
user_profile = get_user_profile_by_email(email) user_profile = get_user(email, realm)
stream = get_stream(stream_name, user_profile.realm) stream = get_stream(stream_name, realm)
bulk_remove_subscriptions([user_profile], [stream]) bulk_remove_subscriptions([user_profile], [stream])
# Subscribe to a stream by making an API request # Subscribe to a stream by making an API request

24
zerver/tests/test_bots.py
View File

@@ -298,9 +298,9 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
def test_add_bot_with_default_sending_stream_private_denied(self): def test_add_bot_with_default_sending_stream_private_denied(self):
# type: () -> None # type: () -> None
self.login(self.example_email('hamlet')) self.login(self.example_email('hamlet'))
user_profile = self.example_user('hamlet') realm = self.example_user('hamlet').realm
stream = get_stream("Denmark", user_profile.realm) stream = get_stream("Denmark", realm)
self.unsubscribe_from_stream(self.example_email('hamlet'), "Denmark") self.unsubscribe_from_stream(self.example_email('hamlet'), "Denmark", realm)
do_change_stream_invite_only(stream, True) do_change_stream_invite_only(stream, True)
bot_info = { bot_info = {
@@ -368,9 +368,9 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
def test_add_bot_with_default_events_register_stream_private_denied(self): def test_add_bot_with_default_events_register_stream_private_denied(self):
# type: () -> None # type: () -> None
self.login(self.example_email('hamlet')) self.login(self.example_email('hamlet'))
user_profile = self.example_user('hamlet') realm = self.example_user('hamlet').realm
stream = get_stream("Denmark", user_profile.realm) stream = get_stream("Denmark", realm)
self.unsubscribe_from_stream(self.example_email('hamlet'), "Denmark") self.unsubscribe_from_stream(self.example_email('hamlet'), "Denmark", realm)
do_change_stream_invite_only(stream, True) do_change_stream_invite_only(stream, True)
self.assert_num_bots_equal(0) self.assert_num_bots_equal(0)
@@ -710,9 +710,9 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
def test_patch_bot_to_stream_private_denied(self): def test_patch_bot_to_stream_private_denied(self):
# type: () -> None # type: () -> None
self.login(self.example_email('hamlet')) self.login(self.example_email('hamlet'))
user_profile = self.example_user('hamlet') realm = self.example_user('hamlet').realm
stream = get_stream("Denmark", user_profile.realm) stream = get_stream("Denmark", realm)
self.unsubscribe_from_stream(self.example_email('hamlet'), "Denmark") self.unsubscribe_from_stream(self.example_email('hamlet'), "Denmark", realm)
do_change_stream_invite_only(stream, True) do_change_stream_invite_only(stream, True)
bot_info = { bot_info = {
@@ -792,9 +792,9 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
def test_patch_bot_events_register_stream_denied(self): def test_patch_bot_events_register_stream_denied(self):
# type: () -> None # type: () -> None
self.login(self.example_email('hamlet')) self.login(self.example_email('hamlet'))
user_profile = self.example_user('hamlet') realm = self.example_user('hamlet').realm
stream = get_stream("Denmark", user_profile.realm) stream = get_stream("Denmark", realm)
self.unsubscribe_from_stream(self.example_email('hamlet'), "Denmark") self.unsubscribe_from_stream(self.example_email('hamlet'), "Denmark", realm)
do_change_stream_invite_only(stream, True) do_change_stream_invite_only(stream, True)
bot_info = { bot_info = {

3
zerver/tests/test_subs.py
View File

@@ -221,10 +221,11 @@ class StreamAdminTest(ZulipTestCase):
def test_vacate_private_stream_removes_default_stream(self): def test_vacate_private_stream_removes_default_stream(self):
# type: () -> None # type: () -> None
stream = self.make_stream('new_stream', invite_only=True) stream = self.make_stream('new_stream', invite_only=True)
realm = self.example_user("hamlet").realm
self.subscribe_to_stream(self.example_email("hamlet"), stream.name) self.subscribe_to_stream(self.example_email("hamlet"), stream.name)
do_add_default_stream(stream) do_add_default_stream(stream)
self.assertEqual(1, DefaultStream.objects.filter(stream=stream).count()) self.assertEqual(1, DefaultStream.objects.filter(stream=stream).count())
self.unsubscribe_from_stream(self.example_email("hamlet"), stream.name) self.unsubscribe_from_stream(self.example_email("hamlet"), stream.name, realm)
self.assertEqual(0, DefaultStream.objects.filter(stream=stream).count()) self.assertEqual(0, DefaultStream.objects.filter(stream=stream).count())
# Fetch stream again from database. # Fetch stream again from database.
stream = Stream.objects.get(id=stream.id) stream = Stream.objects.get(id=stream.id)