Skip to content

Test fix - specify electron-mocha version. #1145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kewde merged 7 commits into from
Apr 27, 2019
Merged

Test fix - specify electron-mocha version. #1145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a0964e2
Test fix - specify electron-mocha version.
bruce-one Apr 16, 2019
12060b4
Test fix - specify electron-mocha version - Windows attempt.
bruce-one Apr 16, 2019
aac8e64
Build.
bruce-one Apr 16, 2019
6db3241
Build.
bruce-one Apr 16, 2019
3429161
Build.
bruce-one Apr 16, 2019
795a8f5
Build.
bruce-one Apr 16, 2019
ac899bf
Build.
bruce-one Apr 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion scripts/build-appveyor.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 5 additions & 1 deletion scripts/build_against_electron.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down