Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 60f5a00c09
(#18804), because the same abstraction violation was since
reintroduced in the same way.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2021-06-15 23:24:00 -07:00 committed by Tim Abbott
parent 85e19b2bde
commit 6dbe03c54b
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
frontend_tests/zjsunit/namespace.js
View File

@ -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) => {