summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Early <alexander.early@gmail.com>2017-03-27 12:25:48 -0700
committerAlexander Early <alexander.early@gmail.com>2017-03-27 12:25:48 -0700
commit4b1278b2436b6a9c25d73cdd97d750f6563361d0 (patch)
treef485c766e1689a7b7751ed0670fcf63befd36b72
parentcdbc105bbfa09f0d8006aa46c04eff924b765e7b (diff)
downloadasync-4b1278b2436b6a9c25d73cdd97d750f6563361d0.tar.gz
re-enable firefox testing
-rw-r--r--.travis.yml20
1 files changed, 11 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index 267defc..1cd205f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,23 +6,25 @@ node_js:
- "4"
- "6"
- "7"
-
-#matrix:
-# include:
-# - node_js: "6"
-# addons:
-# firefox: "49.0"
-# env: BROWSER=true MAKE_TEST=true
env:
matrix: BROWSER=false MAKE_TEST=false
+matrix:
+ include:
+ - node_js: "7"
+ addons:
+ firefox:
+ - "45.0"
+ - "52.0"
+ env: BROWSER=true MAKE_TEST=true
+
after_success: npm run coveralls
# Needed to run Karma with Firefox on Travis
# http://karma-runner.github.io/0.13/plus/travis.html
#before_script:
-# - export DISPLAY=:99.0
-# - sh -e /etc/init.d/xvfb start
+ - export DISPLAY=:99.0
+ - sh -e /etc/init.d/xvfb start
script:
- npm test