Skip to content
Permalink
Browse files

assert: switch `inputs` to `values`

The wording seems clearer when using `values` instead of `inputs`.

PR-URL: #23056
Refs: #22763
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
  • Loading branch information
BridgeAR committed Sep 25, 2018
1 parent be26c76 commit b8a8eedf3280f3825812d3f8f0554a186396c9dc
@@ -11,18 +11,18 @@ let red = '';
let white = '';

const kReadableOperator = {
deepStrictEqual: 'Expected inputs to be strictly deep-equal:',
strictEqual: 'Expected inputs to be strictly equal:',
deepStrictEqual: 'Expected values to be strictly deep-equal:',
strictEqual: 'Expected values to be strictly equal:',
strictEqualObject: 'Expected "actual" to be reference-equal to "expected":',
deepEqual: 'Expected inputs to be loosely deep-equal:',
equal: 'Expected inputs to be loosely equal:',
deepEqual: 'Expected values to be loosely deep-equal:',
equal: 'Expected values to be loosely equal:',
notDeepStrictEqual: 'Expected "actual" not to be strictly deep-equal to:',
notStrictEqual: 'Expected "actual" to be strictly unequal to:',
// eslint-disable-next-line max-len
notStrictEqualObject: 'Expected "actual" not to be reference-equal to "expected":',
notDeepEqual: 'Expected "actual" not to be loosely deep-equal to:',
notEqual: 'Expected "actual" to be loosely unequal to:',
notIdentical: 'Inputs identical but not reference equal:',
notIdentical: 'Values identical but not reference-equal:',
};

// Comparing short primitives should just show === / !== instead of using the
@@ -74,7 +74,7 @@ function createErrDiff(actual, expected, operator) {
let i = 0;
let indicator = '';

// In case both inputs are objects explicitly mark them as not reference equal
// In case both values are objects explicitly mark them as not reference equal
// for the `strictEqual` operator.
if (operator === 'strictEqual' &&
typeof actual === 'object' &&
@@ -2,7 +2,7 @@ assert.js:*
throw err;
^

AssertionError [ERR_ASSERTION]: Expected inputs to be strictly deep-equal:
AssertionError [ERR_ASSERTION]: Expected values to be strictly deep-equal:
+ actual - expected

+ Comparison {}
@@ -3,7 +3,7 @@ assert.js:*
throw new AssertionError(obj);
^

AssertionError [ERR_ASSERTION]: Expected inputs to be strictly equal:
AssertionError [ERR_ASSERTION]: Expected values to be strictly equal:

1 !== 2

@@ -26,14 +26,14 @@ if (process.stdout.isTTY)
assert.throws(
() => assert.deepStrictEqual(date, fake),
{
message: 'Expected inputs to be strictly deep-equal:\n' +
message: 'Expected values to be strictly deep-equal:\n' +
'+ actual - expected\n\n+ 2016-01-01T00:00:00.000Z\n- Date {}'
}
);
assert.throws(
() => assert.deepStrictEqual(fake, date),
{
message: 'Expected inputs to be strictly deep-equal:\n' +
message: 'Expected values to be strictly deep-equal:\n' +
'+ actual - expected\n\n+ Date {}\n- 2016-01-01T00:00:00.000Z'
}
);
@@ -4,7 +4,7 @@ require('../common');
const assert = require('assert');
const util = require('util');
const { AssertionError } = assert;
const defaultMsgStart = 'Expected inputs to be strictly deep-equal:\n';
const defaultMsgStart = 'Expected values to be strictly deep-equal:\n';
const defaultMsgStartFull = `${defaultMsgStart}+ actual - expected`;

// Disable colored output to prevent color codes from breaking assertion
@@ -16,7 +16,7 @@ if (process.stdout.isTTY)
// Template tag function turning an error message into a RegExp
// for assert.throws()
function re(literals, ...values) {
let result = 'Expected inputs to be loosely deep-equal:\n\n';
let result = 'Expected values to be loosely deep-equal:\n\n';
for (const [i, value] of values.entries()) {
const str = util.inspect(value, {
compact: false,
@@ -34,8 +34,8 @@ const a = assert;
if (process.stdout.isTTY)
process.env.NODE_DISABLE_COLORS = '1';

const strictEqualMessageStart = 'Expected inputs to be strictly equal:\n';
const start = 'Expected inputs to be strictly deep-equal:';
const strictEqualMessageStart = 'Expected values to be strictly equal:\n';
const start = 'Expected values to be strictly deep-equal:';
const actExp = '+ actual - expected';

assert.ok(a.AssertionError.prototype instanceof Error,
@@ -1013,7 +1013,7 @@ assert.throws(() => { throw null; }, 'foo');
assert.throws(
() => assert.strictEqual([], []),
{
message: 'Inputs identical but not reference equal:\n\n[]\n'
message: 'Values identical but not reference-equal:\n\n[]\n'
}
);

@@ -1107,7 +1107,7 @@ assert.throws(
}
);

// Check for reference equal objects in `notStrictEqual()`
// Check for reference-equal objects in `notStrictEqual()`
assert.throws(
() => {
const obj = {};
@@ -7,7 +7,7 @@ try {
process.env.COLORTERM = '1';
assert.deepStrictEqual([1, 2, 2, 2], [2, 2, 2, 2]);
} catch (err) {
const expected = 'Expected inputs to be strictly deep-equal:\n' +
const expected = 'Expected values to be strictly deep-equal:\n' +
'\u001b[32m+ actual\u001b[39m \u001b[31m- expected\u001b[39m' +
' \u001b[34m...\u001b[39m Lines skipped\n\n' +
' [\n' +

0 comments on commit b8a8eed

Please sign in to comment.
You can’t perform that action at this time.