diff --git a/.travis.yml b/.travis.yml index 90548ee9..71b65671 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ node_js: - 8 script: - npm run lint && npm run test - - yarn jest - 'if [[ ${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} = "master" ]]; then npm install -g grunt npm@6.4 && grunt pre-build; fi' after_success: - openssl aes-256-cbc -K $encrypted_440d7f9a3c38_key -iv $encrypted_440d7f9a3c38_iv diff --git a/package.json b/package.json index 54eebe1f..0d6f8bbc 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,8 @@ "scripts": { "start": "electron ./index.js", "compile": "grunt compile", - "test": "cross-env NODE_ENV=test ava --serial", + "test": "npm run ava && npm run jest", + "ava": "cross-env NODE_ENV=test ava --serial", "jest": "jest", "fix": "eslint . --fix", "lint": "eslint .",