Skip to content

Commit bb743ff

Browse files
greenkeeper[bot]boneskull
authored andcommitted
Update dependencies to enable Greenkeeper 🌴 (#2621)
* update most dependencies (less `lodash.create` and `phantomjs`) * lint fixes for ESLint * sanity test uses npm v1.4.x under Node.js v0.10 only * only run node-specific tests on appveyor; add node v7
1 parent babbd6b commit bb743ff

File tree

7 files changed

+51
-27
lines changed

7 files changed

+51
-27
lines changed

appveyor.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
environment:
22
matrix:
3+
- nodejs_version: '7'
34
- nodejs_version: '6'
45
- nodejs_version: '4'
56
- nodejs_version: '0.12'
@@ -20,7 +21,7 @@ clone_depth: 1
2021
test_script:
2122
- node --version
2223
- npm --version
23-
- npm test
24+
- make test-node
2425
skip_commits:
2526
message: /\[ci\s+skip\]/
2627

lib/runner.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -681,9 +681,9 @@ Runner.prototype.runSuite = function (suite, fn) {
681681
*/
682682
Runner.prototype.uncaught = function (err) {
683683
if (err) {
684-
debug('uncaught exception %s', err !== function () {
684+
debug('uncaught exception %s', err === (function () {
685685
return this;
686-
}.call(err) ? err : (err.message || err));
686+
}.call(err)) ? (err.message || err) : err);
687687
} else {
688688
debug('uncaught undefined exception');
689689
err = undefinedError();

lib/utils.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ var type = exports.type = function type (value) {
416416
return 'buffer';
417417
}
418418
return Object.prototype.toString.call(value)
419-
.replace(/^\[.+\s(.+?)\]$/, '$1')
419+
.replace(/^\[.+\s(.+?)]$/, '$1')
420420
.toLowerCase();
421421
};
422422

@@ -741,7 +741,9 @@ exports.stackTraceFilter = function () {
741741
if (is.node) {
742742
cwd = process.cwd() + slash;
743743
} else {
744-
cwd = (typeof location === 'undefined' ? window.location : location).href.replace(/\/[^\/]*$/, '/');
744+
cwd = (typeof location === 'undefined'
745+
? window.location
746+
: location).href.replace(/\/[^/]*$/, '/');
745747
slash = '/';
746748
}
747749

package.json

+17-11
Original file line numberDiff line numberDiff line change
@@ -304,10 +304,10 @@
304304
"dependencies": {
305305
"browser-stdout": "1.3.0",
306306
"commander": "2.9.0",
307-
"debug": "2.2.0",
308-
"diff": "1.4.0",
307+
"debug": "2.3.3",
308+
"diff": "3.1.0",
309309
"escape-string-regexp": "1.0.5",
310-
"glob": "7.0.5",
310+
"glob": "7.1.1",
311311
"growl": "1.9.2",
312312
"json3": "3.3.2",
313313
"lodash.create": "3.1.1",
@@ -318,24 +318,24 @@
318318
"assert": "^1.4.1",
319319
"browserify": "^13.0.0",
320320
"coffee-script": "^1.10.0",
321-
"eslint": "^2.13.1",
322-
"eslint-config-semistandard": "^6.0.2",
323-
"eslint-config-standard": "^5.0.0",
324-
"eslint-plugin-promise": "^2.0.1",
325-
"eslint-plugin-standard": "1.3.2",
321+
"eslint": "^3.11.1",
322+
"eslint-config-semistandard": "^7.0.0",
323+
"eslint-config-standard": "^6.2.1",
324+
"eslint-plugin-promise": "^3.4.0",
325+
"eslint-plugin-standard": "2.0.1",
326326
"expect.js": "^0.3.1",
327327
"karma": "^1.1.0",
328328
"karma-browserify": "^5.0.5",
329329
"karma-chrome-launcher": "^2.0.0",
330330
"karma-expect": "^1.1.2",
331331
"karma-mocha": "^1.3.0",
332-
"karma-phantomjs-launcher": "^0.2.3",
332+
"karma-phantomjs-launcher": "^1.0.2",
333333
"karma-sauce-launcher": "^1.0.0",
334334
"karma-spec-reporter": "0.0.26",
335335
"os-name": "^2.0.1",
336336
"phantomjs": "1.9.8",
337337
"rimraf": "^2.5.2",
338-
"should": "^9.0.2",
338+
"should": "^11.1.1",
339339
"through2": "^2.0.1",
340340
"watchify": "^3.7.0"
341341
},
@@ -361,5 +361,11 @@
361361
"supports-color": false
362362
},
363363
"homepage": "https://mochajs.org",
364-
"logo": "https://cldup.com/S9uQ-cOLYz.svg"
364+
"logo": "https://cldup.com/S9uQ-cOLYz.svg",
365+
"greenkeeper": {
366+
"ignore": [
367+
"phantomjs",
368+
"lodash.create"
369+
]
370+
}
365371
}

scripts/travis-before-install.sh

+17-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
#!/usr/bin/env bash
22

3-
npm install --production
4-
# this avoids our mocha.opts (and thus devDependencies) in a roundabout way
5-
./bin/mocha --opts /dev/null --reporter spec test/sanity/sanity.spec.js
3+
runSanityTest () {
4+
# avoids our mocha.opts (and thus devDependencies) in a roundabout way
5+
./bin/mocha --opts /dev/null --reporter spec test/sanity/sanity.spec.js
6+
}
7+
8+
# install [email protected] locally, and try to install production dependencies w/ it.
9+
if [[ ${TRAVIS_NODE_VERSION} =~ 'v0.10' ]]
10+
then
11+
echo "Downgrading to npm v1.4.x..."
12+
npm install npm@~1.4
13+
./node_modules/.bin/npm install --production
14+
runSanityTest
15+
rm -rf node_modules/
16+
else
17+
npm install --production
18+
runSanityTest
19+
fi

test/acceptance/misc/many.spec.js

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ describe('a load of tests', function () {
1414
for (var i = 0; i < iterations; ++i) {
1515
a += i;
1616
}
17+
return a;
1718
}
1819

1920
function addTest () {

test/reporters/base.spec.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ describe('Base reporter', function () {
4444
Base.list([test]);
4545

4646
errOut = stdout.join('\n');
47-
errOut.should.match(/\- actual/);
47+
errOut.should.match(/- actual/);
4848
errOut.should.match(/\+ expected/);
4949
});
5050

@@ -58,7 +58,7 @@ describe('Base reporter', function () {
5858
Base.list([test]);
5959

6060
errOut = stdout.join('\n');
61-
errOut.should.match(/\- actual/);
61+
errOut.should.match(/- actual/);
6262
errOut.should.match(/\+ expected/);
6363
});
6464

@@ -72,7 +72,7 @@ describe('Base reporter', function () {
7272
Base.list([test]);
7373

7474
errOut = stdout.join('\n');
75-
errOut.should.not.match(/\- actual/);
75+
errOut.should.not.match(/- actual/);
7676
errOut.should.not.match(/\+ expected/);
7777
});
7878

@@ -85,7 +85,7 @@ describe('Base reporter', function () {
8585
Base.list([test]);
8686

8787
errOut = stdout.join('\n');
88-
errOut.should.not.match(/\- actual/);
88+
errOut.should.not.match(/- actual/);
8989
errOut.should.not.match(/\+ expected/);
9090
});
9191
});
@@ -127,7 +127,7 @@ describe('Base reporter', function () {
127127
errOut = stdout.join('\n');
128128
errOut.should.match(/"key"/);
129129
errOut.should.match(/test/);
130-
errOut.should.match(/\- actual/);
130+
errOut.should.match(/- actual/);
131131
errOut.should.match(/\+ expected/);
132132
});
133133

@@ -147,7 +147,7 @@ describe('Base reporter', function () {
147147
errOut = stdout.join('\n');
148148
errOut.should.match(/"hasOwnProperty"/);
149149
errOut.should.match(/test/);
150-
errOut.should.match(/\- actual/);
150+
errOut.should.match(/- actual/);
151151
errOut.should.match(/\+ expected/);
152152
});
153153

@@ -166,8 +166,8 @@ describe('Base reporter', function () {
166166

167167
errOut = stdout.join('\n');
168168
errOut.should.match(/\+true/);
169-
errOut.should.match(/\-false/);
170-
errOut.should.match(/\- actual/);
169+
errOut.should.match(/-false/);
170+
errOut.should.match(/- actual/);
171171
errOut.should.match(/\+ expected/);
172172
}
173173
});

0 commit comments

Comments
 (0)