Add --no-diff option (fixes #2514) #2536
Conversation
There was a problem hiding this comment.
Thanks for the PR! I have a few requested changes.
I think we should use the singular "diff" in any relevant object property names and CLI flags; what do you think?
Can you please add a test within test/reporters/base.spec.js? It'd also be good to create a new file as test/integration/no-diff.spec.js.
Otherwise this looks good. 👍
bin/_mocha
Outdated
| @@ -242,6 +243,12 @@ if (program.inlineDiffs) { | |||
| mocha.useInlineDiffs(true); | |||
| } | |||
|
|
|||
| // --no-diffs | |||
|
|
|||
| if (process.argv.indexOf('--no-diffs') !== -1) { | |||
There was a problem hiding this comment.
this doesn't match the actual option
bin/_mocha
Outdated
| // --no-diffs | ||
|
|
||
| if (process.argv.indexOf('--no-diffs') !== -1) { | ||
| mocha.doNotShowDiffs(true); |
There was a problem hiding this comment.
would prefer hideDiffs() or disableDiffs() or something
lib/mocha.js
Outdated
| @@ -509,6 +523,7 @@ Mocha.prototype.run = function (fn) { | |||
| exports.reporters.Base.useColors = options.useColors; | |||
| } | |||
| exports.reporters.Base.inlineDiffs = options.useInlineDiffs; | |||
| exports.reporters.Base.noDiffs = options.noDiffs; | |||
There was a problem hiding this comment.
ugh, this sucks (not your fault)
lib/reporters/base.js
Outdated
| @@ -212,7 +212,9 @@ exports.list = function (failures) { | |||
| var match = message.match(/^([^:]+): expected/); | |||
| msg = '\n ' + color('error message', match ? match[1] : msg); | |||
|
|
|||
| if (exports.inlineDiffs) { | |||
| if (exports.noDiffs) { | |||
There was a problem hiding this comment.
please avoid the empty block:
if (exports.inlineDiffs) {
msg += inlineDiff(err, escape);
} else if (!exports.noDiffs) {
msg += unifiedDiff(err, escape);
}
mocha.js
Outdated
| @@ -1641,6 +1641,20 @@ Mocha.prototype.useInlineDiffs = function (inlineDiffs) { | |||
| }; | |||
|
|
|||
| /** | |||
| * Do not show diffs at all. | |||
There was a problem hiding this comment.
please don't commit changes to this file. it's lame we keep it under VCS (b/c bower)
|
Done! I squashed the changes as recommended in CONTRIBUTING.md. |
|
Ping @boneskull. This PR still has the pr-needs-work label, but I think it's fixed now. |
|
Hey did this get pulled out? I don't see it in the code. I was looking forward to this. |
boneskull
added
status: needs review
|
someone needs to review this and probably resolve the conflicts. as to how soon that'll happen, I can't tell you |
boneskull
added
semver-minor
Adds a
--no-diffflag, which disables diffs completely (takes priority over--inline-diffs). Made to fix #2514.