Call close and quit to make FF nightly a bit happier

GoogleChromeLabs · Jun 27, 2017 · 134b52b · 134b52b
1 parent e7e3e13
commit 134b52b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/index.js b/src/index.js
@@ -343,7 +343,8 @@ class SeleniumAssistant {
     return new Promise((resolve) => {
       quitTimeout = setTimeout(resolve, 2000);
 
-      driver.quit()
+      driver.close()
+      .then(() => driver.quit())
       .then(resolve, resolve);
     })
     .then(() => {

diff --git a/test/selenium-assistant.js b/test/selenium-assistant.js
@@ -162,10 +162,11 @@ describe('SeleniumAssistant', function() {
     this.timeout(3000);
 
     const killPromise = seleniumAssistant.killWebDriver({
+      close: () => {
+        return Promise.resolve();
+      },
       quit: () => {
-        return new Promise((resolve, reject) => {
-          resolve();
-        });
+        return Promise.resolve();
       },
     });
     (killPromise instanceof Promise).should.equal(true);
@@ -177,10 +178,11 @@ describe('SeleniumAssistant', function() {
     this.timeout(3000);
 
     const killPromise = seleniumAssistant.killWebDriver({
+      close: () => {
+        return Promise.resolve();
+      },
       quit: () => {
-        return new Promise((resolve, reject) => {
-          reject();
-        });
+        return Promise.reject();
       },
     });
     (killPromise instanceof Promise).should.equal(true);
@@ -192,6 +194,9 @@ describe('SeleniumAssistant', function() {
     this.timeout(5000);
 
     const killPromise = seleniumAssistant.killWebDriver({
+      close: () => {
+        return Promise.resolve();
+      },
       quit: () => {
         return new Promise((resolve, reject) => {});
       },