diff --git a/frontend_tests/node_tests/bot_data.js b/frontend_tests/node_tests/bot_data.js index 126997c783..a5cb37fa79 100644 --- a/frontend_tests/node_tests/bot_data.js +++ b/frontend_tests/node_tests/bot_data.js @@ -15,7 +15,7 @@ set_global('$', function (f) { set_global('document', null); 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, }; set_global('page_params', page_params); diff --git a/static/js/bot_data.js b/static/js/bot_data.js index 8155a7d27e..4a78e1b9ce 100644 --- a/static/js/bot_data.js +++ b/static/js/bot_data.js @@ -56,7 +56,7 @@ var bot_data = (function () { }; $(function init() { - _.each(page_params.bot_list, function (bot) { + _.each(page_params.realm_bots, function (bot) { exports.add(bot); }); }); diff --git a/zerver/tests/test_home.py b/zerver/tests/test_home.py index 6e7ec92ce6..fce1de7668 100644 --- a/zerver/tests/test_home.py +++ b/zerver/tests/test_home.py @@ -46,7 +46,6 @@ class HomeTest(ZulipTestCase): "avatar_source", "avatar_url", "avatar_url_medium", - "bot_list", "can_create_streams", "cross_realm_bots", "debug_mode", @@ -98,6 +97,7 @@ class HomeTest(ZulipTestCase): "realm_allow_message_editing", "realm_authentication_methods", "realm_bot_domain", + "realm_bots", "realm_create_stream_by_admins_only", "realm_default_language", "realm_default_streams", @@ -153,7 +153,7 @@ class HomeTest(ZulipTestCase): 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 = { 'full_name': 'The Bot of Hamlet', 'short_name': 'hambot', @@ -176,7 +176,7 @@ class HomeTest(ZulipTestCase): # TODO: Inspect the page_params data further. # print(ujson.dumps(page_params, indent=2)) - bot_list_expected_keys = [ + realm_bots_expected_keys = [ 'api_key', 'avatar_url', 'default_all_public_streams', @@ -189,8 +189,8 @@ class HomeTest(ZulipTestCase): 'user_id', ] - bot_list_actual_keys = sorted([str(key) for key in page_params['bot_list'][0].keys()]) - self.assertEqual(bot_list_actual_keys, bot_list_expected_keys) + realm_bots_actual_keys = sorted([str(key) for key in page_params['realm_bots'][0].keys()]) + self.assertEqual(realm_bots_actual_keys, realm_bots_expected_keys) def _get_home_page(self, **kwargs): # type: (**Any) -> HttpResponse @@ -316,7 +316,7 @@ class HomeTest(ZulipTestCase): self.login(email) result = self._get_home_page() 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'] self.assertTrue(len(users) >= 3) for user in users: diff --git a/zerver/views/home.py b/zerver/views/home.py index fc3a366f33..9026f5784b 100644 --- a/zerver/views/home.py +++ b/zerver/views/home.py @@ -241,7 +241,6 @@ def home_real(request): # Realm foreign key data from register_ret. # TODO: Rename these to match register_ret values. people_list = register_ret['realm_users'], - bot_list = register_ret['realm_bots'], initial_pointer = register_ret['pointer'], initial_presences = register_ret['presences'], event_queue_id = register_ret['queue_id'], @@ -281,6 +280,7 @@ def home_real(request): 'realm_allow_message_editing', 'realm_authentication_methods', 'realm_bot_domain', + 'realm_bots', 'realm_create_stream_by_admins_only', 'realm_default_language', 'realm_default_streams',