diff --git a/.travis.yml b/.travis.yml index bc7f3a7f..b7d020f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ matrix: fast_finish: true include: - node_js: "0.12" - env: OPENPGPJSTEST='unit' OPENPGP_NODE_JS='0.12' + env: OPENPGPJSTEST='coverage' OPENPGP_NODE_JS='0.12' - node_js: "4.2" env: OPENPGPJSTEST='unit' OPENPGP_NODE_JS='4.2' - node_js: "5" diff --git a/travis.sh b/travis.sh index 64c20ae1..9e368acd 100755 --- a/travis.sh +++ b/travis.sh @@ -2,13 +2,17 @@ set -e -if [ $OPENPGPJSTEST = "unit" ]; then - echo "Running OpenPGP.js unit-tests" +if [ $OPENPGPJSTEST = "coverage" ]; then + echo "Running OpenPGP.js unit tests on node.js with code coverage." grunt coverage codeclimate-test-reporter < coverage/lcov.info +elif [ $OPENPGPJSTEST = "unit" ]; then + echo "Running OpenPGP.js unit tests on node.js." + npm test + elif [[ $OPENPGPJSTEST =~ ^end2end-.* ]]; then - echo "Running browser-testing on Saucelabs" + echo "Running OpenPGP.js browser unit tests on Saucelabs." declare -a capabilities=( "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"firefox\", \"version\":\"38.0\", \"platform\":\"Linux\"}'"