paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-18 12:54:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

home.py: move bot_list as realm_bots to register_ret.

Browse Source 
Simplify the page_params generation logic #3853
This commit is contained in:
fionabunny
2017-04-20 23:24:30 -07:00
committed by Tim Abbott
parent a7192f4334
commit 84c4d67916
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend_tests/node_tests/bot_data.js
View File

@@ -15,7 +15,7 @@ set_global('$', function (f) {
set_global('document', null); set_global('document', null);
var page_params = { var page_params = {
bot_list: [{email: 'bot0@zulip.com', full_name: 'Bot 0'}], realm_bots: [{email: 'bot0@zulip.com', full_name: 'Bot 0'}],
is_admin: false, is_admin: false,
}; };
set_global('page_params', page_params); set_global('page_params', page_params);

2
static/js/bot_data.js
View File

@@ -56,7 +56,7 @@ var bot_data = (function () {
}; };
$(function init() { $(function init() {
_.each(page_params.bot_list, function (bot) { _.each(page_params.realm_bots, function (bot) {
exports.add(bot); exports.add(bot);
}); });
}); });

12
zerver/tests/test_home.py
View File

@@ -46,7 +46,6 @@ class HomeTest(ZulipTestCase):
"avatar_source", "avatar_source",
"avatar_url", "avatar_url",
"avatar_url_medium", "avatar_url_medium",
"bot_list",
"can_create_streams", "can_create_streams",
"cross_realm_bots", "cross_realm_bots",
"debug_mode", "debug_mode",
@@ -98,6 +97,7 @@ class HomeTest(ZulipTestCase):
"realm_allow_message_editing", "realm_allow_message_editing",
"realm_authentication_methods", "realm_authentication_methods",
"realm_bot_domain", "realm_bot_domain",
"realm_bots",
"realm_create_stream_by_admins_only", "realm_create_stream_by_admins_only",
"realm_default_language", "realm_default_language",
"realm_default_streams", "realm_default_streams",
@@ -153,7 +153,7 @@ class HomeTest(ZulipTestCase):
self.login(email) self.login(email)
# Create bot for bot_list testing. Must be done before fetching home_page. # Create bot for realm_bots testing. Must be done before fetching home_page.
bot_info = { bot_info = {
'full_name': 'The Bot of Hamlet', 'full_name': 'The Bot of Hamlet',
'short_name': 'hambot', 'short_name': 'hambot',
@@ -176,7 +176,7 @@ class HomeTest(ZulipTestCase):
# TODO: Inspect the page_params data further. # TODO: Inspect the page_params data further.
# print(ujson.dumps(page_params, indent=2)) # print(ujson.dumps(page_params, indent=2))
bot_list_expected_keys = [ realm_bots_expected_keys = [
'api_key', 'api_key',
'avatar_url', 'avatar_url',
'default_all_public_streams', 'default_all_public_streams',
@@ -189,8 +189,8 @@ class HomeTest(ZulipTestCase):
'user_id', 'user_id',
] ]
bot_list_actual_keys = sorted([str(key) for key in page_params['bot_list'][0].keys()]) realm_bots_actual_keys = sorted([str(key) for key in page_params['realm_bots'][0].keys()])
self.assertEqual(bot_list_actual_keys, bot_list_expected_keys) self.assertEqual(realm_bots_actual_keys, realm_bots_expected_keys)
def _get_home_page(self, **kwargs): def _get_home_page(self, **kwargs):
# type: (**Any) -> HttpResponse # type: (**Any) -> HttpResponse
@@ -316,7 +316,7 @@ class HomeTest(ZulipTestCase):
self.login(email) self.login(email)
result = self._get_home_page() result = self._get_home_page()
page_params = self._get_page_params(result) page_params = self._get_page_params(result)
for params in ['people_list', 'bot_list']: for params in ['people_list', 'realm_bots']:
users = page_params['people_list'] users = page_params['people_list']
self.assertTrue(len(users) >= 3) self.assertTrue(len(users) >= 3)
for user in users: for user in users:

2
zerver/views/home.py
View File

@@ -241,7 +241,6 @@ def home_real(request):
# Realm foreign key data from register_ret. # Realm foreign key data from register_ret.
# TODO: Rename these to match register_ret values. # TODO: Rename these to match register_ret values.
people_list = register_ret['realm_users'], people_list = register_ret['realm_users'],
bot_list = register_ret['realm_bots'],
initial_pointer = register_ret['pointer'], initial_pointer = register_ret['pointer'],
initial_presences = register_ret['presences'], initial_presences = register_ret['presences'],
event_queue_id = register_ret['queue_id'], event_queue_id = register_ret['queue_id'],
@@ -281,6 +280,7 @@ def home_real(request):
'realm_allow_message_editing', 'realm_allow_message_editing',
'realm_authentication_methods', 'realm_authentication_methods',
'realm_bot_domain', 'realm_bot_domain',
'realm_bots',
'realm_create_stream_by_admins_only', 'realm_create_stream_by_admins_only',
'realm_default_language', 'realm_default_language',
'realm_default_streams', 'realm_default_streams',