paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-01 20:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change call signature for users_subscribed_to_stream()

Browse Source 
The function users_subscribed_to_stream() now takes realm now, instead of domain.
This commit is contained in:
sidhant bhavnani
2016-12-04 05:34:55 +05:30
committed by showell
parent fb3a6eead0
commit 4634c3d656
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/lib/test_classes.py
View File

@@ -258,9 +258,8 @@ class ZulipTestCase(TestCase):
data = ujson.loads(result.content)
return data['messages']
def users_subscribed_to_stream(self, stream_name, realm_domain):
# type: (text_type, text_type) -> List[UserProfile]
realm = get_realm(realm_domain)
def users_subscribed_to_stream(self, stream_name, realm):
# type: (text_type, Realm) -> List[UserProfile]
stream = Stream.objects.get(name=stream_name, realm=realm)
recipient = Recipient.objects.get(type_id=stream.id, type=Recipient.STREAM)
subscriptions = Subscription.objects.filter(recipient=recipient, active=True)

5
zerver/tests/test_messages.py
View File

@@ -31,7 +31,7 @@ from zerver.lib.test_classes import (
from zerver.models import (
MAX_MESSAGE_LENGTH, MAX_SUBJECT_LENGTH,
Message, Realm, Recipient, Stream, UserMessage, UserProfile, Attachment, RealmAlias,
get_realm_by_string_id, get_stream, get_user_profile_by_email,
get_realm_by_string_id, get_realm, get_stream, get_user_profile_by_email,
)
from zerver.lib.actions import (
@@ -382,7 +382,8 @@ class StreamMessagesTest(ZulipTestCase):
"""
Check that messages sent to a stream reach all subscribers to that stream.
"""
subscribers = self.users_subscribed_to_stream(stream_name, "zulip.com")
realm = get_realm('zulip.com')
subscribers = self.users_subscribed_to_stream(stream_name, realm)
old_subscriber_messages = []
for subscriber in subscribers:
old_subscriber_messages.append(message_stream_count(subscriber))

12
zerver/tests/test_subs.py
View File

@@ -40,7 +40,7 @@ from zerver.lib.actions import (
gather_subscriptions_helper, bulk_add_subscriptions, bulk_remove_subscriptions,
gather_subscriptions, get_default_streams_for_realm, get_realm_by_string_id, get_stream,
get_user_profile_by_email, set_default_streams, get_subscription,
create_streams_if_needed, active_user_ids
create_streams_if_needed, active_user_ids, get_realm
)
from zerver.views.streams import (
@@ -388,6 +388,7 @@ class StreamAdminTest(ZulipTestCase):
Delete the stream and assess the result.
"""
active_name = stream.name
realm = stream.realm
events = [] # type: List[Dict[str, Any]]
with tornado_redirected_to_list(events):
@@ -417,7 +418,7 @@ class StreamAdminTest(ZulipTestCase):
self.assertTrue(deactivated_stream.invite_only)
self.assertEqual(deactivated_stream.name, deactivated_stream_name)
subscribers = self.users_subscribed_to_stream(
deactivated_stream_name, "zulip.com")
deactivated_stream_name, realm)
self.assertEqual(subscribers, [])
# It doesn't show up in the list of public streams anymore.
@@ -499,7 +500,7 @@ class StreamAdminTest(ZulipTestCase):
# If the removal succeeded, then assert that Cordelia is no longer subscribed.
if result.status_code not in [400]:
subbed_users = self.users_subscribed_to_stream(stream_name, other_user_profile.realm.domain)
subbed_users = self.users_subscribed_to_stream(stream_name, other_user_profile.realm)
self.assertNotIn(other_user_profile, subbed_users)
return result
@@ -1992,7 +1993,7 @@ class GetSubscribersTest(ZulipTestCase):
self.user_profile = get_user_profile_by_email(self.email)
self.login(self.email)
def check_well_formed_result(self, result, stream_name, domain):
def check_well_formed_result(self, result, stream_name, realm_domain):
# type: (Dict[str, Any], Text, Text) -> None
"""
A successful call to get_subscribers returns the list of subscribers in
@@ -2002,10 +2003,11 @@ class GetSubscribersTest(ZulipTestCase):
"result": "success",
"subscribers": ["hamlet@zulip.com", "prospero@zulip.com"]}
"""
realm = get_realm(realm_domain)
self.assertIn("subscribers", result)
self.assertIsInstance(result["subscribers"], list)
true_subscribers = [user_profile.email for user_profile in self.users_subscribed_to_stream(
stream_name, domain)]
stream_name, realm)]
self.assertEqual(sorted(result["subscribers"]), sorted(true_subscribers))
def make_subscriber_request(self, stream_name, email=None):