From 513d81c9e388bd2e8aa98fad32877fa6188242ed Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Fri, 2 Dec 2016 09:03:13 +0000 Subject: [PATCH 1/7] chore(package): update dependencies https://greenkeeper.io/ --- package.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index f1afe9e6e8..79ee9a0a09 100644 --- a/package.json +++ b/package.json @@ -304,13 +304,13 @@ "dependencies": { "browser-stdout": "1.3.0", "commander": "2.9.0", - "debug": "2.2.0", - "diff": "1.4.0", + "debug": "2.3.3", + "diff": "3.1.0", "escape-string-regexp": "1.0.5", - "glob": "7.0.5", + "glob": "7.1.1", "growl": "1.9.2", "json3": "3.3.2", - "lodash.create": "3.1.1", + "lodash.create": "4.2.0", "mkdirp": "0.5.1", "supports-color": "3.1.2" }, @@ -318,24 +318,24 @@ "assert": "^1.4.1", "browserify": "^13.0.0", "coffee-script": "^1.10.0", - "eslint": "^2.13.1", - "eslint-config-semistandard": "^6.0.2", - "eslint-config-standard": "^5.0.0", - "eslint-plugin-promise": "^2.0.1", - "eslint-plugin-standard": "1.3.2", + "eslint": "^3.11.1", + "eslint-config-semistandard": "^7.0.0", + "eslint-config-standard": "^6.2.1", + "eslint-plugin-promise": "^3.4.0", + "eslint-plugin-standard": "2.0.1", "expect.js": "^0.3.1", "karma": "^1.1.0", "karma-browserify": "^5.0.5", "karma-chrome-launcher": "^2.0.0", "karma-expect": "^1.1.2", "karma-mocha": "^1.3.0", - "karma-phantomjs-launcher": "^0.2.3", + "karma-phantomjs-launcher": "^1.0.2", "karma-sauce-launcher": "^1.0.0", "karma-spec-reporter": "0.0.26", "os-name": "^2.0.1", - "phantomjs": "1.9.8", + "phantomjs": "2.1.7", "rimraf": "^2.5.2", - "should": "^9.0.2", + "should": "^11.1.1", "through2": "^2.0.1", "watchify": "^3.7.0" }, From c530a0aaef640704b71328c66473512b4584bfc8 Mon Sep 17 00:00:00 2001 From: Christopher Hiller Date: Fri, 2 Dec 2016 12:55:27 -0800 Subject: [PATCH 2/7] lint fixes for ESLint --- lib/runner.js | 4 ++-- lib/utils.js | 6 ++++-- test/acceptance/misc/many.spec.js | 1 + test/reporters/base.spec.js | 16 ++++++++-------- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/lib/runner.js b/lib/runner.js index 697ffb65ac..1d3dd959da 100644 --- a/lib/runner.js +++ b/lib/runner.js @@ -681,9 +681,9 @@ Runner.prototype.runSuite = function (suite, fn) { */ Runner.prototype.uncaught = function (err) { if (err) { - debug('uncaught exception %s', err !== function () { + debug('uncaught exception %s', err === (function () { return this; - }.call(err) ? err : (err.message || err)); + }.call(err)) ? (err.message || err) : err); } else { debug('uncaught undefined exception'); err = undefinedError(); diff --git a/lib/utils.js b/lib/utils.js index bf430b9168..657c75838c 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -416,7 +416,7 @@ var type = exports.type = function type (value) { return 'buffer'; } return Object.prototype.toString.call(value) - .replace(/^\[.+\s(.+?)\]$/, '$1') + .replace(/^\[.+\s(.+?)]$/, '$1') .toLowerCase(); }; @@ -741,7 +741,9 @@ exports.stackTraceFilter = function () { if (is.node) { cwd = process.cwd() + slash; } else { - cwd = (typeof location === 'undefined' ? window.location : location).href.replace(/\/[^\/]*$/, '/'); + cwd = (typeof location === 'undefined' + ? window.location + : location).href.replace(/\/[^/]*$/, '/'); slash = '/'; } diff --git a/test/acceptance/misc/many.spec.js b/test/acceptance/misc/many.spec.js index d4e4a1e806..d2297767dd 100644 --- a/test/acceptance/misc/many.spec.js +++ b/test/acceptance/misc/many.spec.js @@ -14,6 +14,7 @@ describe('a load of tests', function () { for (var i = 0; i < iterations; ++i) { a += i; } + return a; } function addTest () { diff --git a/test/reporters/base.spec.js b/test/reporters/base.spec.js index 6282d882ff..43d45e4b7d 100644 --- a/test/reporters/base.spec.js +++ b/test/reporters/base.spec.js @@ -44,7 +44,7 @@ describe('Base reporter', function () { Base.list([test]); errOut = stdout.join('\n'); - errOut.should.match(/\- actual/); + errOut.should.match(/- actual/); errOut.should.match(/\+ expected/); }); @@ -58,7 +58,7 @@ describe('Base reporter', function () { Base.list([test]); errOut = stdout.join('\n'); - errOut.should.match(/\- actual/); + errOut.should.match(/- actual/); errOut.should.match(/\+ expected/); }); @@ -72,7 +72,7 @@ describe('Base reporter', function () { Base.list([test]); errOut = stdout.join('\n'); - errOut.should.not.match(/\- actual/); + errOut.should.not.match(/- actual/); errOut.should.not.match(/\+ expected/); }); @@ -85,7 +85,7 @@ describe('Base reporter', function () { Base.list([test]); errOut = stdout.join('\n'); - errOut.should.not.match(/\- actual/); + errOut.should.not.match(/- actual/); errOut.should.not.match(/\+ expected/); }); }); @@ -127,7 +127,7 @@ describe('Base reporter', function () { errOut = stdout.join('\n'); errOut.should.match(/"key"/); errOut.should.match(/test/); - errOut.should.match(/\- actual/); + errOut.should.match(/- actual/); errOut.should.match(/\+ expected/); }); @@ -147,7 +147,7 @@ describe('Base reporter', function () { errOut = stdout.join('\n'); errOut.should.match(/"hasOwnProperty"/); errOut.should.match(/test/); - errOut.should.match(/\- actual/); + errOut.should.match(/- actual/); errOut.should.match(/\+ expected/); }); @@ -166,8 +166,8 @@ describe('Base reporter', function () { errOut = stdout.join('\n'); errOut.should.match(/\+true/); - errOut.should.match(/\-false/); - errOut.should.match(/\- actual/); + errOut.should.match(/-false/); + errOut.should.match(/- actual/); errOut.should.match(/\+ expected/); } }); From 4c0294f48ccedcd03b1b0600050adccdd7d696ec Mon Sep 17 00:00:00 2001 From: Christopher Hiller Date: Fri, 2 Dec 2016 13:56:04 -0800 Subject: [PATCH 3/7] hold lodash.create and phantomjs back --- package.json | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 79ee9a0a09..71bfad2882 100644 --- a/package.json +++ b/package.json @@ -310,7 +310,7 @@ "glob": "7.1.1", "growl": "1.9.2", "json3": "3.3.2", - "lodash.create": "4.2.0", + "lodash.create": "3.1.1", "mkdirp": "0.5.1", "supports-color": "3.1.2" }, @@ -333,7 +333,7 @@ "karma-sauce-launcher": "^1.0.0", "karma-spec-reporter": "0.0.26", "os-name": "^2.0.1", - "phantomjs": "2.1.7", + "phantomjs": "1.9.8", "rimraf": "^2.5.2", "should": "^11.1.1", "through2": "^2.0.1", @@ -361,5 +361,11 @@ "supports-color": false }, "homepage": "https://mochajs.org", - "logo": "https://cldup.com/S9uQ-cOLYz.svg" + "logo": "https://cldup.com/S9uQ-cOLYz.svg", + "greenkeeper": { + "ignore": [ + "phantomjs", + "lodash.create" + ] + } } From 9d17bca868f4b5777d4db03769d576e7cd95cc7a Mon Sep 17 00:00:00 2001 From: Christopher Hiller Date: Fri, 2 Dec 2016 15:02:41 -0800 Subject: [PATCH 4/7] sanity test uses npm v1.4.x under Node.js v0.10 (experimental) --- scripts/travis-before-install.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/travis-before-install.sh b/scripts/travis-before-install.sh index 9913070ae9..38a2043ba6 100755 --- a/scripts/travis-before-install.sh +++ b/scripts/travis-before-install.sh @@ -1,5 +1,13 @@ #!/usr/bin/env bash -npm install --production -# this avoids our mocha.opts (and thus devDependencies) in a roundabout way +# install npm@1.4 locally, and try to install production dependencies w/ it. +if [[ ${TRAVIS_NODE_VERSION} =~ 'v0.10' ]] +then + npm install npm@~1.4 + ./node_modules/.bin/npm install --production +else + npm install --production +fi + +# avoids our mocha.opts (and thus devDependencies) in a roundabout way ./bin/mocha --opts /dev/null --reporter spec test/sanity/sanity.spec.js From fbca233f70ebea2a3f164deee23de02c01672fb8 Mon Sep 17 00:00:00 2001 From: Christopher Hiller Date: Fri, 2 Dec 2016 16:09:42 -0800 Subject: [PATCH 5/7] add debug msg about downgrading npm [ci skip] --- scripts/travis-before-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/travis-before-install.sh b/scripts/travis-before-install.sh index 38a2043ba6..9d36da6116 100755 --- a/scripts/travis-before-install.sh +++ b/scripts/travis-before-install.sh @@ -3,6 +3,7 @@ # install npm@1.4 locally, and try to install production dependencies w/ it. if [[ ${TRAVIS_NODE_VERSION} =~ 'v0.10' ]] then + echo "Downgrading to npm v1.4.x..." npm install npm@~1.4 ./node_modules/.bin/npm install --production else From f42375f448ba6db84c378b10b18dbd58280052a2 Mon Sep 17 00:00:00 2001 From: Christopher Hiller Date: Fri, 2 Dec 2016 16:14:10 -0800 Subject: [PATCH 6/7] cleanup sanity test afterwards if using npm v1.4.x --- scripts/travis-before-install.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/travis-before-install.sh b/scripts/travis-before-install.sh index 9d36da6116..7d2f303007 100755 --- a/scripts/travis-before-install.sh +++ b/scripts/travis-before-install.sh @@ -1,14 +1,19 @@ #!/usr/bin/env bash +runSanityTest () { + # avoids our mocha.opts (and thus devDependencies) in a roundabout way + ./bin/mocha --opts /dev/null --reporter spec test/sanity/sanity.spec.js +} + # install npm@1.4 locally, and try to install production dependencies w/ it. if [[ ${TRAVIS_NODE_VERSION} =~ 'v0.10' ]] then echo "Downgrading to npm v1.4.x..." npm install npm@~1.4 ./node_modules/.bin/npm install --production + runSanityTest + rm -rf node_modules/ else npm install --production + runSanityTest fi - -# avoids our mocha.opts (and thus devDependencies) in a roundabout way -./bin/mocha --opts /dev/null --reporter spec test/sanity/sanity.spec.js From 68d860ded9b0b763f51b39d205be3a4421d067dc Mon Sep 17 00:00:00 2001 From: Christopher Hiller Date: Fri, 2 Dec 2016 20:39:13 -0800 Subject: [PATCH 7/7] only run node-specific tests on appveyor; add node v7 --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 539b8b073d..6a2a6e1811 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,6 @@ environment: matrix: + - nodejs_version: '7' - nodejs_version: '6' - nodejs_version: '4' - nodejs_version: '0.12' @@ -20,7 +21,7 @@ clone_depth: 1 test_script: - node --version - npm --version - - npm test + - make test-node skip_commits: message: /\[ci\s+skip\]/