Bump which to v4 (#139)

* Update `which`

* Fix mocks

lib/utils.js

@@ -20,7 +20,7 @@ var which = require("which");
  * @return {Promise}
  */
 function normalizeBinary (binaryPath, platform, arch) {
-  return new Promise(function(resolve, reject) {
+  return new Promise(function(resolve) {
     platform = platform || os.platform();
     arch = arch || os.arch();
     binaryPath = binaryPath || process.env.JPM_FIREFOX_BINARY || "firefox";
@@ -66,13 +66,7 @@ function normalizeBinary (binaryPath, platform, arch) {
     // On linux but no path yet, use which to try and find the binary
     else if (platform.indexOf("linux") !== -1) {
         binaryPath = normalizeBinary.appNames[binaryPath + " on linux"] || binaryPath;
-        which(binaryPath, function(err, resolvedPath) {
-          if (err) {
-            reject(err);
-          } else {
-            resolve(resolvedPath);
-          }
-        });
+        resolve(which(binaryPath));
         return;
     }
     // No action needed on windows if it's an executable already

package.json

@@ -23,7 +23,7 @@
   "dependencies": {
     "commander": "^12.1.0",
     "shell-quote": "1.8.1",
-    "which": "1.2.4",
+    "which": "^4.0.0",
     "winreg": "0.0.12"
   },
   "devDependencies": {

test/run/test.utils.js

@@ -12,6 +12,10 @@ var sandbox = require('sandboxed-module');
 var binary = utils.normalizeBinary;
 
 sandbox.configure({
+  requires: {
+    // sandboxed-module is unable to find this module directly
+    "fs/promises": require("fs/promises"),
+  },
   globals: {
     // As of Node 12.x, the process global is no longer an enumerable property of the global.
     // https://github.com/nodejs/node/pull/26882
@@ -160,9 +164,7 @@ describe("lib/utils", function () {
 
     var binary = sandbox.require("../../lib/utils", {
       requires: {
-        which: function(bin, callback) {
-          callback(null, "/usr/bin/" + bin);
-        }
+        which: async (bin) => "/usr/bin/" + bin
       }
     }).normalizeBinary;
 
@@ -247,9 +249,7 @@ describe("lib/utils", function () {
 
     var binary = sandbox.require("../../lib/utils", {
       requires: {
-        which: function(bin, callback) {
-          callback(null, "/usr/bin/" + bin);
-        }
+        which: async (bin) => "/usr/bin/" + bin
       }
     }).normalizeBinary;