From a0964e22ad93de17d044960f8a4a04d5be5d9b68 Mon Sep 17 00:00:00 2001
From: Bryce Gibson <bryce@gibson-consulting.com.au>
Date: Tue, 16 Apr 2019 10:33:00 +1000
Subject: [PATCH 1/7] Test fix - specify electron-mocha version.

---
 scripts/build_against_electron.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/build_against_electron.sh b/scripts/build_against_electron.sh
index fa865cbf6..90468c36a 100755
--- a/scripts/build_against_electron.sh
+++ b/scripts/build_against_electron.sh
@@ -18,7 +18,11 @@ function publish() {
 
 function electron_pretest() {
     npm install -g electron@${ELECTRON_VERSION}
-    npm install -g electron-mocha
+    if [ "$NODE_VERSION" -le 6 ]; then
+        npm install -g electron-mocha@7
+    else
+        npm install -g electron-mocha
+    fi
     if [ "${TRAVIS_OS_NAME}" = "osx" ]; then 
         (sudo Xvfb :99 -ac -screen 0 1024x768x8; echo ok )&
     else

From 12060b4265f15cb070f3e8fe393654ad5c44ffda Mon Sep 17 00:00:00 2001
From: Bryce Gibson <bryce@gibson-consulting.com.au>
Date: Tue, 16 Apr 2019 13:38:39 +1000
Subject: [PATCH 2/7] Test fix - specify electron-mocha version - Windows
 attempt.

---
 scripts/build-appveyor.bat | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat
index 362cf5bb0..5ec086079 100644
--- a/scripts/build-appveyor.bat
+++ b/scripts/build-appveyor.bat
@@ -106,7 +106,8 @@ GOTO NPM_TEST_FINISHED
 ECHO installing electron
 CALL npm install -g "electron@%NODE_RUNTIME_VERSION%"
 ECHO installing electron-mocha
-CALL npm install -g electron-mocha
+IF "%nodejs_version%" LEQ 6 CALL npm install -g "electron-mocha@7"
+IF "%nodejs_version%" GTR 6 CALL npm install -g "electron-mocha"
 ECHO preparing tests
 CALL electron "test/support/createdb-electron.js"
 DEL "test\support\createdb-electron.js"

From aac8e64ba007ca1f951dac0fa07f8b3ad9b9d483 Mon Sep 17 00:00:00 2001
From: Bryce Gibson <bryce@gibson-consulting.com.au>
Date: Tue, 16 Apr 2019 15:00:25 +1000
Subject: [PATCH 3/7] Build.


From 6db32419ce5b08dbaae74b5d62fc581f0464974e Mon Sep 17 00:00:00 2001
From: Bryce Gibson <bryce@gibson-consulting.com.au>
Date: Tue, 16 Apr 2019 15:32:10 +1000
Subject: [PATCH 4/7] Build.


From 3429161e9ea587394a7de28d34aaf8b7c32e4932 Mon Sep 17 00:00:00 2001
From: Bryce Gibson <bryce@gibson-consulting.com.au>
Date: Tue, 16 Apr 2019 20:25:56 +1000
Subject: [PATCH 5/7] Build.


From 795a8f5b4f57be1c77fa517f2fbf887edfada9d4 Mon Sep 17 00:00:00 2001
From: Bryce Gibson <bryce@gibson-consulting.com.au>
Date: Tue, 16 Apr 2019 20:47:05 +1000
Subject: [PATCH 6/7] Build.


From ac899bf5372901de180fb6484359a0532a86f0da Mon Sep 17 00:00:00 2001
From: Bryce Gibson <bryce@gibson-consulting.com.au>
Date: Wed, 17 Apr 2019 21:01:57 +1000
Subject: [PATCH 7/7] Build.