diff --git a/.env.enc b/.env.enc index bf4ebdd..15d3065 100644 Binary files a/.env.enc and b/.env.enc differ diff --git a/.travis.yml b/.travis.yml index 0f43430..4517fe9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,9 @@ before_script: install: - yarn script: -- if [ "TRAVIS_PULL_REQUEST" = "false" ]; then bash ./scripts/decrypt.sh; fi - yarn build - yarn lint - yarn test before_install: -- openssl aes-256-cbc -K $encrypted_eeb74e8d35d1_key -iv $encrypted_eeb74e8d35d1_iv +- openssl aes-256-cbc -K $encrypted_fb307c69bf51_key -iv $encrypted_fb307c69bf51_iv -in .env.enc -out .env -d diff --git a/test/serverProcess.js b/test/serverProcess.js index ae705d8..b6ff5a4 100644 --- a/test/serverProcess.js +++ b/test/serverProcess.js @@ -16,7 +16,7 @@ function checkStatus (res) { /* SETUP: launch a development server with a wait time */ test.before.cb(t => { - console.log('launching server...') + console.log('SETUP: launching server and updating...') serverProc = childProcess.spawn('yarn', ['dev'], { cwd: '.', stdio: 'ignore' @@ -26,7 +26,21 @@ test.before.cb(t => { serverExited = true }) - setTimeout(t.end, SERVER_LAUNCH_WAIT_TIME) + function pingUpdate () { + const expected = { + success: 'All sheets updated' + } + + return fetch(`${SERVER_ROOT}/api/update`) + .then(checkStatus) + .then(res => res.json()) + .then(json => { + t.deepEqual(json, expected) + t.end() + }) + } + + setTimeout(pingUpdate, SERVER_LAUNCH_WAIT_TIME) }) /* CLEANUP: kill the server */ @@ -39,19 +53,6 @@ test('should launch', t => { t.false(serverExited) }) -test('should update', t => { - const expected = { - success: 'All sheets updated' - } - - return fetch(`${SERVER_ROOT}/api/update`) - .then(checkStatus) - .then(res => res.json()) - .then(json => { - t.deepEqual(json, expected) - }) -}) - const passUrls = [ // / '/api/',