From 6dbe03c54ba25b864754955eed376e50761bd12e Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <anders@zulip.com>
Date: Tue, 15 Jun 2021 23:24:00 -0700
Subject: [PATCH] zjsunit: Undo mock_cjs abstraction violation.

There is still no need for mock_template to reach into the internals
of mock_cjs.  Make it a normal caller of mock_cjs.

This is basically the same as 60f5a00c0917232369e88471a049a9f4ab673064
(#18804), because the same abstraction violation was since
reintroduced in the same way.

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

diff --git a/frontend_tests/zjsunit/namespace.js b/frontend_tests/zjsunit/namespace.js
index 389f4cd75f..b8a9fdc1b3 100644
--- a/frontend_tests/zjsunit/namespace.js
+++ b/frontend_tests/zjsunit/namespace.js
@@ -108,9 +108,15 @@ exports.start = () => {
 // "module" field of package.json, while Node.js will not; we need to mock the
 // format preferred by Webpack.
 
-function get_validated_filename(fn) {
+exports.mock_cjs = (request, obj) => {
+    if (request === "jquery") {
+        throw new Error(
+            "We automatically mock jquery to zjquery. Grep for mock_jquery if you want more control.",
+        );
+    }
+
     const filename = Module._resolveFilename(
-        fn,
+        request,
         require.cache[callsites()[1].getFileName()],
         false,
     );
@@ -123,18 +129,7 @@ function get_validated_filename(fn) {
         throw new Error(`It is too late to mock ${filename}; call this earlier.`);
     }
 
-    return filename;
-}
-
-exports.mock_cjs = (fn, obj) => {
-    if (fn === "jquery") {
-        throw new Error(
-            "We automatically mock jquery to zjquery. Grep for mock_jquery if you want more control.",
-        );
-    }
-    const filename = get_validated_filename(fn);
     module_mocks.set(filename, obj);
-
     return obj;
 };
 
@@ -154,20 +149,14 @@ exports.mock_template = (fn, exercise_template) => {
 
     obj.f.__default = true;
 
-    const filename = get_validated_filename("../../static/templates/" + fn);
-
-    // We update module_mocks with our object, but load() will return
-    // its own function that calls our obj.f.
-    module_mocks.set(filename, obj);
-
-    return obj;
+    return exports.mock_cjs("../../static/templates/" + fn, obj);
 };
 
-exports.mock_esm = (fn, obj = {}) => {
+exports.mock_esm = (request, obj = {}) => {
     if (typeof obj !== "object") {
         throw new TypeError("An ES module must be mocked with an object");
     }
-    return exports.mock_cjs(fn, {...obj, __esModule: true});
+    return exports.mock_cjs(request, {...obj, __esModule: true});
 };
 
 exports.unmock_module = (request) => {