From d4c681a937f527a39ef4202f2c26a98da96ded5c Mon Sep 17 00:00:00 2001
From: Steve Howell <showell@zulip.com>
Date: Wed, 12 Jan 2022 15:36:36 +0000
Subject: [PATCH] zjsunit: Remove unnecessary tertiary conditions.

---
 frontend_tests/zjsunit/namespace.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend_tests/zjsunit/namespace.js b/frontend_tests/zjsunit/namespace.js
index 17c3cb6dea..12f472f63c 100644
--- a/frontend_tests/zjsunit/namespace.js
+++ b/frontend_tests/zjsunit/namespace.js
@@ -347,11 +347,12 @@ 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.
 
-    if (typeof val === "function") {
+    const old_val = obj[field];
+
+    if (typeof old_val === "function") {
         throw new TypeError("Please try to avoid mocking here, or use override_rewire.");
     }
 
-    const old_val = field in obj ? obj[field] : obj.__GetDependency__(field);
     try {
         obj.__Rewire__(field, val);
         return f();
@@ -364,11 +365,12 @@ exports.with_function_call_disallowed_rewire = function (obj, field, f) {
     // This is deprecated because it relies on the slow
     // babel-plugin-rewire-ts plugin.
 
-    if (typeof obj[field] !== "function") {
+    const old_val = obj[field];
+
+    if (typeof old_val !== "function") {
         throw new TypeError(`Expected a function for ${field}`);
     }
 
-    const old_val = field in obj ? obj[field] : obj.__GetDependency__(field);
     try {
         obj.__Rewire__(field, () => {
             throw new Error(`unexpected call to ${field}`);
@@ -468,7 +470,7 @@ exports.with_overrides = function (test_function) {
 
         unused_funcs.get(obj).set(func_name, true);
 
-        const old_f = func_name in obj ? obj[func_name] : obj.__GetDependency__(func_name);
+        const old_f = obj[func_name];
         const new_f = function (...args) {
             unused_funcs.get(obj).delete(func_name);
             return f.apply(this, args);