Fix webdriver for firefox

This works around an issue in the mozilla geckodriver: mozilla/geckodriver#1798
mantoni · Sep 6, 2021 · 85e1eec · 85e1eec
1 parent ef2bc49
commit 85e1eec
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/mochify/client.js b/mochify/client.js
@@ -116,6 +116,14 @@ function MochifyReporter(runner) {
 mocha.reporter(MochifyReporter);
 mocha.ui(/* MOCHIFY_UI */);
 mocha.timeout(/* MOCHIFY_TIMEOUT */);
+
+// Workaround for https://github.com/mozilla/geckodriver/issues/1798
+if (typeof globalThis !== 'undefined' && globalThis !== window) {
+  // Register globals on window. Mocha uses globalThis, if defined.
+  window.mocha = mocha;
+  mocha.suite.emit('pre-require', window, null, mocha);
+}
+
 mocha.mochify_pollEvents = pollEvents;
 
 var chunks = [];

diff --git a/mochify/lib/inject-script.js b/mochify/lib/inject-script.js
@@ -26,7 +26,9 @@ async function injectScript(driver, script) {
       chunk = script;
       script = null;
     }
-    await driver.evaluate(`mocha.mochify_receive(${JSON.stringify(chunk)})`);
+    await driver.evaluate(
+      `window.mocha.mochify_receive(${JSON.stringify(chunk)})`
+    );
   } while (script);
-  await driver.evaluate(`mocha.mochify_run()`);
+  await driver.evaluate(`window.mocha.mochify_run()`);
 }
diff --git a/mochify/lib/inject-script.test.js b/mochify/lib/inject-script.test.js
@@ -13,7 +13,7 @@ describe('mochify/lib/inject-script', () => {
 
     assert.calledOnceWith(
       driver.evaluate,
-      'mocha.mochify_receive("console.log(\\"Hi!\\")")'
+      'window.mocha.mochify_receive("console.log(\\"Hi!\\")")'
     );
   });
 
@@ -24,7 +24,7 @@ describe('mochify/lib/inject-script', () => {
 
     await assert.resolves(promise);
     assert.calledTwice(driver.evaluate);
-    assert.calledWith(driver.evaluate, 'mocha.mochify_run()');
+    assert.calledWith(driver.evaluate, 'window.mocha.mochify_run()');
   });
 
   it('splits script into chunks and invokes mochify_receive twice', async () => {
@@ -41,8 +41,11 @@ describe('mochify/lib/inject-script', () => {
     assert.calledWith(script.substring, 0, MAX_SCRIPT_CHUNK);
     assert.calledWith(script.substring, MAX_SCRIPT_CHUNK);
     assert.calledThrice(driver.evaluate);
-    assert.calledWith(driver.evaluate, 'mocha.mochify_receive("first")');
-    assert.calledWith(driver.evaluate, 'mocha.mochify_receive("second")');
-    assert.calledWith(driver.evaluate, 'mocha.mochify_run()');
+    assert.calledWith(driver.evaluate, 'window.mocha.mochify_receive("first")');
+    assert.calledWith(
+      driver.evaluate,
+      'window.mocha.mochify_receive("second")'
+    );
+    assert.calledWith(driver.evaluate, 'window.mocha.mochify_run()');
   });
 });
diff --git a/mochify/lib/poll-events.js b/mochify/lib/poll-events.js
@@ -5,7 +5,9 @@ exports.pollEvents = pollEvents;
 function pollEvents(driver, emit) {
   return new Promise((resolve) => {
     async function doPoll() {
-      const events = await driver.evaluateReturn('mocha.mochify_pollEvents()');
+      const events = await driver.evaluateReturn(
+        'window.mocha.mochify_pollEvents()'
+      );
       if (!events) {
         setImmediate(doPoll);
         return;