Skip to content

armgit / mocha

Public Imported from GitHub
0

☕️ Classic, reliable, trusted test framework for Node.js and the browser

split up matrix a bit

Christopher Hiller27dd1532bc99
diff --git a/.travis.yml b/.travis.yml
index 609b8dae..c5e134b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ matrix:
fast_finish: true
include:
- node_js: '6'
- env: TARGET='clean lint test-node test-browser' S3=1
+ env: TARGET=test-node
- node_js: '5'
env: TARGET=test-node
- node_js: '4'
@@ -34,6 +34,10 @@ matrix:
env: TARGET=test-node
- node_js: '0.10'
env: TARGET=test-node
+ - node_js: '6'
+ env: TARGET=lint
+ - node_js: '6'
+ env: TARGET=test-browser S3=1
before_script: scripts/travis-before-script.sh
diff --git a/Makefile b/Makefile
index c94da8a8..22f3649f 100644
--- a/Makefile
+++ b/Makefile
@@ -42,11 +42,11 @@ lint:
test-node: test-bdd test-tdd test-qunit test-exports test-unit test-integration test-jsapi test-compilers test-glob test-requires test-reporters test-only test-global-only
-test-browser: test-browser-unit test-browser-bdd test-browser-qunit test-browser-tdd test-browser-exports
+test-browser: clean mocha.js test-browser-unit test-browser-bdd test-browser-qunit test-browser-tdd test-browser-exports
test: lint test-node test-browser
-test-browser-unit: mocha.js
+test-browser-unit:
@printf "==> [Test :: Browser]\n"
@NODE_PATH=. $(KARMA) start