Skip to content

Commit

Permalink
Merge a82fc28 into 076f790
Browse files Browse the repository at this point in the history
  • Loading branch information
marlon360 committed May 22, 2018
2 parents 076f790 + a82fc28 commit defff3f
Show file tree
Hide file tree
Showing 7 changed files with 7,805 additions and 4 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
coverage
node_modules
browser
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*.log
*.gz

.cache
node_modules
package-lock.json
coverage
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,22 @@ before_install:
# Setup Node.js version-specific dependencies
- "test $TRAVIS_NODE_VERSION != '0.6' || npm rm --save-dev istanbul"
- "test $TRAVIS_NODE_VERSION != '0.8' || npm rm --save-dev istanbul"
# add modules for browser testing just in node version 6
- "test $TRAVIS_NODE_VERSION == '6.13' || npm rm --save-dev browserify chai karma karma-chai karma-chrome-launcher karma-firefox-launcher karma-mocha karma-spec-reporter"
- "test $(echo $TRAVIS_NODE_VERSION | cut -d. -f1) -ge 4 || npm rm --save-dev $(grep -E '\"eslint\\S*\"' package.json | cut -d'\"' -f2)"
# Update Node.js modules
- "test ! -d node_modules || npm prune"
- "test ! -d node_modules || npm rebuild"
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
script:
# Run test script, depending on istanbul install
- "test ! -z $(npm -ps ls istanbul) || npm test"
- "test -z $(npm -ps ls istanbul) || npm run-script test-travis"
# test in browser if karma available
- "test $TRAVIS_NODE_VERSION != '6.13' || npm run-script test-browser"
- "test -z $(npm -ps ls eslint ) || npm run-script lint"
after_script:
- "test -e ./coverage/lcov.info && npm install coveralls@2 && cat ./coverage/lcov.info | coveralls"

Loading

0 comments on commit defff3f

Please sign in to comment.