Skip to content

Commit

Permalink
Merge branch 'add-travis-ci' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Frikki committed Dec 9, 2015
2 parents a4d1218 + fd25e9d commit 41e4968
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 3 deletions.
18 changes: 15 additions & 3 deletions .testem.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
{
"test_page": "test/browser/page/index.html",
"framework": "mocha",
"src_files": [
"test/index.js"
],
"before_tests": "browserify test/browser/index.js -t babelify -o test/bundle.js",
"serve_files": [
"test/bundle.js"
],
"after_tests": "rm test/bundle.js",
"launch_in_ci": [
"firefox"
],
"launch_in_dev": [
"Chrome"
]
"chrome"
],
"ignore_missing_launchers": true
}
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
language: node_js
node_js:
- "4.1"
before_script:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- sleep 3 # give xvfb some time to start
script: npm run test-ci
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"posttest-browser": "rm test/browser/page/tests-bundle.js",
"test-browser": "testem",
"test": "npm run eslint && npm run test-browser",
"test-ci": "testem ci",
"start": "npm install && npm prune && validate-commit-msg",
"precompile": "rm -rf lib/ && mkdir -p lib",
"compile": "babel -d lib/ src/",
Expand Down

0 comments on commit 41e4968

Please sign in to comment.