Skip to content

Commit

Permalink
Merge pull request #1653 from mroderick/upgrade-dependencies
Browse files Browse the repository at this point in the history
Upgrade dependencies
  • Loading branch information
mantoni committed Jan 13, 2018
2 parents 7c3cb4f + dcd4191 commit 0ae60b6
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion lib/sinon/color.js
Expand Up @@ -3,7 +3,7 @@
var supportsColor = require("supports-color");

function colorize(str, color) {
if (!supportsColor) {
if (supportsColor.stdout === false) {
return str;
}

Expand Down
8 changes: 4 additions & 4 deletions package.json
Expand Up @@ -42,18 +42,18 @@
"lodash.get": "^4.4.2",
"lolex": "^2.2.0",
"nise": "^1.2.0",
"supports-color": "^4.4.0",
"supports-color": "^5.1.0",
"type-detect": "^4.0.5"
},
"devDependencies": {
"browserify": "^14.0.0",
"browserify": "^15.1.0",
"dependency-check": "^2.9.1",
"eslint": "^4.6.1",
"eslint-config-sinon": "^1.0.0",
"eslint-plugin-mocha": "^4.2.0",
"husky": "^0.14.2",
"lint-staged": "^4.0.0",
"markdownlint-cli": "^0.4.0",
"lint-staged": "^6.0.0",
"markdownlint-cli": "^0.6.0",
"mocha": "^4.0.0",
"mochify": "^5.1.0",
"mochify-istanbul": "^2.4.1",
Expand Down
10 changes: 7 additions & 3 deletions test/util/core/color-test.js
Expand Up @@ -19,7 +19,9 @@ describe("color", function () {

beforeEach(function () {
color = proxyquire("../../../lib/sinon/color", {
"supports-color": {}
"supports-color": {
stdout: true
}
});
});

Expand All @@ -40,13 +42,15 @@ describe("color", function () {

beforeEach(function () {
color = proxyquire("../../../lib/sinon/color", {
"supports-color": false
"supports-color": {
stdout: false
}
});
});

getColorMethods().forEach(function (method) {
describe(method.name, function () {
it("should return a colored string", function () {
it("should return a regular string", function () {
var string = "lorem ipsum";
var actual = color[method.name](string);

Expand Down

0 comments on commit 0ae60b6

Please sign in to comment.