Skip to content

Commit f178d86

Browse files
committed
attempt to separate the Node and Browser tests in Travis
1 parent d73c4ae commit f178d86

File tree

2 files changed

+25
-13
lines changed

2 files changed

+25
-13
lines changed

.travis.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
1+
sudo: false
12

23
language: node_js
4+
35
node_js:
4-
- "6"
5-
- "5"
66
- "4"
7+
- "6"
8+
- "8"
79

810
install:
9-
- make node_modules
11+
- make install
1012

1113
script:
1214
- make lint
1315
- make test
1416
- make coveralls
17+
18+
matrix:
19+
include:
20+
- node_js: '8'
21+
env: BROWSER=1

Makefile

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,29 @@ dist/debug.js: src/*.js node_modules
3030
. > dist/debug.js
3131

3232
lint:
33-
eslint *.js src/*.js
33+
@eslint *.js src/*.js
3434

3535
test-node:
36-
istanbul cover node_modules/mocha/bin/_mocha -- test/**.js
36+
@istanbul cover node_modules/mocha/bin/_mocha -- test/**.js
37+
@cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
3738

3839
test-browser:
39-
$(MAKE) browser
40-
karma start --single-run
40+
@$(MAKE) browser
41+
@karma start --single-run
4142

42-
test:
43-
concurrently \
43+
test-all:
44+
@concurrently \
4445
"make test-node" \
4546
"make test-browser"
4647

47-
coveralls:
48-
cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
48+
test:
49+
@if [ "x$(BROWSER_NAME)" = "x" ]; then \
50+
$(MAKE) test-node; \
51+
else \
52+
$(MAKE) test-browser; \
53+
fi
4954

5055
clean:
51-
rimraf dist
56+
rimraf dist coverage
5257

53-
.PHONY: browser install clean coveralls lint test test-node test-browser
58+
.PHONY: browser install clean lint test test-all test-node test-browser

0 commit comments

Comments
 (0)