diff --git a/web/tests/activity.test.js b/web/tests/activity.test.js index b5d8fbf588..2ea77d1ede 100644 --- a/web/tests/activity.test.js +++ b/web/tests/activity.test.js @@ -13,7 +13,7 @@ const {mock_esm, set_global, with_overrides, zrequire} = require("./lib/namespac const {run_test, noop} = require("./lib/test"); const blueslip = require("./lib/zblueslip"); const $ = require("./lib/zjquery"); -const {current_user, page_params, realm} = require("./lib/zpage_params"); +const {page_params} = require("./lib/zpage_params"); const $window_stub = $.create("window-stub"); set_global("to_$", () => $window_stub); @@ -52,8 +52,13 @@ const peer_data = zrequire("peer_data"); const message_lists = zrequire("message_lists"); const util = zrequire("util"); const {Filter} = zrequire("../src/filter"); +const {set_current_user, set_realm} = zrequire("state_data"); const {initialize_user_settings} = zrequire("user_settings"); +const current_user = {}; +set_current_user(current_user); +const realm = {}; +set_realm(realm); const user_settings = {}; initialize_user_settings({user_settings}); diff --git a/web/tests/buddy_data.test.js b/web/tests/buddy_data.test.js index 3de42e7948..982911494c 100644 --- a/web/tests/buddy_data.test.js +++ b/web/tests/buddy_data.test.js @@ -6,7 +6,7 @@ const _ = require("lodash"); const {mock_esm, zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); -const {current_user, page_params, realm} = require("./lib/zpage_params"); +const {page_params} = require("./lib/zpage_params"); mock_esm("../src/settings_data", { user_can_access_all_other_users: () => true, @@ -24,8 +24,13 @@ const user_status = zrequire("user_status"); const buddy_data = zrequire("buddy_data"); const {Filter} = zrequire("filter"); const message_lists = zrequire("message_lists"); +const {set_current_user, set_realm} = zrequire("state_data"); const {initialize_user_settings} = zrequire("user_settings"); +const realm = {}; +set_realm(realm); +const current_user = {}; +set_current_user(current_user); const user_settings = {}; initialize_user_settings({user_settings}); diff --git a/web/tests/buddy_list.test.js b/web/tests/buddy_list.test.js index 338e73a525..fff275ed64 100644 --- a/web/tests/buddy_list.test.js +++ b/web/tests/buddy_list.test.js @@ -22,8 +22,10 @@ const message_viewport = mock_esm("../src/message_viewport"); const buddy_data = zrequire("buddy_data"); const {BuddyList} = zrequire("buddy_list"); const people = zrequire("people"); +const {set_realm} = zrequire("state_data"); const {initialize_user_settings} = zrequire("user_settings"); +set_realm({}); initialize_user_settings({user_settings: {}}); function init_simulated_scrolling() { diff --git a/web/tests/compose.test.js b/web/tests/compose.test.js index 6004a85d00..e3c7916883 100644 --- a/web/tests/compose.test.js +++ b/web/tests/compose.test.js @@ -8,7 +8,7 @@ const {mock_banners} = require("./lib/compose_banner"); const {mock_esm, set_global, zrequire} = require("./lib/namespace"); const {run_test, noop} = require("./lib/test"); const $ = require("./lib/zjquery"); -const {current_user, page_params, realm} = require("./lib/zpage_params"); +const {page_params} = require("./lib/zpage_params"); const user_groups = zrequire("user_groups"); @@ -58,9 +58,14 @@ const compose_setup = zrequire("compose_setup"); const drafts = zrequire("drafts"); const echo = zrequire("echo"); const people = zrequire("people"); +const {set_current_user, set_realm} = zrequire("state_data"); const stream_data = zrequire("stream_data"); const {initialize_user_settings} = zrequire("user_settings"); +const realm = {}; +set_realm(realm); +const current_user = {}; +set_current_user(current_user); const user_settings = {}; initialize_user_settings({user_settings}); diff --git a/web/tests/compose_actions.test.js b/web/tests/compose_actions.test.js index 63d404b867..5f0ba89c36 100644 --- a/web/tests/compose_actions.test.js +++ b/web/tests/compose_actions.test.js @@ -7,7 +7,6 @@ const {mock_esm, set_global, zrequire} = require("./lib/namespace"); const {run_test, noop} = require("./lib/test"); const blueslip = require("./lib/zblueslip"); const $ = require("./lib/zjquery"); -const {realm} = require("./lib/zpage_params"); const user_groups = zrequire("user_groups"); @@ -88,6 +87,10 @@ const compose_reply = zrequire("compose_reply"); const message_lists = zrequire("message_lists"); const stream_data = zrequire("stream_data"); const compose_recipient = zrequire("compose_recipient"); +const {set_realm} = zrequire("state_data"); + +const realm = {}; +set_realm(realm); const start = compose_actions.start; const cancel = compose_actions.cancel; diff --git a/web/tests/compose_pm_pill.test.js b/web/tests/compose_pm_pill.test.js index bafde72941..1e4d7ab2dd 100644 --- a/web/tests/compose_pm_pill.test.js +++ b/web/tests/compose_pm_pill.test.js @@ -10,6 +10,9 @@ const input_pill = mock_esm("../src/input_pill"); const people = zrequire("people"); const compose_pm_pill = zrequire("compose_pm_pill"); +const {set_realm} = zrequire("state_data"); + +set_realm({}); let pills = { pill: {}, diff --git a/web/tests/compose_ui.test.js b/web/tests/compose_ui.test.js index 9239dd3601..0e1c5a6e5d 100644 --- a/web/tests/compose_ui.test.js +++ b/web/tests/compose_ui.test.js @@ -6,7 +6,6 @@ const {$t} = require("./lib/i18n"); const {mock_esm, set_global, zrequire} = require("./lib/namespace"); const {run_test, noop} = require("./lib/test"); const $ = require("./lib/zjquery"); -const {realm} = require("./lib/zpage_params"); set_global("navigator", {}); @@ -27,8 +26,11 @@ const channel = mock_esm("../src/channel"); const compose_reply = zrequire("compose_reply"); const message_lists = zrequire("message_lists"); const text_field_edit = mock_esm("text-field-edit"); +const {set_realm} = zrequire("state_data"); const {initialize_user_settings} = zrequire("user_settings"); +const realm = {}; +set_realm(realm); initialize_user_settings({user_settings: {}}); const alice = { diff --git a/web/tests/compose_validate.test.js b/web/tests/compose_validate.test.js index dc2a2c5d10..1561870e85 100644 --- a/web/tests/compose_validate.test.js +++ b/web/tests/compose_validate.test.js @@ -8,7 +8,6 @@ const {mock_esm, zrequire} = require("./lib/namespace"); const {run_test, noop} = require("./lib/test"); const blueslip = require("./lib/zblueslip"); const $ = require("./lib/zjquery"); -const {current_user, realm} = require("./lib/zpage_params"); const compose_banner = zrequire("compose_banner"); const compose_pm_pill = zrequire("compose_pm_pill"); @@ -19,10 +18,16 @@ const people = zrequire("people"); const resolved_topic = zrequire("../shared/src/resolved_topic"); const settings_config = zrequire("settings_config"); const settings_data = mock_esm("../src/settings_data"); +const {set_current_user, set_realm} = zrequire("state_data"); const stream_data = zrequire("stream_data"); const compose_recipient = zrequire("/compose_recipient"); const user_groups = zrequire("user_groups"); +const realm = {}; +set_realm(realm); +const current_user = {}; +set_current_user(current_user); + const me = { email: "me@example.com", user_id: 30, diff --git a/web/tests/compose_video.test.js b/web/tests/compose_video.test.js index 44c361b9d0..17b1a27745 100644 --- a/web/tests/compose_video.test.js +++ b/web/tests/compose_video.test.js @@ -6,7 +6,7 @@ const events = require("./lib/events"); const {mock_esm, set_global, with_overrides, zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); const $ = require("./lib/zjquery"); -const {current_user, page_params, realm} = require("./lib/zpage_params"); +const {page_params} = require("./lib/zpage_params"); const channel = mock_esm("../src/channel"); const compose_closed_ui = mock_esm("../src/compose_closed_ui"); @@ -27,6 +27,12 @@ set_global( const server_events_dispatch = zrequire("server_events_dispatch"); const compose_setup = zrequire("compose_setup"); +const {set_current_user, set_realm} = zrequire("state_data"); + +const realm = {}; +set_realm(realm); +const current_user = {}; +set_current_user(current_user); function stub_out_video_calls() { const $elem = $(".compose-control-buttons-container .video_link"); diff --git a/web/tests/composebox_typeahead.test.js b/web/tests/composebox_typeahead.test.js index 01293358db..dad4de0130 100644 --- a/web/tests/composebox_typeahead.test.js +++ b/web/tests/composebox_typeahead.test.js @@ -6,7 +6,6 @@ const {mock_banners} = require("./lib/compose_banner"); const {mock_esm, set_global, with_overrides, zrequire} = require("./lib/namespace"); const {run_test, noop} = require("./lib/test"); const $ = require("./lib/zjquery"); -const {current_user, realm} = require("./lib/zpage_params"); let autosize_called; @@ -57,8 +56,13 @@ const compose_pm_pill = zrequire("compose_pm_pill"); const compose_recipient = zrequire("compose_recipient"); const composebox_typeahead = zrequire("composebox_typeahead"); const settings_config = zrequire("settings_config"); +const {set_current_user, set_realm} = zrequire("state_data"); const {initialize_user_settings} = zrequire("user_settings"); +const current_user = {}; +set_current_user(current_user); +const realm = {}; +set_realm(realm); const user_settings = {}; initialize_user_settings({user_settings}); diff --git a/web/tests/dispatch.test.js b/web/tests/dispatch.test.js index 8763cb57eb..e2bab7367d 100644 --- a/web/tests/dispatch.test.js +++ b/web/tests/dispatch.test.js @@ -8,12 +8,7 @@ const {make_stub} = require("./lib/stub"); const {run_test, noop} = require("./lib/test"); const blueslip = require("./lib/zblueslip"); const $ = require("./lib/zjquery"); -const { - current_user, - page_params, - realm, - realm_user_settings_defaults, -} = require("./lib/zpage_params"); +const {page_params, realm_user_settings_defaults} = require("./lib/zpage_params"); const event_fixtures = events.fixtures; const test_message = events.test_message; @@ -102,8 +97,13 @@ const user_group_edit = mock_esm("../src/user_group_edit"); const overlays = mock_esm("../src/overlays"); mock_esm("../src/giphy"); const {Filter} = zrequire("filter"); +const {set_current_user, set_realm} = zrequire("state_data"); const {initialize_user_settings} = zrequire("user_settings"); +const realm = {}; +set_realm(realm); +const current_user = {}; +set_current_user(current_user); const user_settings = {}; initialize_user_settings({user_settings}); diff --git a/web/tests/dispatch_subs.test.js b/web/tests/dispatch_subs.test.js index bf2fd226ff..4063a9ac59 100644 --- a/web/tests/dispatch_subs.test.js +++ b/web/tests/dispatch_subs.test.js @@ -7,7 +7,6 @@ const {mock_esm, zrequire} = require("./lib/namespace"); const {make_stub} = require("./lib/stub"); const {run_test, noop} = require("./lib/test"); const blueslip = require("./lib/zblueslip"); -const {realm} = require("./lib/zpage_params"); const event_fixtures = events.fixtures; const test_user = events.test_user; @@ -27,9 +26,13 @@ const compose_state = zrequire("compose_state"); const peer_data = zrequire("peer_data"); const people = zrequire("people"); const server_events_dispatch = zrequire("server_events_dispatch"); +const {set_realm} = zrequire("state_data"); const stream_data = zrequire("stream_data"); const sub_store = zrequire("sub_store"); +const realm = {}; +set_realm(realm); + people.add_active_user(test_user); const me = { diff --git a/web/tests/echo.test.js b/web/tests/echo.test.js index cbc30f05a2..ee91b04583 100644 --- a/web/tests/echo.test.js +++ b/web/tests/echo.test.js @@ -7,7 +7,6 @@ const MockDate = require("mockdate"); const {mock_esm, zrequire} = require("./lib/namespace"); const {make_stub} = require("./lib/stub"); const {run_test, noop} = require("./lib/test"); -const {current_user} = require("./lib/zpage_params"); const compose_notifications = mock_esm("../src/compose_notifications"); const markdown = mock_esm("../src/markdown"); @@ -70,9 +69,13 @@ message_lists.non_rendered_data = () => []; const echo = zrequire("echo"); const echo_state = zrequire("echo_state"); const people = zrequire("people"); +const {set_current_user} = zrequire("state_data"); const stream_data = zrequire("stream_data"); const stream_topic_history = zrequire("stream_topic_history"); +const current_user = {}; +set_current_user(current_user); + const general_sub = { stream_id: 101, name: "general", diff --git a/web/tests/example3.test.js b/web/tests/example3.test.js index ff5e56526b..8313d358df 100644 --- a/web/tests/example3.test.js +++ b/web/tests/example3.test.js @@ -12,8 +12,11 @@ const {run_test} = require("./lib/test"); // core piece of code that makes things work. const {Filter} = zrequire("../src/filter"); +const {set_realm} = zrequire("state_data"); const stream_data = zrequire("stream_data"); +set_realm({}); + const denmark_stream = make_stream({ color: "blue", name: "Denmark", diff --git a/web/tests/example4.test.js b/web/tests/example4.test.js index a6e2be3ae0..1e0f38ad21 100644 --- a/web/tests/example4.test.js +++ b/web/tests/example4.test.js @@ -65,6 +65,9 @@ const user_profile = mock_esm("../src/user_profile"); // Use real versions of these modules. const people = zrequire("people"); const server_events_dispatch = zrequire("server_events_dispatch"); +const {set_current_user} = zrequire("state_data"); + +set_current_user({}); const bob = make_bot({ email: "bob@example.com", diff --git a/web/tests/example8.test.js b/web/tests/example8.test.js index adba3bd1ba..fad108cbd2 100644 --- a/web/tests/example8.test.js +++ b/web/tests/example8.test.js @@ -6,7 +6,6 @@ const {make_user} = require("./lib/example_user"); const {mock_esm, zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); const $ = require("./lib/zjquery"); -const {current_user} = require("./lib/zpage_params"); mock_esm("../src/settings_data", { user_can_access_all_other_users: () => true, @@ -30,9 +29,13 @@ mock_esm("../src/settings_data", { const {Filter} = zrequire("filter"); const message_lists = zrequire("message_lists"); const people = zrequire("people"); +const {set_current_user} = zrequire("state_data"); const typing_data = zrequire("typing_data"); const typing_events = zrequire("typing_events"); +const current_user = {}; +set_current_user(current_user); + // Let us add a few users to use as typists. const anna = make_user({ email: "anna@example.com", diff --git a/web/tests/filter.test.js b/web/tests/filter.test.js index 9fdee49264..87b6262b6e 100644 --- a/web/tests/filter.test.js +++ b/web/tests/filter.test.js @@ -8,7 +8,7 @@ const {mock_esm, with_overrides, zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); const blueslip = require("./lib/zblueslip"); const $ = require("./lib/zjquery"); -const {current_user, page_params, realm} = require("./lib/zpage_params"); +const {page_params} = require("./lib/zpage_params"); const message_store = mock_esm("../src/message_store"); const user_topics = mock_esm("../src/user_topics"); @@ -17,8 +17,13 @@ const resolved_topic = zrequire("../shared/src/resolved_topic"); const stream_data = zrequire("stream_data"); const people = zrequire("people"); const {Filter} = zrequire("../src/filter"); +const {set_current_user, set_realm} = zrequire("state_data"); const {initialize_user_settings} = zrequire("user_settings"); +const realm = {}; +set_realm(realm); +const current_user = {}; +set_current_user(current_user); initialize_user_settings({user_settings: {}}); const stream_message = "stream"; diff --git a/web/tests/gear_menu_util.test.js b/web/tests/gear_menu_util.test.js index 92ae703c4f..3e148e4d7c 100644 --- a/web/tests/gear_menu_util.test.js +++ b/web/tests/gear_menu_util.test.js @@ -4,9 +4,12 @@ const assert = require("node:assert/strict"); const {zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); -const {realm} = require("./lib/zpage_params"); const gear_menu_util = zrequire("gear_menu_util"); +const {set_realm} = zrequire("state_data"); + +const realm = {}; +set_realm(realm); run_test("version_display_string", ({override}) => { let expected_version_display_string; diff --git a/web/tests/lib/index.js b/web/tests/lib/index.js index 102a320226..29cb2a9c0d 100644 --- a/web/tests/lib/index.js +++ b/web/tests/lib/index.js @@ -129,8 +129,6 @@ test.set_verbose(files.length === 1); require("../../src/billing/page_params"); namespace.mock_esm("../../src/page_params", zpage_params); require("../../src/page_params"); - namespace.mock_esm("../../src/state_data", zpage_params); - require("../../src/state_data"); namespace.mock_esm("../../src/realm_user_settings_defaults", zpage_params); require("../../src/realm_user_settings_defaults"); diff --git a/web/tests/lib/zpage_params.js b/web/tests/lib/zpage_params.js index 359ff5c976..c76c1dd7b4 100644 --- a/web/tests/lib/zpage_params.js +++ b/web/tests/lib/zpage_params.js @@ -1,26 +1,14 @@ "use strict"; -exports.current_user = {}; exports.page_params = {}; -exports.realm = {}; exports.realm_user_settings_defaults = {}; exports.reset = () => { - for (const field in exports.current_user) { - if (Object.hasOwn(exports.current_user, field)) { - delete exports.current_user[field]; - } - } for (const field in exports.page_params) { if (Object.hasOwn(exports.page_params, field)) { delete exports.page_params[field]; } } - for (const field in exports.realm) { - if (Object.hasOwn(exports.realm, field)) { - delete exports.realm[field]; - } - } for (const field in exports.realm_user_settings_defaults) { if (Object.hasOwn(exports.realm_user_settings_defaults, field)) { delete exports.realm_user_settings_defaults[field]; diff --git a/web/tests/markdown.test.js b/web/tests/markdown.test.js index 3a0ee0bd0d..34955836c2 100644 --- a/web/tests/markdown.test.js +++ b/web/tests/markdown.test.js @@ -53,10 +53,12 @@ const markdown_config = zrequire("markdown_config"); const markdown = zrequire("markdown"); const people = zrequire("people"); const pygments_data = zrequire("pygments_data"); +const {set_realm} = zrequire("state_data"); const stream_data = zrequire("stream_data"); const user_groups = zrequire("user_groups"); const {initialize_user_settings} = zrequire("user_settings"); +set_realm({}); const user_settings = {}; initialize_user_settings({user_settings}); diff --git a/web/tests/message_edit.test.js b/web/tests/message_edit.test.js index d271a58a7c..bd470a3ee7 100644 --- a/web/tests/message_edit.test.js +++ b/web/tests/message_edit.test.js @@ -4,15 +4,20 @@ const assert = require("node:assert/strict"); const {mock_esm, zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); -const {current_user, realm} = require("./lib/zpage_params"); const message_edit = zrequire("message_edit"); const people = zrequire("people"); +const {set_current_user, set_realm} = zrequire("state_data"); const is_content_editable = message_edit.is_content_editable; const settings_data = mock_esm("../src/settings_data"); +const realm = {}; +set_realm(realm); +const current_user = {}; +set_current_user(current_user); + run_test("is_content_editable", ({override}) => { // You can't edit a null message assert.equal(is_content_editable(null), false); diff --git a/web/tests/message_events.test.js b/web/tests/message_events.test.js index 30bb3ff6e5..b3f0c1cb54 100644 --- a/web/tests/message_events.test.js +++ b/web/tests/message_events.test.js @@ -5,7 +5,6 @@ const assert = require("node:assert/strict"); const {mock_esm, zrequire} = require("./lib/namespace"); const {run_test, noop} = require("./lib/test"); const $ = require("./lib/zjquery"); -const {realm} = require("./lib/zpage_params"); const message_edit = mock_esm("../src/message_edit"); const message_lists = mock_esm("../src/message_lists"); @@ -25,11 +24,15 @@ const people = zrequire("people"); const message_events = zrequire("message_events"); message_events.__Rewire__("update_views_filtered_on_message_property", () => {}); const message_helper = zrequire("message_helper"); +const {set_realm} = zrequire("state_data"); const stream_data = zrequire("stream_data"); const stream_topic_history = zrequire("stream_topic_history"); const unread = zrequire("unread"); const {initialize_user_settings} = zrequire("user_settings"); +const realm = {}; +set_realm(realm); + initialize_user_settings({user_settings: {}}); const alice = { diff --git a/web/tests/message_list.test.js b/web/tests/message_list.test.js index cb0917158a..c6029a6447 100644 --- a/web/tests/message_list.test.js +++ b/web/tests/message_list.test.js @@ -7,7 +7,6 @@ const {make_stub} = require("./lib/stub"); const {run_test} = require("./lib/test"); const blueslip = require("./lib/zblueslip"); const $ = require("./lib/zjquery"); -const {current_user} = require("./lib/zpage_params"); // These unit tests for web/src/message_list.ts emphasize the model-ish // aspects of the MessageList class. We have to stub out a few functions @@ -42,6 +41,10 @@ mock_esm("../src/message_list_view", { MessageListView, }); const {Filter} = zrequire("filter"); +const {set_current_user} = zrequire("state_data"); + +const current_user = {}; +set_current_user(current_user); run_test("basics", ({override}) => { override(activity_ui, "build_user_sidebar", noop); diff --git a/web/tests/message_store.test.js b/web/tests/message_store.test.js index 218b4ae255..8d07387e1f 100644 --- a/web/tests/message_store.test.js +++ b/web/tests/message_store.test.js @@ -27,8 +27,10 @@ const pm_conversations = zrequire("pm_conversations"); const message_helper = zrequire("message_helper"); const message_store = zrequire("message_store"); const message_user_ids = zrequire("message_user_ids"); +const {set_realm} = zrequire("state_data"); const {initialize_user_settings} = zrequire("user_settings"); +set_realm({}); initialize_user_settings({user_settings: {}}); const denmark = { diff --git a/web/tests/message_view.test.js b/web/tests/message_view.test.js index 23d1dfadbd..d353e50256 100644 --- a/web/tests/message_view.test.js +++ b/web/tests/message_view.test.js @@ -6,7 +6,7 @@ const {mock_esm, zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); const blueslip = require("./lib/zblueslip"); const $ = require("./lib/zjquery"); -const {page_params, realm} = require("./lib/zpage_params"); +const {page_params} = require("./lib/zpage_params"); const hash_util = zrequire("hash_util"); const compose_state = zrequire("compose_state"); @@ -19,9 +19,13 @@ const narrow_title = zrequire("narrow_title"); const recent_view_util = zrequire("recent_view_util"); const inbox_util = zrequire("inbox_util"); const message_lists = zrequire("message_lists"); +const {set_current_user, set_realm} = zrequire("state_data"); const user_groups = zrequire("user_groups"); const {initialize_user_settings} = zrequire("user_settings"); +set_current_user({}); +const realm = {}; +set_realm(realm); initialize_user_settings({user_settings: {}}); mock_esm("../src/compose_banner", { diff --git a/web/tests/narrow_activate.test.js b/web/tests/narrow_activate.test.js index a194a17d93..df0731e537 100644 --- a/web/tests/narrow_activate.test.js +++ b/web/tests/narrow_activate.test.js @@ -80,6 +80,9 @@ const narrow_state = zrequire("narrow_state"); const stream_data = zrequire("stream_data"); const message_view = zrequire("message_view"); const people = zrequire("people"); +const {set_realm} = zrequire("state_data"); + +set_realm({}); const denmark = { subscribed: false, diff --git a/web/tests/narrow_unread.test.js b/web/tests/narrow_unread.test.js index 24f9fccd91..e9f15c1396 100644 --- a/web/tests/narrow_unread.test.js +++ b/web/tests/narrow_unread.test.js @@ -18,6 +18,10 @@ const unread = zrequire("unread"); // The main code we are testing lives here. const narrow_state = zrequire("narrow_state"); const message_lists = zrequire("message_lists"); +const {set_current_user, set_realm} = zrequire("state_data"); + +set_current_user({}); +set_realm({}); const alice = { email: "alice@example.com", diff --git a/web/tests/navbar_alerts.test.js b/web/tests/navbar_alerts.test.js index 5cb48563d8..ee2435ba03 100644 --- a/web/tests/navbar_alerts.test.js +++ b/web/tests/navbar_alerts.test.js @@ -6,7 +6,7 @@ const {addDays} = require("date-fns"); const {mock_esm, zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); -const {current_user, page_params, realm} = require("./lib/zpage_params"); +const {page_params} = require("./lib/zpage_params"); page_params.is_spectator = false; @@ -16,6 +16,12 @@ const timerender = mock_esm("../src/timerender"); const {localstorage} = zrequire("localstorage"); const navbar_alerts = zrequire("navbar_alerts"); +const {set_current_user, set_realm} = zrequire("state_data"); + +const current_user = {}; +set_current_user(current_user); +const realm = {}; +set_realm(realm); function test(label, f) { run_test(label, (helpers) => { diff --git a/web/tests/notifications.test.js b/web/tests/notifications.test.js index 150e2c3b83..565f29a2a3 100644 --- a/web/tests/notifications.test.js +++ b/web/tests/notifications.test.js @@ -5,7 +5,7 @@ const assert = require("node:assert/strict"); const {mock_esm, zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); const $ = require("./lib/zjquery"); -const {current_user, page_params} = require("./lib/zpage_params"); +const {page_params} = require("./lib/zpage_params"); mock_esm("../src/electron_bridge"); mock_esm("../src/spoilers", {hide_spoilers_in_notification() {}}); @@ -15,8 +15,11 @@ const stream_data = zrequire("stream_data"); const desktop_notifications = zrequire("desktop_notifications"); const message_notifications = zrequire("message_notifications"); +const {set_current_user} = zrequire("state_data"); const {initialize_user_settings} = zrequire("user_settings"); +const current_user = {}; +set_current_user(current_user); const user_settings = {}; initialize_user_settings({user_settings}); diff --git a/web/tests/peer_data.test.js b/web/tests/peer_data.test.js index ee08878b9b..02629b0de2 100644 --- a/web/tests/peer_data.test.js +++ b/web/tests/peer_data.test.js @@ -15,8 +15,11 @@ const {page_params} = require("./lib/zpage_params"); const peer_data = zrequire("peer_data"); const people = zrequire("people"); +const {set_current_user} = zrequire("state_data"); const stream_data = zrequire("stream_data"); +set_current_user({}); + page_params.realm_users = []; const me = { diff --git a/web/tests/people.test.js b/web/tests/people.test.js index 63ffffec68..62fdf94fb2 100644 --- a/web/tests/people.test.js +++ b/web/tests/people.test.js @@ -10,7 +10,7 @@ const {$t} = require("./lib/i18n"); const {mock_esm, zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); const blueslip = require("./lib/zblueslip"); -const {current_user, page_params, realm} = require("./lib/zpage_params"); +const {page_params} = require("./lib/zpage_params"); const message_user_ids = mock_esm("../src/message_user_ids"); const settings_data = mock_esm("../src/settings_data", { @@ -19,9 +19,14 @@ const settings_data = mock_esm("../src/settings_data", { const muted_users = zrequire("muted_users"); const people = zrequire("people"); +const {set_current_user, set_realm} = zrequire("state_data"); const user_groups = zrequire("user_groups"); const {initialize_user_settings} = zrequire("user_settings"); +const current_user = {}; +set_current_user(current_user); +const realm = {}; +set_realm(realm); const user_settings = {}; initialize_user_settings({user_settings}); diff --git a/web/tests/pill_typeahead.test.js b/web/tests/pill_typeahead.test.js index e66edfe07d..b8723fa3a3 100644 --- a/web/tests/pill_typeahead.test.js +++ b/web/tests/pill_typeahead.test.js @@ -6,7 +6,7 @@ const {zrequire, mock_esm} = require("./lib/namespace"); const {run_test} = require("./lib/test"); const blueslip = require("./lib/zblueslip"); const $ = require("./lib/zjquery"); -const {page_params, realm} = require("./lib/zpage_params"); +const {page_params} = require("./lib/zpage_params"); const noop = function () {}; @@ -17,10 +17,14 @@ const input_pill = zrequire("input_pill"); const pill_typeahead = zrequire("pill_typeahead"); const peer_data = zrequire("peer_data"); const people = zrequire("people"); +const {set_realm} = zrequire("state_data"); const stream_data = zrequire("stream_data"); const user_groups = zrequire("user_groups"); const typeahead_helper = zrequire("typeahead_helper"); +const realm = {}; +set_realm(realm); + // set global test variables. let sort_recipients_called = false; let sort_streams_called = false; diff --git a/web/tests/pm_conversations.test.js b/web/tests/pm_conversations.test.js index 67fdee4853..5a9b511c2b 100644 --- a/web/tests/pm_conversations.test.js +++ b/web/tests/pm_conversations.test.js @@ -4,12 +4,15 @@ const assert = require("node:assert/strict"); const {zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); -const {current_user} = require("./lib/zpage_params"); const user_topics = zrequire("user_topics"); const muted_users = zrequire("muted_users"); const people = zrequire("people"); const pmc = zrequire("pm_conversations"); +const {set_current_user} = zrequire("state_data"); + +const current_user = {}; +set_current_user(current_user); const alice = { user_id: 1, diff --git a/web/tests/pm_list_data.test.js b/web/tests/pm_list_data.test.js index db7a6512e5..a01cf5c19e 100644 --- a/web/tests/pm_list_data.test.js +++ b/web/tests/pm_list_data.test.js @@ -23,8 +23,10 @@ const people = zrequire("people"); const pm_conversations = zrequire("pm_conversations"); const pm_list_data = zrequire("pm_list_data"); const message_lists = zrequire("message_lists"); +const {set_realm} = zrequire("state_data"); const {initialize_user_settings} = zrequire("user_settings"); +set_realm({}); initialize_user_settings({user_settings: {}}); const alice = { diff --git a/web/tests/poll_widget.test.js b/web/tests/poll_widget.test.js index d757bcba2c..db46b99f07 100644 --- a/web/tests/poll_widget.test.js +++ b/web/tests/poll_widget.test.js @@ -16,6 +16,9 @@ const {PollData} = zrequire("../shared/src/poll_data"); const poll_widget = zrequire("poll_widget"); const people = zrequire("people"); +const {set_realm} = zrequire("state_data"); + +set_realm({}); const me = { email: "me@zulip.com", diff --git a/web/tests/popover_menus_data.test.js b/web/tests/popover_menus_data.test.js index 2e8838cb0d..346c3b61c7 100644 --- a/web/tests/popover_menus_data.test.js +++ b/web/tests/popover_menus_data.test.js @@ -5,7 +5,7 @@ const assert = require("node:assert/strict"); const {mock_esm, zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); const $ = require("./lib/zjquery"); -const {page_params, realm, current_user} = require("./lib/zpage_params"); +const {page_params} = require("./lib/zpage_params"); const {Filter} = zrequire("filter"); const {MessageList} = zrequire("message_list"); @@ -16,6 +16,7 @@ const people = zrequire("people"); const compose_state = zrequire("compose_state"); const user_groups = zrequire("user_groups"); const {MessageListData} = zrequire("message_list_data"); +const {set_current_user, set_realm} = zrequire("state_data"); const noop = function () {}; @@ -54,6 +55,11 @@ mock_esm("../src/group_permission_settings", { }, }); +const current_user = {}; +set_current_user(current_user); +const realm = {}; +set_realm(realm); + // Define test users const mike = { user_id: 1000, diff --git a/web/tests/presence.test.js b/web/tests/presence.test.js index b884540e9c..cd6413534b 100644 --- a/web/tests/presence.test.js +++ b/web/tests/presence.test.js @@ -4,7 +4,6 @@ const assert = require("node:assert/strict"); const {mock_esm, zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); -const {realm} = require("./lib/zpage_params"); mock_esm("../src/settings_data", { user_can_access_all_other_users: () => true, @@ -12,8 +11,11 @@ mock_esm("../src/settings_data", { const people = zrequire("people"); const presence = zrequire("presence"); +const {set_realm} = zrequire("state_data"); const {initialize_user_settings} = zrequire("user_settings"); +const realm = {}; +set_realm(realm); const user_settings = {}; initialize_user_settings({user_settings}); diff --git a/web/tests/reactions.test.js b/web/tests/reactions.test.js index 1a7f83951c..4e60a30b2e 100644 --- a/web/tests/reactions.test.js +++ b/web/tests/reactions.test.js @@ -7,7 +7,7 @@ const {make_stub} = require("./lib/stub"); const {run_test, noop} = require("./lib/test"); const blueslip = require("./lib/zblueslip"); const $ = require("./lib/zjquery"); -const {current_user, page_params} = require("./lib/zpage_params"); +const {page_params} = require("./lib/zpage_params"); const alice_user_id = 5; @@ -59,8 +59,12 @@ const emoji = zrequire("emoji"); const emoji_codes = zrequire("../../static/generated/emoji/emoji_codes.json"); const people = zrequire("people"); const reactions = zrequire("reactions"); +const {set_current_user, set_realm} = zrequire("state_data"); const {initialize_user_settings} = zrequire("user_settings"); +const current_user = {}; +set_current_user(current_user); +set_realm({}); const user_settings = {}; initialize_user_settings({user_settings}); diff --git a/web/tests/recent_view.test.js b/web/tests/recent_view.test.js index 3b75c43bab..5684e5321e 100644 --- a/web/tests/recent_view.test.js +++ b/web/tests/recent_view.test.js @@ -200,8 +200,11 @@ const rt = zrequire("recent_view_ui"); const recent_view_util = zrequire("recent_view_util"); const rt_data = zrequire("recent_view_data"); const muted_users = zrequire("muted_users"); +const {set_realm} = zrequire("state_data"); const sub_store = zrequire("sub_store"); +set_realm({}); + for (const stream_id of [stream1, stream2, stream3, stream4, stream6]) { sub_store.add_hydrated_sub(stream_id, { color: "", diff --git a/web/tests/rendered_markdown.test.js b/web/tests/rendered_markdown.test.js index cc7f35a57a..a4062f5998 100644 --- a/web/tests/rendered_markdown.test.js +++ b/web/tests/rendered_markdown.test.js @@ -7,7 +7,6 @@ const {mock_cjs, mock_esm, zrequire} = require("./lib/namespace"); const {run_test, noop} = require("./lib/test"); const blueslip = require("./lib/zblueslip"); const $ = require("./lib/zjquery"); -const {realm} = require("./lib/zpage_params"); let clipboard_args; class Clipboard { @@ -33,8 +32,11 @@ const message_store = mock_esm("../src/message_store"); mock_esm("../src/settings_data", { user_can_access_all_other_users: () => false, }); +const {set_realm} = zrequire("state_data"); const {initialize_user_settings} = zrequire("user_settings"); +const realm = {}; +set_realm(realm); const user_settings = {}; initialize_user_settings({user_settings}); diff --git a/web/tests/search_suggestion.test.js b/web/tests/search_suggestion.test.js index 0daca334eb..4a79633202 100644 --- a/web/tests/search_suggestion.test.js +++ b/web/tests/search_suggestion.test.js @@ -4,7 +4,7 @@ const assert = require("node:assert/strict"); const {mock_esm, zrequire} = require("./lib/namespace"); const {run_test, noop} = require("./lib/test"); -const {current_user, page_params, realm} = require("./lib/zpage_params"); +const {page_params} = require("./lib/zpage_params"); const narrow_state = mock_esm("../src/narrow_state"); const stream_topic_history_util = mock_esm("../src/stream_topic_history_util"); @@ -16,6 +16,12 @@ const stream_data = zrequire("stream_data"); const stream_topic_history = zrequire("stream_topic_history"); const people = zrequire("people"); const search = zrequire("search_suggestion"); +const {set_current_user, set_realm} = zrequire("state_data"); + +const current_user = {}; +set_current_user(current_user); +const realm = {}; +set_realm(realm); const me = { email: "myself@zulip.com", diff --git a/web/tests/settings_bots.test.js b/web/tests/settings_bots.test.js index 71807f0602..dca6581c6c 100644 --- a/web/tests/settings_bots.test.js +++ b/web/tests/settings_bots.test.js @@ -4,7 +4,6 @@ const assert = require("node:assert/strict"); const {zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); -const {current_user, realm} = require("./lib/zpage_params"); const bot_data_params = { realm_bots: [ @@ -29,6 +28,12 @@ const bot_data_params = { const bot_data = zrequire("bot_data"); const settings_bots = zrequire("settings_bots"); +const {set_current_user, set_realm} = zrequire("state_data"); + +const current_user = {}; +set_current_user(current_user); +const realm = {}; +set_realm(realm); bot_data.initialize(bot_data_params); diff --git a/web/tests/settings_config.test.js b/web/tests/settings_config.test.js index 5b523a129e..7dbf3bac11 100644 --- a/web/tests/settings_config.test.js +++ b/web/tests/settings_config.test.js @@ -6,8 +6,10 @@ const {zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); const settings_config = zrequire("settings_config"); +const {set_realm} = zrequire("state_data"); const {initialize_user_settings} = zrequire("user_settings"); +set_realm({}); const user_settings = {}; initialize_user_settings({user_settings}); diff --git a/web/tests/settings_data.test.js b/web/tests/settings_data.test.js index 4bd78d509b..a0a0a00a24 100644 --- a/web/tests/settings_data.test.js +++ b/web/tests/settings_data.test.js @@ -4,13 +4,18 @@ const assert = require("node:assert/strict"); const {mock_esm, with_overrides, zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); -const {current_user, page_params, realm} = require("./lib/zpage_params"); +const {page_params} = require("./lib/zpage_params"); const settings_data = zrequire("settings_data"); const settings_config = zrequire("settings_config"); +const {set_current_user, set_realm} = zrequire("state_data"); const user_groups = zrequire("user_groups"); const {initialize_user_settings} = zrequire("user_settings"); +const current_user = {}; +set_current_user(current_user); +const realm = {}; +set_realm(realm); const user_settings = {}; initialize_user_settings({user_settings}); diff --git a/web/tests/settings_muted_users.test.js b/web/tests/settings_muted_users.test.js index 01f61dc2b5..1c86922fa8 100644 --- a/web/tests/settings_muted_users.test.js +++ b/web/tests/settings_muted_users.test.js @@ -17,8 +17,10 @@ mock_esm("../src/settings_data", { const settings_muted_users = zrequire("settings_muted_users"); const muted_users = zrequire("muted_users"); const people = zrequire("people"); +const {set_realm} = zrequire("state_data"); const {initialize_user_settings} = zrequire("user_settings"); +set_realm({}); initialize_user_settings({user_settings: {}}); run_test("settings", ({override}) => { diff --git a/web/tests/settings_org.test.js b/web/tests/settings_org.test.js index 81ee74509e..328903eb63 100644 --- a/web/tests/settings_org.test.js +++ b/web/tests/settings_org.test.js @@ -7,7 +7,6 @@ const {mock_esm, zrequire, set_global} = require("./lib/namespace"); const {run_test, noop} = require("./lib/test"); const blueslip = require("./lib/zblueslip"); const $ = require("./lib/zjquery"); -const {current_user, realm} = require("./lib/zpage_params"); const realm_icon = mock_esm("../src/realm_icon"); @@ -26,8 +25,13 @@ const settings_bots = zrequire("settings_bots"); const settings_account = zrequire("settings_account"); const settings_components = zrequire("settings_components"); const settings_org = zrequire("settings_org"); +const {set_current_user, set_realm} = zrequire("state_data"); const {initialize_user_settings} = zrequire("user_settings"); +const current_user = {}; +set_current_user(current_user); +const realm = {}; +set_realm(realm); initialize_user_settings({user_settings: {}}); function test(label, f) { diff --git a/web/tests/settings_profile_fields.test.js b/web/tests/settings_profile_fields.test.js index ffd09bd384..3bac52950a 100644 --- a/web/tests/settings_profile_fields.test.js +++ b/web/tests/settings_profile_fields.test.js @@ -5,7 +5,6 @@ const assert = require("node:assert/strict"); const {mock_esm, with_overrides, zrequire} = require("./lib/namespace"); const {run_test, noop} = require("./lib/test"); const $ = require("./lib/zjquery"); -const {current_user, realm} = require("./lib/zpage_params"); const loading = mock_esm("../src/loading"); @@ -50,6 +49,12 @@ const Sortable = {create: noop}; mock_esm("sortablejs", {default: Sortable}); const settings_profile_fields = zrequire("settings_profile_fields"); +const {set_current_user, set_realm} = zrequire("state_data"); + +const current_user = {}; +set_current_user(current_user); +const realm = {}; +set_realm(realm); function test_populate(opts, template_data) { with_overrides(({override}) => { diff --git a/web/tests/stream_create_subscribers_data.test.js b/web/tests/stream_create_subscribers_data.test.js index d55b2595b4..d8f5abdbe3 100644 --- a/web/tests/stream_create_subscribers_data.test.js +++ b/web/tests/stream_create_subscribers_data.test.js @@ -4,11 +4,14 @@ const assert = require("node:assert/strict"); const {zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); -const {current_user} = require("./lib/zpage_params"); const people = zrequire("people"); +const {set_current_user} = zrequire("state_data"); const stream_create_subscribers_data = zrequire("stream_create_subscribers_data"); +const current_user = {}; +set_current_user(current_user); + const me = { email: "me@zulip.com", full_name: "Zed", // Zed will sort to the top by virtue of being the current user. diff --git a/web/tests/stream_data.test.js b/web/tests/stream_data.test.js index 09304ff7ea..b1cad1c581 100644 --- a/web/tests/stream_data.test.js +++ b/web/tests/stream_data.test.js @@ -5,7 +5,7 @@ const assert = require("node:assert/strict"); const {mock_esm, zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); const blueslip = require("./lib/zblueslip"); -const {current_user, page_params, realm} = require("./lib/zpage_params"); +const {page_params} = require("./lib/zpage_params"); // TODO: Remove after we enable support for // web_public_streams in production. @@ -18,10 +18,15 @@ const settings_config = zrequire("settings_config"); const sub_store = zrequire("sub_store"); const stream_data = zrequire("stream_data"); const hash_util = zrequire("hash_util"); +const {set_current_user, set_realm} = zrequire("state_data"); const stream_settings_data = zrequire("stream_settings_data"); const user_groups = zrequire("user_groups"); const {initialize_user_settings} = zrequire("user_settings"); +const current_user = {}; +set_current_user(current_user); +const realm = {}; +set_realm(realm); const user_settings = {}; initialize_user_settings({user_settings}); diff --git a/web/tests/stream_events.test.js b/web/tests/stream_events.test.js index 10980605f8..d96a428573 100644 --- a/web/tests/stream_events.test.js +++ b/web/tests/stream_events.test.js @@ -46,10 +46,14 @@ const narrow_state = zrequire("narrow_state"); const peer_data = zrequire("peer_data"); const people = zrequire("people"); const settings_config = zrequire("settings_config"); +const {set_current_user, set_realm} = zrequire("state_data"); const stream_create = zrequire("stream_create"); const stream_data = zrequire("stream_data"); const stream_events = zrequire("stream_events"); +set_current_user({}); +set_realm({}); + const george = { email: "george@zulip.com", full_name: "George", diff --git a/web/tests/stream_pill.test.js b/web/tests/stream_pill.test.js index cad560a561..53795b9770 100644 --- a/web/tests/stream_pill.test.js +++ b/web/tests/stream_pill.test.js @@ -4,13 +4,17 @@ const assert = require("node:assert/strict"); const {zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); -const {current_user} = require("./lib/zpage_params"); const peer_data = zrequire("peer_data"); const people = zrequire("people"); +const {set_current_user, set_realm} = zrequire("state_data"); const stream_data = zrequire("stream_data"); const stream_pill = zrequire("stream_pill"); +const current_user = {}; +set_current_user(current_user); +set_realm({}); + const denmark = { stream_id: 101, name: "Denmark", diff --git a/web/tests/stream_settings_ui.test.js b/web/tests/stream_settings_ui.test.js index 48539ff2e4..62110b852c 100644 --- a/web/tests/stream_settings_ui.test.js +++ b/web/tests/stream_settings_ui.test.js @@ -25,11 +25,14 @@ mock_esm("../src/hash_parser", { }); set_global("page_params", {}); +const {set_current_user, set_realm} = zrequire("state_data"); const stream_data = zrequire("stream_data"); const stream_settings_ui = zrequire("stream_settings_ui"); const user_groups = zrequire("user_groups"); const {initialize_user_settings} = zrequire("user_settings"); +set_realm({}); +set_current_user({}); initialize_user_settings({user_settings: {}}); run_test("redraw_left_panel", ({mock_template}) => { diff --git a/web/tests/stream_topic_history.test.js b/web/tests/stream_topic_history.test.js index 54317b01af..c6156c13b2 100644 --- a/web/tests/stream_topic_history.test.js +++ b/web/tests/stream_topic_history.test.js @@ -12,10 +12,13 @@ const all_messages_data = zrequire("all_messages_data"); const echo_state = zrequire("echo_state"); const unread = zrequire("unread"); const message_store = zrequire("message_store"); +const {set_realm} = zrequire("state_data"); const stream_data = zrequire("stream_data"); const stream_topic_history = zrequire("stream_topic_history"); const stream_topic_history_util = zrequire("stream_topic_history_util"); +set_realm({}); + stream_topic_history.set_update_topic_last_message_id(noop); function test(label, f) { diff --git a/web/tests/topic_list_data.test.js b/web/tests/topic_list_data.test.js index 55935768cb..04d19253f0 100644 --- a/web/tests/topic_list_data.test.js +++ b/web/tests/topic_list_data.test.js @@ -31,11 +31,14 @@ const narrow_state = mock_esm("../src/narrow_state", { stream_id() {}, }); +const {set_realm} = zrequire("state_data"); const stream_data = zrequire("stream_data"); const stream_topic_history = zrequire("stream_topic_history"); const topic_list_data = zrequire("topic_list_data"); const unread = zrequire("unread"); +set_realm({}); + const general = { stream_id: 556, name: "general", diff --git a/web/tests/transmit.test.js b/web/tests/transmit.test.js index beeabb45c3..59471ea352 100644 --- a/web/tests/transmit.test.js +++ b/web/tests/transmit.test.js @@ -5,7 +5,6 @@ const assert = require("node:assert/strict"); const {mock_esm, zrequire} = require("./lib/namespace"); const {run_test, noop} = require("./lib/test"); const blueslip = require("./lib/zblueslip"); -const {current_user} = require("./lib/zpage_params"); const channel = mock_esm("../src/channel"); const reload = mock_esm("../src/reload"); @@ -25,8 +24,12 @@ const server_events = mock_esm("../src/server_events"); const people = zrequire("people"); const transmit = zrequire("transmit"); +const {set_current_user} = zrequire("state_data"); const stream_data = zrequire("stream_data"); +const current_user = {}; +set_current_user(current_user); + run_test("transmit_message_ajax", () => { let success_func_called; const success = () => { diff --git a/web/tests/typeahead_helper.test.js b/web/tests/typeahead_helper.test.js index ab8167d8c3..1260749b5f 100644 --- a/web/tests/typeahead_helper.test.js +++ b/web/tests/typeahead_helper.test.js @@ -4,7 +4,6 @@ const assert = require("node:assert/strict"); const {mock_esm, zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); -const {current_user, realm} = require("./lib/zpage_params"); const stream_topic_history = mock_esm("../src/stream_topic_history"); @@ -19,12 +18,17 @@ const stream_list_sort = zrequire("stream_list_sort"); const compose_state = zrequire("compose_state"); const emoji = zrequire("emoji"); const pygments_data = zrequire("pygments_data"); +const {set_current_user, set_realm} = zrequire("state_data"); const util = zrequire("util"); const ct = zrequire("composebox_typeahead"); const th = zrequire("typeahead_helper"); const user_groups = zrequire("user_groups"); const {initialize_user_settings} = zrequire("user_settings"); +const current_user = {}; +set_current_user(current_user); +const realm = {}; +set_realm(realm); const user_settings = {}; initialize_user_settings({user_settings}); diff --git a/web/tests/typing_events.test.js b/web/tests/typing_events.test.js index d0fe89e4c8..5d18903fc6 100644 --- a/web/tests/typing_events.test.js +++ b/web/tests/typing_events.test.js @@ -5,16 +5,20 @@ const assert = require("node:assert/strict"); const {mock_esm, zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); const $ = require("./lib/zjquery"); -const {current_user} = require("./lib/zpage_params"); const settings_data = mock_esm("../src/settings_data"); const {Filter} = zrequire("filter"); const message_lists = zrequire("message_lists"); const people = zrequire("people"); +const {set_current_user, set_realm} = zrequire("state_data"); const typing_data = zrequire("typing_data"); const typing_events = zrequire("typing_events"); +const current_user = {}; +set_current_user(current_user); +set_realm({}); + const anna = { email: "anna@example.com", full_name: "Anna Karenina", diff --git a/web/tests/upload.test.js b/web/tests/upload.test.js index 94c4162bf3..cc5fd32504 100644 --- a/web/tests/upload.test.js +++ b/web/tests/upload.test.js @@ -5,7 +5,6 @@ const assert = require("node:assert/strict"); const {mock_esm, set_global, zrequire} = require("./lib/namespace"); const {run_test, noop} = require("./lib/test"); const $ = require("./lib/zjquery"); -const {realm} = require("./lib/zpage_params"); class ClipboardEvent { constructor({clipboardData}) { @@ -34,6 +33,11 @@ const rows = mock_esm("../src/rows"); const compose_ui = zrequire("compose_ui"); const upload = zrequire("upload"); const message_lists = mock_esm("../src/message_lists"); +const {set_realm} = zrequire("state_data"); + +const realm = {}; +set_realm(realm); + message_lists.current = { id: "1", }; diff --git a/web/tests/user_events.test.js b/web/tests/user_events.test.js index ade41a9243..e492aa8028 100644 --- a/web/tests/user_events.test.js +++ b/web/tests/user_events.test.js @@ -6,7 +6,6 @@ const {mock_esm, zrequire} = require("./lib/namespace"); const {run_test, noop} = require("./lib/test"); const blueslip = require("./lib/zblueslip"); const $ = require("./lib/zjquery"); -const {current_user} = require("./lib/zpage_params"); const message_live_update = mock_esm("../src/message_live_update"); const navbar_alerts = mock_esm("../src/navbar_alerts"); @@ -54,8 +53,13 @@ mock_esm("../src/settings_streams", { const people = zrequire("people"); const settings_config = zrequire("settings_config"); +const {set_current_user, set_realm} = zrequire("state_data"); const user_events = zrequire("user_events"); +const current_user = {}; +set_current_user(current_user); +set_realm({}); + const me = { email: "me@example.com", user_id: 30, diff --git a/web/tests/user_groups.test.js b/web/tests/user_groups.test.js index 4a53571ef7..728df4bd19 100644 --- a/web/tests/user_groups.test.js +++ b/web/tests/user_groups.test.js @@ -5,9 +5,12 @@ const assert = require("node:assert/strict"); const {zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); const blueslip = require("./lib/zblueslip"); -const {realm} = require("./lib/zpage_params"); const user_groups = zrequire("user_groups"); +const {set_realm} = zrequire("state_data"); + +const realm = {}; +set_realm(realm); run_test("user_groups", () => { const students = { diff --git a/web/tests/user_pill.test.js b/web/tests/user_pill.test.js index 48328431b3..88d316e688 100644 --- a/web/tests/user_pill.test.js +++ b/web/tests/user_pill.test.js @@ -5,13 +5,16 @@ const assert = require("node:assert/strict"); const {mock_esm, zrequire} = require("./lib/namespace"); const {run_test} = require("./lib/test"); const blueslip = require("./lib/zblueslip"); -const {realm} = require("./lib/zpage_params"); const people = zrequire("people"); const user_pill = zrequire("user_pill"); +const {set_realm} = zrequire("state_data"); const settings_data = mock_esm("../src/settings_data"); +const realm = {}; +set_realm(realm); + const alice = { email: "alice@example.com", user_id: 99, diff --git a/web/tests/user_search.test.js b/web/tests/user_search.test.js index b946a56821..5058d53400 100644 --- a/web/tests/user_search.test.js +++ b/web/tests/user_search.test.js @@ -5,7 +5,6 @@ const assert = require("node:assert/strict"); const {set_global, mock_esm, zrequire} = require("./lib/namespace"); const {run_test, noop} = require("./lib/test"); const $ = require("./lib/zjquery"); -const {realm} = require("./lib/zpage_params"); const fake_buddy_list = { scroll_container_selector: "#whatever", @@ -46,6 +45,10 @@ const activity_ui = zrequire("activity_ui"); const buddy_data = zrequire("buddy_data"); const muted_users = zrequire("muted_users"); const people = zrequire("people"); +const {set_realm} = zrequire("state_data"); + +const realm = {}; +set_realm(realm); const me = { email: "me@zulip.com",