Skip to content

assert: multiple improvements #21628

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.

Sign up for GitHub

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

Closed
BridgeAR wants to merge 6 commits into from
Closed

assert: multiple improvements #21628

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7589f42
assert: multiple improvements
BridgeAR Jul 3, 2018
671a3cc
fixup: address comment
BridgeAR Jul 14, 2018
511f8a1
fixup: address comment
BridgeAR Jul 16, 2018
e789901
fixup
BridgeAR Jul 27, 2018
4587e5d
fixup: use stderr instead of stdout
BridgeAR Jul 27, 2018
c00e63d
fixup: improve docs
BridgeAR Jul 29, 2018
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
Prev Previous commit
Next Next commit
fixup: address comment
  • Loading branch information
@BridgeAR
BridgeAR committed Jul 27, 2018
commit 511f8a1ebdce9b8c749c81c1625adb2d27501bc3
13 changes: 10 additions & 3 deletions lib/internal/assert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,25 @@ function createErrDiff(actual, expected, operator) {
let i = 0;
let indicator = '';

if (actualLines.length === 1 && expectedLines.length === 1) {
// If "actual" and "expected" fit on a single line and they are not strictly
// equal, check further special handling.
if (actualLines.length === 1 && expectedLines.length === 1 &&
actualLines[0] !== expectedLines[0]) {
const inputLength = actualLines[0].length + expectedLines[0].length;
// If the character length of "actual" and "expected" together is less than
// kMaxShortLength and if neither is an object and at least one of them is
// not `zero`, use the strict equal comparison to visualize the output.
if (inputLength <= kMaxShortLength) {
if ((typeof actual !== 'object' || actual === null) &&
(typeof expected !== 'object' || expected === null) &&
(actual !== 0 || expected !== 0)) { // -0 === +0
return `${kReadableOperator[operator]}:\n\n` +
`${actualLines[0]} !== ${expectedLines[0]}\n`;
}
Copy link
Member

@mcollina mcollina Jul 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please add a comment explaining this block of logic?

Copy link
Member Author

@BridgeAR BridgeAR Jul 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

// If the stdout is a tty and the input length is lower than the current
// columns per line, add a mismatch indicator below the output.
} else if (process.stdout.isTTY &&
inputLength < process.stdout.columns &&
actualLines[0] !== expectedLines[0]) {
inputLength < process.stdout.columns) {
while (actualLines[0][i] === expectedLines[0][i]) {
i++;
}
Expand Down