From 1b58f5a700fe1134afc48a81d10e02caf5cd0a67 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <anders@zulip.com>
Date: Tue, 9 Mar 2021 21:03:25 -0800
Subject: [PATCH] zjsunit: Remove objs_installed flag.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
---
 frontend_tests/zjsunit/namespace.js | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/frontend_tests/zjsunit/namespace.js b/frontend_tests/zjsunit/namespace.js
index 9cdf4a3a2d..2c8dc4aa56 100644
--- a/frontend_tests/zjsunit/namespace.js
+++ b/frontend_tests/zjsunit/namespace.js
@@ -7,7 +7,6 @@ const new_globals = new Set();
 let old_globals = {};
 
 let actual_load;
-let objs_installed;
 const module_mocks = new Map();
 const used_module_mocks = new Set();
 
@@ -28,7 +27,6 @@ exports.start = () => {
     actual_load = Module._load;
     Module._load = load;
 
-    objs_installed = false;
     module_mocks.clear();
     used_module_mocks.clear();
 };
@@ -48,15 +46,6 @@ exports.mock_module = (short_fn, obj) => {
             We just assume the file is under static/js.
         `);
     }
-    if (objs_installed) {
-        throw new Error(`
-            It is too late to install this mock.  Consider instead:
-
-                foo.__Rewire__("${short_fn}", ...)
-
-            Or call this earlier.
-        `);
-    }
 
     const filename = require.resolve(`../../static/js/${short_fn}`);
 
@@ -64,6 +53,10 @@ exports.mock_module = (short_fn, obj) => {
         throw new Error(`You already set up a mock for ${filename}`);
     }
 
+    if (filename in require.cache) {
+        throw new Error(`It is too late to mock ${filename}; call this earlier.`);
+    }
+
     obj.__esModule = true;
     module_mocks.set(filename, obj);
     return obj;
@@ -102,7 +95,6 @@ exports.set_global = function (name, val) {
 };
 
 exports.zrequire = function (short_fn) {
-    objs_installed = true;
     return require(`../../static/js/${short_fn}`);
 };