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

zjsunit: Restore necessary ternary conditions. 

This reverts part of commit d4c681a937
(#20764).

The ternary conditions are necessary because __Rewire__ can be (and in
fact is) used to patch non-exported variables.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2022-01-13 10:24:17 -08:00 committed by Steve Howell
parent 0b8a6a51b8
commit 5d01c377f7
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend_tests/zjsunit/namespace.js
View File

@ -347,7 +347,8 @@ exports.with_field_rewire = function (obj, field, val, f) {
// as exporting a helper function for tests from the module
// containing the function you need to mock.
const old_val = obj[field];
// https://github.com/rosswarren/babel-plugin-rewire-ts/issues/15
const old_val = field in obj ? obj[field] : obj.__GetDependency__(field);
if (typeof old_val === "function") {
throw new TypeError("Please try to avoid mocking here, or use override_rewire.");
@ -365,7 +366,8 @@ exports.with_function_call_disallowed_rewire = function (obj, field, f) {
// This is deprecated because it relies on the slow
// babel-plugin-rewire-ts plugin.
const old_val = obj[field];
// https://github.com/rosswarren/babel-plugin-rewire-ts/issues/15
const old_val = field in obj ? obj[field] : obj.__GetDependency__(field);
if (typeof old_val !== "function") {
throw new TypeError(`Expected a function for ${field}`);
@ -470,7 +472,9 @@ exports.with_overrides = function (test_function) {
unused_funcs.get(obj).set(func_name, true);
const old_f = obj[func_name];
// https://github.com/rosswarren/babel-plugin-rewire-ts/issues/15
const old_f = func_name in obj ? obj[func_name] : obj.__GetDependency__(func_name);
const new_f = function (...args) {
unused_funcs.get(obj).delete(func_name);
return f.apply(this, args);