summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Yeates <yeatesgraeme@gmail.com>2016-10-15 12:32:55 -0400
committerGraeme Yeates <yeatesgraeme@gmail.com>2016-10-16 02:05:13 -0400
commit569b552b61cb58f4b59014c5dea828958f3752b7 (patch)
tree8f6761780d5b0f598deb616ee9db647f1de2bb2d
parent13f122a563eddd2f06307b5dcb5724e526ef16fe (diff)
downloadasync-569b552b61cb58f4b59014c5dea828958f3752b7.tar.gz
Test firefox and building bundles in travis
fix travis testing of firefox Revert to eslint@2.0
-rw-r--r--.travis.yml9
-rw-r--r--package.json2
2 files changed, 10 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 9feb56a..6cdb549 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,8 @@ node_js:
- "0.12"
- "4"
- "6"
+addons:
+ firefox: "49.0"
sudo: false
after_success: npm run coveralls
@@ -12,3 +14,10 @@ after_success: npm run coveralls
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
+
+script:
+ # ensure buildable
+ - make
+ - npm test
+ # test in firefox
+ - npm run mocha-browser-test \ No newline at end of file
diff --git a/package.json b/package.json
index 85c8776..0341ac8 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
"cheerio": "^0.22.0",
"coveralls": "^2.11.2",
"es6-promise": "^2.3.0",
- "eslint": "^3.8.0",
+ "eslint": "^2.13.1",
"fs-extra": "^0.26.7",
"gh-pages-deploy": "^0.4.2",
"jsdoc": "^3.4.0",