zjsunit: Deglobalize namespace.

Signed-off-by: Anders Kaseorg <anders@zulip.com>

.eslintrc.json

@@ -362,11 +362,7 @@
             "files": ["frontend_tests/**"],
             "globals": {
                 "document": false,
-                "reset_module": false,
+                "window": false
-                "set_global": false,
-                "window": false,
-                "with_field": false,
-                "zrequire": false
             },
             "rules": {
                 "no-sync": "off"

frontend_tests/node_tests/activity.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("$", global.make_zjquery());
 const window_stub = $.create("window-stub");
 set_global("to_$", () => window_stub);

frontend_tests/node_tests/alert_words.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {zrequire} = require("../zjsunit/namespace");
+
 const params = {
     alert_words: ["alertone", "alerttwo", "alertthree", "al*rt.*s", ".+", "emoji"],
 };

frontend_tests/node_tests/alert_words_ui.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("$", global.make_zjquery());
 
 set_global("channel", {});

frontend_tests/node_tests/billing.js

@@ -5,6 +5,8 @@ const fs = require("fs");
 
 const {JSDOM} = require("jsdom");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const noop = () => {};
 const template = fs.readFileSync("templates/corporate/billing.html", "utf-8");
 const dom = new JSDOM(template, {pretendToBeVisual: true});

frontend_tests/node_tests/billing_helpers.js

@@ -6,6 +6,8 @@ const fs = require("fs");
 const JQuery = require("jquery");
 const {JSDOM} = require("jsdom");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const template = fs.readFileSync("templates/corporate/upgrade.html", "utf-8");
 const dom = new JSDOM(template, {pretendToBeVisual: true});
 const jquery = JQuery(dom.window);

frontend_tests/node_tests/blueslip_stacktrace.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {zrequire} = require("../zjsunit/namespace");
+
 const blueslip_stacktrace = zrequire("blueslip_stacktrace");
 
 run_test("clean_path", () => {

frontend_tests/node_tests/bot_data.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const _settings_bots = {
     render_bots: () => {},
 };

frontend_tests/node_tests/buddy_data.js

@@ -4,6 +4,8 @@ const {strict: assert} = require("assert");
 
 const _ = require("lodash");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const _page_params = {};
 
 set_global("page_params", _page_params);

frontend_tests/node_tests/buddy_list.js

@@ -4,6 +4,8 @@ const {strict: assert} = require("assert");
 
 const _ = require("lodash");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("$", global.make_zjquery());
 const people = zrequire("people");
 zrequire("buddy_data");

frontend_tests/node_tests/channel.js

@@ -4,6 +4,8 @@ const {strict: assert} = require("assert");
 
 const _ = require("lodash");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("$", {});
 
 set_global("reload", {});
@@ -249,7 +251,7 @@ run_test("retry", () => {
         },
 
         check_ajax_options(options) {
-            global.patch_builtin("setTimeout", (f, delay) => {
+            set_global("setTimeout", (f, delay) => {
                 assert.equal(delay, 0);
                 f();
             });

frontend_tests/node_tests/color_data.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {zrequire} = require("../zjsunit/namespace");
+
 zrequire("color_data");
 
 run_test("pick_color", () => {

frontend_tests/node_tests/colorspace.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {zrequire} = require("../zjsunit/namespace");
+
 zrequire("colorspace");
 
 run_test("sRGB_to_linear", () => {

frontend_tests/node_tests/common.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const noop = () => {};
 
 set_global("$", global.make_zjquery());

frontend_tests/node_tests/components.js

@@ -4,6 +4,8 @@ const {strict: assert} = require("assert");
 
 const _ = require("lodash");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 zrequire("keydown_util");
 zrequire("components");
 

frontend_tests/node_tests/compose.js

@@ -5,6 +5,8 @@ const {strict: assert} = require("assert");
 const {JSDOM} = require("jsdom");
 const rewiremock = require("rewiremock/node");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const events = require("./lib/events");
 
 set_global("bridge", false);
@@ -721,7 +723,7 @@ run_test("send_message", () => {
         return stub_state;
     }
 
-    global.patch_builtin("setTimeout", (func) => {
+    set_global("setTimeout", (func) => {
         func();
     });
     global.server_events = {

frontend_tests/node_tests/compose_actions.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const noop = function () {};
 const return_false = function () {
     return false;

frontend_tests/node_tests/compose_fade.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {zrequire} = require("../zjsunit/namespace");
+
 zrequire("stream_data");
 const people = zrequire("people");
 zrequire("compose_fade");

frontend_tests/node_tests/compose_pm_pill.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("$", global.make_zjquery());
 
 const people = zrequire("people");

frontend_tests/node_tests/compose_ui.js

@@ -4,6 +4,8 @@ const {strict: assert} = require("assert");
 
 const autosize = require("autosize");
 
+const {set_global, with_field, zrequire} = require("../zjsunit/namespace");
+
 zrequire("compose_ui");
 const people = zrequire("people");
 zrequire("user_status");

frontend_tests/node_tests/composebox_typeahead.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const emoji = zrequire("emoji", "shared/js/emoji");
 const typeahead = zrequire("typeahead", "shared/js/typeahead");
 zrequire("compose_state");
@@ -331,7 +333,7 @@ run_test("content_typeahead_selected", () => {
         },
     });
     let set_timeout_called = false;
-    global.patch_builtin("setTimeout", (f, time) => {
+    set_global("setTimeout", (f, time) => {
         f();
         assert.equal(time, 0);
         set_timeout_called = true;

frontend_tests/node_tests/copy_and_paste.js

@@ -2,15 +2,17 @@
 
 const {strict: assert} = require("assert");
 
-global.stub_out_jquery();
+const {JSDOM} = require("jsdom");
+
+const {set_global, stub_out_jquery, zrequire} = require("../zjsunit/namespace");
+
+stub_out_jquery();
 
 set_global("page_params", {
     development_environment: true,
 });
 set_global("compose_ui", {});
 
-const {JSDOM} = require("jsdom");
-
 const {window} = new JSDOM("<!DOCTYPE html><p>Hello world</p>");
 const {DOMParser, document} = window;
 set_global("$", require("jquery")(window));

frontend_tests/node_tests/dispatch.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const noop = function () {};
 
 const events = require("./lib/events");
@@ -14,7 +16,7 @@ const typing_person1 = events.typing_person1;
 
 set_global("$", global.make_zjquery());
 
-global.patch_builtin("setTimeout", (func) => func());
+set_global("setTimeout", (func) => func());
 
 set_global("activity", {});
 set_global("alert_words_ui", {});

frontend_tests/node_tests/dispatch_subs.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const events = require("./lib/events");
 
 const event_fixtures = events.fixtures;

frontend_tests/node_tests/drafts.js

@@ -4,6 +4,8 @@ const {strict: assert} = require("assert");
 
 const XDate = require("xdate");
 
+const {set_global, with_field, zrequire} = require("../zjsunit/namespace");
+
 set_global("$", global.make_zjquery());
 
 zrequire("localstorage");

frontend_tests/node_tests/dropdown_list_widget.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 zrequire("dropdown_list_widget");
 zrequire("scroll_util");
 set_global("$", global.make_zjquery());

frontend_tests/node_tests/echo.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("$", global.make_zjquery());
 set_global("markdown", {});
 set_global("local_message", {

frontend_tests/node_tests/emoji.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {zrequire} = require("../zjsunit/namespace");
+
 const emoji_codes = zrequire("emoji_codes", "generated/emoji/emoji_codes.json");
 
 const events = require("./lib/events");

frontend_tests/node_tests/emoji_picker.js

@@ -4,6 +4,8 @@ const {strict: assert} = require("assert");
 
 const _ = require("lodash");
 
+const {zrequire} = require("../zjsunit/namespace");
+
 const emoji = zrequire("emoji", "shared/js/emoji");
 zrequire("emoji_picker");
 

frontend_tests/node_tests/fenced_code.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {zrequire} = require("../zjsunit/namespace");
+
 const fenced_code = zrequire("fenced_code", "shared/js/fenced_code");
 
 run_test("get_unused_fence", () => {

frontend_tests/node_tests/fetch_status.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const FetchStatus = zrequire("fetch_status");
 set_global("message_scroll", {
     hide_loading_older: () => {},

frontend_tests/node_tests/filter.js

@@ -2,10 +2,12 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, stub_out_jquery, zrequire} = require("../zjsunit/namespace");
+
 zrequire("unread");
 zrequire("stream_data");
 const people = zrequire("people");
-global.stub_out_jquery();
+stub_out_jquery();
 set_global("$", global.make_zjquery());
 zrequire("message_util", "js/message_util");
 zrequire("Filter", "js/filter");

frontend_tests/node_tests/fold_dict.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {zrequire} = require("../zjsunit/namespace");
+
 const {FoldDict} = zrequire("fold_dict");
 
 run_test("basic", () => {

frontend_tests/node_tests/general.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 // This is a general tour of how to write node tests that
 // may also give you some quick insight on how the Zulip
 // browser app is constructed.  Let's start with testing

frontend_tests/node_tests/hash_util.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 zrequire("hash_util");
 zrequire("stream_data");
 const people = zrequire("people");

frontend_tests/node_tests/hashchange.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("$", global.make_zjquery());
 const window_stub = $.create("window-stub");
 set_global("location", {

frontend_tests/node_tests/hotkey.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, with_overrides, zrequire} = require("../zjsunit/namespace");
+
 // Important note on these tests:
 //
 // The way the Zulip hotkey tests work is as follows.  First, we set
@@ -80,7 +82,7 @@ function return_false() {
 }
 
 function stubbing(func_name_to_stub, test_function) {
-    global.with_overrides((override) => {
+    with_overrides((override) => {
         global.with_stub((stub) => {
             override(func_name_to_stub, stub.f);
             test_function(stub);

frontend_tests/node_tests/i18n.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 zrequire("templates");
 
 // We download our translations in `page_params` (which

frontend_tests/node_tests/input_pill.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("$", global.make_zjquery());
 zrequire("input_pill");
 

frontend_tests/node_tests/keydown_util.js

@@ -1,5 +1,7 @@
 "use strict";
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("$", global.make_zjquery());
 
 zrequire("keydown_util");

frontend_tests/node_tests/lazy_set.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {zrequire} = require("../zjsunit/namespace");
+
 const {LazySet} = zrequire("lazy_set");
 
 /*

frontend_tests/node_tests/lightbox.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 zrequire("rows");
 zrequire("lightbox");
 

frontend_tests/node_tests/list_cursor.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {zrequire} = require("../zjsunit/namespace");
+
 zrequire("list_cursor");
 
 run_test("config errors", () => {

frontend_tests/node_tests/list_render.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 zrequire("list_render");
 
 // We need these stubs to get by instanceof checks.

frontend_tests/node_tests/markdown.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, with_field, zrequire} = require("../zjsunit/namespace");
+
 zrequire("hash_util");
 
 const emoji = zrequire("emoji", "shared/js/emoji");

frontend_tests/node_tests/markdown_katex.js

@@ -9,6 +9,8 @@
 
 const rewiremock = require("rewiremock/node");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const markdown_config = zrequire("markdown_config");
 
 set_global("page_params", {});

frontend_tests/node_tests/message_edit.js

@@ -2,12 +2,14 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, stub_out_jquery, zrequire} = require("../zjsunit/namespace");
+
 set_global("document", null);
 set_global("page_params", {
     realm_community_topic_editing_limit_seconds: 86400,
 });
 
-global.stub_out_jquery();
+stub_out_jquery();
 
 zrequire("message_edit");
 

frontend_tests/node_tests/message_events.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 zrequire("message_events");
 zrequire("message_store");
 zrequire("muting");

frontend_tests/node_tests/message_fetch.js

@@ -4,6 +4,8 @@ const {strict: assert} = require("assert");
 
 const _ = require("lodash");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("$", global.make_zjquery());
 set_global("document", "document-stub");
 

frontend_tests/node_tests/message_flags.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 zrequire("unread");
 zrequire("unread_ops");
 zrequire("message_flags");

frontend_tests/node_tests/message_list.js

@@ -1,6 +1,8 @@
 "use strict";
 
 const {strict: assert} = require("assert");
+
+const {set_global, stub_out_jquery, zrequire} = require("../zjsunit/namespace");
 // These unit tests for static/js/message_list.js emphasize the model-ish
 // aspects of the MessageList class.  We have to stub out a few functions
 // related to views and events to get the tests working.
@@ -8,7 +10,7 @@ const {strict: assert} = require("assert");
 const noop = function () {};
 
 set_global("Filter", noop);
-global.stub_out_jquery();
+stub_out_jquery();
 set_global("document", null);
 set_global("narrow_state", {});
 set_global("stream_data", {});

frontend_tests/node_tests/message_list_data.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 zrequire("unread");
 
 zrequire("Filter", "js/filter");
@@ -11,7 +13,7 @@ zrequire("MessageListData", "js/message_list_data");
 set_global("page_params", {});
 set_global("muting", {});
 
-global.patch_builtin("setTimeout", (f, delay) => {
+set_global("setTimeout", (f, delay) => {
     assert.equal(delay, 0);
     return f();
 });

frontend_tests/node_tests/message_list_view.js

@@ -4,6 +4,8 @@ const {strict: assert} = require("assert");
 
 const _ = require("lodash");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("$", global.make_zjquery());
 set_global("document", "document-stub");
 

frontend_tests/node_tests/message_store.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const util = zrequire("util");
 zrequire("pm_conversations");
 const people = zrequire("people");

frontend_tests/node_tests/muting.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 zrequire("timerender");
 zrequire("muting");
 zrequire("stream_data");

frontend_tests/node_tests/narrow.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("$", global.make_zjquery());
 zrequire("hash_util");
 zrequire("hashchange");

frontend_tests/node_tests/narrow_activate.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const util = zrequire("util");
 set_global("$", global.make_zjquery());
 
@@ -54,7 +56,7 @@ set_global("search_pill_widget", {
 //
 // We have strange hacks in narrow.activate to sleep 0
 // seconds.
-global.patch_builtin("setTimeout", (f, t) => {
+set_global("setTimeout", (f, t) => {
     assert.equal(t, 0);
     f();
 });

frontend_tests/node_tests/narrow_local.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 zrequire("Filter", "js/filter");
 zrequire("FetchStatus", "js/fetch_status");
 zrequire("MessageListData", "js/message_list_data");

frontend_tests/node_tests/narrow_state.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const people = zrequire("people");
 zrequire("Filter", "js/filter");
 zrequire("stream_data");

frontend_tests/node_tests/narrow_unread.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 zrequire("Filter", "js/filter");
 const people = zrequire("people");
 zrequire("stream_data");

frontend_tests/node_tests/notifications.js

@@ -4,6 +4,8 @@ const {strict: assert} = require("assert");
 
 const rewiremock = require("rewiremock/node");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 // Dependencies
 set_global(
     "$",

frontend_tests/node_tests/password.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("zxcvbn", zrequire("zxcvbn", "zxcvbn"));
 zrequire("common");
 

frontend_tests/node_tests/people.js

@@ -6,6 +6,8 @@ const _ = require("lodash");
 const moment = require("moment-timezone");
 const rewiremock = require("rewiremock/node");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const people = rewiremock.proxy(() => zrequire("people"), {
     "moment-timezone": () => moment("20130208T080910"),
 });

frontend_tests/node_tests/people_errors.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const people = zrequire("people");
 
 const return_false = function () {

frontend_tests/node_tests/pm_conversations.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {zrequire} = require("../zjsunit/namespace");
+
 const pmc = zrequire("pm_conversations");
 
 run_test("partners", () => {

frontend_tests/node_tests/pm_list.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, with_field, zrequire} = require("../zjsunit/namespace");
+
 set_global("$", global.make_zjquery());
 
 set_global("narrow_state", {});

frontend_tests/node_tests/poll_widget.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 zrequire("poll_widget");
 
 set_global("$", global.make_zjquery());

frontend_tests/node_tests/popovers.js

@@ -4,6 +4,8 @@ const {strict: assert} = require("assert");
 
 const rewiremock = require("rewiremock/node");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("$", global.make_zjquery());
 
 zrequire("hash_util");

frontend_tests/node_tests/presence.js

@@ -4,6 +4,8 @@ const {strict: assert} = require("assert");
 
 const XDate = require("xdate");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const people = zrequire("people");
 zrequire("presence");
 

frontend_tests/node_tests/reactions.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, with_field, zrequire} = require("../zjsunit/namespace");
+
 set_global("document", "document-stub");
 set_global("$", global.make_zjquery());
 

frontend_tests/node_tests/recent_senders.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const rs = zrequire("recent_senders");
 
 let next_id = 0;

frontend_tests/node_tests/recent_topics.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {reset_module, set_global, zrequire} = require("../zjsunit/namespace");
+
 zrequire("message_util");
 
 const noop = () => {};

frontend_tests/node_tests/rendered_markdown.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const rm = zrequire("rendered_markdown");
 const people = zrequire("people");
 zrequire("user_groups");

frontend_tests/node_tests/rtl.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {zrequire} = require("../zjsunit/namespace");
+
 const rtl = zrequire("rtl");
 
 run_test("get_direction", () => {

frontend_tests/node_tests/schema.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {zrequire} = require("../zjsunit/namespace");
+
 zrequire("schema");
 
 run_test("basics", () => {

frontend_tests/node_tests/scroll_util.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 zrequire("scroll_util");
 set_global("ui", {
     get_scroll_element: (element) => element,

frontend_tests/node_tests/search.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("page_params", {
     search_pills_enabled: true,
 });
@@ -28,7 +30,7 @@ set_global("search_pill_widget", {
     },
 });
 
-global.patch_builtin("setTimeout", (func) => func());
+set_global("setTimeout", (func) => func());
 
 run_test("clear_search_form", () => {
     $("#search_query").val("noise");

frontend_tests/node_tests/search_legacy.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("page_params", {
     search_pills_enabled: false,
 });
@@ -21,7 +23,7 @@ set_global("ui_util", {
 set_global("narrow", {});
 set_global("Filter", {});
 
-global.patch_builtin("setTimeout", (func) => func());
+set_global("setTimeout", (func) => func());
 
 run_test("update_button_visibility", () => {
     const search_query = $("#search_query");

frontend_tests/node_tests/search_pill.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {zrequire} = require("../zjsunit/namespace");
+
 zrequire("search_pill");
 zrequire("input_pill");
 zrequire("Filter", "js/filter");

frontend_tests/node_tests/search_suggestion.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("page_params", {
     search_pills_enabled: true,
 });

frontend_tests/node_tests/search_suggestion_legacy.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("page_params", {
     search_pills_enabled: false,
 });

frontend_tests/node_tests/server_events.js

@@ -2,11 +2,13 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, stub_out_jquery, zrequire} = require("../zjsunit/namespace");
+
 const noop = function () {};
 
 set_global("document", {});
 set_global("addEventListener", noop);
-global.stub_out_jquery();
+stub_out_jquery();
 
 zrequire("message_store");
 zrequire("server_events_dispatch");

frontend_tests/node_tests/settings_bots.js

@@ -4,6 +4,8 @@ const {strict: assert} = require("assert");
 
 const rewiremock = require("rewiremock/node");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("page_params", {
     realm_uri: "https://chat.example.com",
     realm_embedded_bots: [

frontend_tests/node_tests/settings_data.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const settings_data = zrequire("settings_data");
 const settings_config = zrequire("settings_config");
 

frontend_tests/node_tests/settings_emoji.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("$", global.make_zjquery());
 set_global("upload_widget", {});
 zrequire("settings_emoji");

frontend_tests/node_tests/settings_muting.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("$", global.make_zjquery());
 set_global("XDate", zrequire("XDate", "xdate"));
 

frontend_tests/node_tests/settings_org.js

@@ -4,6 +4,8 @@ const {strict: assert} = require("assert");
 
 const rewiremock = require("rewiremock/node");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("$", global.make_zjquery());
 
 const noop = () => {};
@@ -200,7 +202,7 @@ function test_submit_settings_form(submit_form) {
         realm_create_stream_policy: settings_config.create_stream_policy_values.by_members.code,
     });
 
-    global.patch_builtin("setTimeout", (func) => func());
+    set_global("setTimeout", (func) => func());
     const ev = {
         preventDefault: noop,
         stopPropagation: noop,

frontend_tests/node_tests/settings_profile_fields.js

@@ -4,6 +4,8 @@ const {strict: assert} = require("assert");
 
 const rewiremock = require("rewiremock/node");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("page_params", {});
 set_global("$", global.make_zjquery());
 set_global("loading", {});

frontend_tests/node_tests/settings_user_groups.js

@@ -4,6 +4,8 @@ const {strict: assert} = require("assert");
 
 const _ = require("lodash");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 zrequire("user_pill");
 zrequire("pill_typeahead");
 zrequire("settings_user_groups");
@@ -329,7 +331,7 @@ run_test("populate_user_groups", () => {
     }
 
     pills.onPillRemove = function (handler) {
-        global.patch_builtin("setTimeout", (func) => {
+        set_global("setTimeout", (func) => {
             func();
         });
         realm_user_group.members = new Set([2, 31]);
@@ -789,7 +791,7 @@ run_test("on_events", () => {
             assert.equal(opts.data.description, "translated: All mobile members");
             api_endpoint_called = true;
             (function test_post_success() {
-                global.patch_builtin("setTimeout", (func) => {
+                set_global("setTimeout", (func) => {
                     func();
                 });
                 opts.success();

frontend_tests/node_tests/spoilers.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("$", global.make_zjquery());
 zrequire("spoilers");
 

frontend_tests/node_tests/stream_data.js

@@ -4,6 +4,8 @@ const {strict: assert} = require("assert");
 
 const _ = require("lodash");
 
+const {set_global, stub_out_jquery, zrequire} = require("../zjsunit/namespace");
+
 set_global("page_params", {
     is_admin: false,
     realm_users: [],
@@ -13,7 +15,7 @@ set_global("page_params", {
 set_global("$", () => {});
 
 set_global("document", null);
-global.stub_out_jquery();
+stub_out_jquery();
 
 zrequire("color_data");
 zrequire("hash_util");

frontend_tests/node_tests/stream_edit.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const {LazySet} = zrequire("lazy_set");
 
 const noop = () => {};

frontend_tests/node_tests/stream_events.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 const noop = function () {};
 const return_true = function () {
     return true;

frontend_tests/node_tests/stream_list.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 set_global("document", "document-stub");
 set_global("$", global.make_zjquery());
 

frontend_tests/node_tests/stream_pill.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {zrequire} = require("../zjsunit/namespace");
+
 zrequire("stream_data");
 zrequire("stream_pill");
 

frontend_tests/node_tests/stream_search.js

@@ -1,6 +1,8 @@
 "use strict";
 
 const {strict: assert} = require("assert");
+
+const {set_global, zrequire} = require("../zjsunit/namespace");
 // This tests the stream searching functionality which currently
 // lives in stream_list.js.
 

frontend_tests/node_tests/stream_sort.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {zrequire} = require("../zjsunit/namespace");
+
 zrequire("stream_data");
 zrequire("stream_sort");
 

frontend_tests/node_tests/stream_topic_history.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 zrequire("unread");
 zrequire("stream_data");
 zrequire("stream_topic_history");

frontend_tests/node_tests/submessage.js

@@ -2,6 +2,8 @@
 
 const {strict: assert} = require("assert");
 
+const {set_global, zrequire} = require("../zjsunit/namespace");
+
 zrequire("submessage");
 
 set_global("channel", {});

frontend_tests/node_tests/subs.js

@@ -2,7 +2,9 @@
 
 const {strict: assert} = require("assert");
 
-global.stub_out_jquery();
+const {set_global, stub_out_jquery, zrequire} = require("../zjsunit/namespace");
+
+stub_out_jquery();
 
 set_global("ui", {
     get_content_element: (element) => element,