Skip to content

Commit 3904da4

Browse files
committed
adds node 6 to CI matrix; closes #2239 (#2251)
* update travis matrix for node 6; use trusty image * add test to trigger use of glob.sync()
1 parent 488fd6f commit 3904da4

File tree

2 files changed

+36
-13
lines changed

2 files changed

+36
-13
lines changed

.travis.yml

+25-13
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,33 @@
1+
# in order to use 'trusty' dist, need this.
2+
# see https://docs.travis-ci.com/user/trusty-ci-environment/
3+
sudo: required
4+
5+
# trust dist provides a modern build chain (as opposed to 'precise' dist)
6+
# which absolves us from having to install compilers and stuff
7+
dist: trusty
8+
19
language: node_js
2-
env:
3-
global:
4-
- CXX=g++-4.8
10+
11+
node_js:
12+
- '6'
13+
- '5'
14+
- '4'
15+
- 'iojs'
16+
- '0.12'
17+
- '0.11'
18+
- '0.10'
19+
- '0.8'
20+
521
before_install:
6-
- ./scripts/ensure-compatible-npm.sh
22+
# node 0.8 won't install our dev deps with an out-of-box npm;
23+
# this upgrades it
24+
- ./scripts/ensure-compatible-npm.sh
25+
726
script: travis_retry npm test
8-
node_js:
9-
- '5'
10-
- '4'
11-
- 'iojs'
12-
- '0.12'
13-
- '0.11'
14-
- '0.10'
15-
- '0.8'
16-
sudo: false
27+
1728
notifications:
1829
urls:
30+
# for gitter
1931
- secure: "EmycFlk48bUvOQ07mxnbcn6T+n3G4wVWuXgrDsUUp6EhJ9866wQK9i+qVhqogWuSEQrGoVaS/vpc/NEYxDP30BD/+nqgvOhVhLVEgtziI85imyV/oUVpArdW3AUmuzCrx7rQCivygjpBmWV9ZcUT5Km4qp1iQhuumy2WbplxrZ4="
2032
on_success: change
2133
on_failure: always

test/acceptance/utils.js

+11
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,17 @@ describe('lib/utils', function () {
404404
utils.lookupFiles('/tmp', ['js'], false).should.eql([]);
405405
});
406406

407+
it('should accept a glob "path" value', function () {
408+
utils.lookupFiles('/tmp/mocha-utils*', ['js'], false)
409+
.should
410+
.containEql('/tmp/mocha-utils-link.js')
411+
.and
412+
.containEql('/tmp/mocha-utils.js')
413+
.and
414+
.have
415+
.lengthOf(2);
416+
});
417+
407418
afterEach(function () {
408419
['/tmp/mocha-utils.js', '/tmp/mocha-utils-link.js', '/tmp/bob'].forEach(function (path) {
409420
try {

0 commit comments

Comments
 (0)