Skip to content

armgit / mocha

Public Imported from GitHub
0

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

adds node 6 to CI matrix; closes #2239 (#2251)

Christopher Hiller3904da4c2e7f
diff --git a/.travis.yml b/.travis.yml
index 54b19eaa..ffd19c6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,33 @@
+# in order to use 'trusty' dist, need this.
+# see https://docs.travis-ci.com/user/trusty-ci-environment/
+sudo: required
+
+# trust dist provides a modern build chain (as opposed to 'precise' dist)
+# which absolves us from having to install compilers and stuff
+dist: trusty
+
language: node_js
-env:
- global:
- - CXX=g++-4.8
+
+node_js:
+ - '6'
+ - '5'
+ - '4'
+ - 'iojs'
+ - '0.12'
+ - '0.11'
+ - '0.10'
+ - '0.8'
+
before_install:
-- ./scripts/ensure-compatible-npm.sh
+ # node 0.8 won't install our dev deps with an out-of-box npm;
+ # this upgrades it
+ - ./scripts/ensure-compatible-npm.sh
+
script: travis_retry npm test
-node_js:
-- '5'
-- '4'
-- 'iojs'
-- '0.12'
-- '0.11'
-- '0.10'
-- '0.8'
-sudo: false
+
notifications:
urls:
+ # for gitter
- secure: "EmycFlk48bUvOQ07mxnbcn6T+n3G4wVWuXgrDsUUp6EhJ9866wQK9i+qVhqogWuSEQrGoVaS/vpc/NEYxDP30BD/+nqgvOhVhLVEgtziI85imyV/oUVpArdW3AUmuzCrx7rQCivygjpBmWV9ZcUT5Km4qp1iQhuumy2WbplxrZ4="
on_success: change
on_failure: always
diff --git a/test/acceptance/utils.js b/test/acceptance/utils.js
index c67fd9fc..2028d487 100644
--- a/test/acceptance/utils.js
+++ b/test/acceptance/utils.js
@@ -404,6 +404,17 @@ describe('lib/utils', function () {
utils.lookupFiles('/tmp', ['js'], false).should.eql([]);
});
+ it('should accept a glob "path" value', function () {
+ utils.lookupFiles('/tmp/mocha-utils*', ['js'], false)
+ .should
+ .containEql('/tmp/mocha-utils-link.js')
+ .and
+ .containEql('/tmp/mocha-utils.js')
+ .and
+ .have
+ .lengthOf(2);
+ });
+
afterEach(function () {
['/tmp/mocha-utils.js', '/tmp/mocha-utils-link.js', '/tmp/bob'].forEach(function (path) {
try {