use travis build matrix for node and browser tests

ladjs · Dec 26, 2014 · fa3272b · fa3272b
1 parent 9e922cd
commit fa3272b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,3 +9,10 @@ env:
   global:
     - SAUCE_USERNAME='shtylman-superagent'
     - SAUCE_ACCESS_KEY='39a45464-cb1d-4b8d-aa1f-83c7c04fa673'
+
+matrix:
+  include:
+    - node_js: "0.10"
+    - node_js: "0.11"
+    - node_js: "0.10"
+      env: BROWSER=1
diff --git a/Makefile b/Makefile
@@ -5,6 +5,9 @@ REPORTER = spec
 all: superagent.js
 
 test:
+	@if [ "x$(BROWSER)" = "x" ]; then make test-node; else make test-browser; fi
+
+test-node:
 	@NODE_ENV=test NODE_TLS_REJECT_UNAUTHORIZED=0 ./node_modules/.bin/mocha \
 		--require should \
 		--reporter $(REPORTER) \