Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies to enable Greenkeeper 🌴 #2621

Merged
merged 7 commits into from
Dec 3, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
environment:
matrix:
- nodejs_version: '7'
- nodejs_version: '6'
- nodejs_version: '4'
- nodejs_version: '0.12'
Expand All @@ -20,7 +21,7 @@ clone_depth: 1
test_script:
- node --version
- npm --version
- npm test
- make test-node
skip_commits:
message: /\[ci\s+skip\]/

4 changes: 2 additions & 2 deletions lib/runner.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
6 changes: 4 additions & 2 deletions lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
};

Expand Down Expand Up @@ -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 = '/';
}

Expand Down
28 changes: 17 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,10 @@
"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",
Expand All @@ -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",
"rimraf": "^2.5.2",
"should": "^9.0.2",
"should": "^11.1.1",
"through2": "^2.0.1",
"watchify": "^3.7.0"
},
Expand All @@ -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"
]
}
}
20 changes: 17 additions & 3 deletions scripts/travis-before-install.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
#!/usr/bin/env bash

npm install --production
# this avoids our mocha.opts (and thus devDependencies) in a roundabout way
./bin/mocha --opts /dev/null --reporter spec test/sanity/sanity.spec.js
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
1 change: 1 addition & 0 deletions test/acceptance/misc/many.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ describe('a load of tests', function () {
for (var i = 0; i < iterations; ++i) {
a += i;
}
return a;
}

function addTest () {
Expand Down
16 changes: 8 additions & 8 deletions test/reporters/base.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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/);
});

Expand All @@ -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/);
});

Expand All @@ -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/);
});

Expand All @@ -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/);
});
});
Expand Down Expand Up @@ -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/);
});

Expand All @@ -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/);
});

Expand All @@ -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/);
}
});
Expand Down