status-im
/
realm-js
mirror of https://github.com/status-im/realm-js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1333 from realm/test-2.0.x 

fix build for 2.0.x
This commit is contained in:
blagoev 2017-09-21 19:23:17 +03:00 committed by GitHub
parent 749c88ec74 988a86ff19
commit dad61c924a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/test.sh
View File

@ -64,7 +64,7 @@ stop_server() {
echo stopping server echo stopping server
if [[ ${SERVER_PID} -gt 0 ]] ; then if [[ ${SERVER_PID} -gt 0 ]] ; then
echo server is running. killing it echo server is running. killing it
kill -9 ${SERVER_PID} kill -9 ${SERVER_PID} || true
fi fi
} }

3
tests/js/index.js
View File

@ -47,7 +47,8 @@ if (global.enableSyncTests) {
// FIXME: Permission tests currently fail in chrome debugging mode. // FIXME: Permission tests currently fail in chrome debugging mode.
if (typeof navigator === 'undefined' || if (typeof navigator === 'undefined' ||
!/Chrome/.test(navigator.userAgent)) { // eslint-disable-line no-undef !/Chrome/.test(navigator.userAgent)) { // eslint-disable-line no-undef
TESTS.PermissionTests = require('./permission-tests');
TESTS.PermissionTests = require('./permission-tests');
} }
} }