refactor(nw): use findpath to get path to ChromeDriver

nwutils · Dec 17, 2023 · a57a4e6 · a57a4e6
1 parent 7aa0956
commit a57a4e6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/chrome/webgl/test.js b/chrome/webgl/test.js
@@ -1,8 +1,9 @@
 import { equal } from "node:assert";
 import { after, before, describe, it } from "node:test";
 import { dirname, relative } from "node:path";
-import { cwd, platform } from "node:process";
+import { cwd } from "node:process";
 
+import { findpath } from "nw";
 import { By } from "selenium-webdriver";
 import chrome from "selenium-webdriver/chrome.js";
 
@@ -22,11 +23,7 @@ describe("chrome WebGL tests", async () => {
     ];
     options.addArguments(args);
 
-    const service = new ServiceBuilder(
-      `${cwd()}/node_modules/nw/nwjs/chromedriver${
-        platform === "win32" ? ".exe" : ""
-      }`,
-    ).build();
+    const service = new ServiceBuilder(findpath('chromedriver')).build();
 
     driver = Driver.createSession(options, service);
   });

diff --git a/nw/window/test.js b/nw/window/test.js
@@ -1,8 +1,9 @@
 import { equal } from "node:assert";
 import { after, before, describe, it } from "node:test";
-import { dirname, relative, resolve } from "node:path";
+import { dirname, relative } from "node:path";
 import { cwd, platform } from "node:process";
 
+import { findpath } from "nw";
 import { By } from "selenium-webdriver";
 import chrome from "selenium-webdriver/chrome.js";
 
@@ -22,14 +23,7 @@ describe("nw.Window tests", async () => {
     ];
     options.addArguments(args);
 
-    const service = new ServiceBuilder(
-      resolve(
-        "node_modules",
-        "nw",
-        "nwjs",
-        `chromedriver${platform === "win32" ? ".exe" : ""}`,
-      ),
-    ).build();
+    const service = new ServiceBuilder(findpath()).build();
 
     driver = Driver.createSession(options, service);
   });