Skip to content

Commit b8a8eed

Browse files
committed
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>
1 parent be26c76 commit b8a8eed

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

lib/internal/assert.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ let red = '';
1111
let white = '';
1212

1313
const kReadableOperator = {
14-
deepStrictEqual: 'Expected inputs to be strictly deep-equal:',
15-
strictEqual: 'Expected inputs to be strictly equal:',
14+
deepStrictEqual: 'Expected values to be strictly deep-equal:',
15+
strictEqual: 'Expected values to be strictly equal:',
1616
strictEqualObject: 'Expected "actual" to be reference-equal to "expected":',
17-
deepEqual: 'Expected inputs to be loosely deep-equal:',
18-
equal: 'Expected inputs to be loosely equal:',
17+
deepEqual: 'Expected values to be loosely deep-equal:',
18+
equal: 'Expected values to be loosely equal:',
1919
notDeepStrictEqual: 'Expected "actual" not to be strictly deep-equal to:',
2020
notStrictEqual: 'Expected "actual" to be strictly unequal to:',
2121
// eslint-disable-next-line max-len
2222
notStrictEqualObject: 'Expected "actual" not to be reference-equal to "expected":',
2323
notDeepEqual: 'Expected "actual" not to be loosely deep-equal to:',
2424
notEqual: 'Expected "actual" to be loosely unequal to:',
25-
notIdentical: 'Inputs identical but not reference equal:',
25+
notIdentical: 'Values identical but not reference-equal:',
2626
};
2727

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

77-
// In case both inputs are objects explicitly mark them as not reference equal
77+
// In case both values are objects explicitly mark them as not reference equal
7878
// for the `strictEqual` operator.
7979
if (operator === 'strictEqual' &&
8080
typeof actual === 'object' &&

test/message/assert_throws_stack.out

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ assert.js:*
22
throw err;
33
^
44

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

88
+ Comparison {}

test/message/error_exit.out

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ assert.js:*
33
throw new AssertionError(obj);
44
^
55

6-
AssertionError [ERR_ASSERTION]: Expected inputs to be strictly equal:
6+
AssertionError [ERR_ASSERTION]: Expected values to be strictly equal:
77

88
1 !== 2
99

test/parallel/test-assert-checktag.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ if (process.stdout.isTTY)
2626
assert.throws(
2727
() => assert.deepStrictEqual(date, fake),
2828
{
29-
message: 'Expected inputs to be strictly deep-equal:\n' +
29+
message: 'Expected values to be strictly deep-equal:\n' +
3030
'+ actual - expected\n\n+ 2016-01-01T00:00:00.000Z\n- Date {}'
3131
}
3232
);
3333
assert.throws(
3434
() => assert.deepStrictEqual(fake, date),
3535
{
36-
message: 'Expected inputs to be strictly deep-equal:\n' +
36+
message: 'Expected values to be strictly deep-equal:\n' +
3737
'+ actual - expected\n\n+ Date {}\n- 2016-01-01T00:00:00.000Z'
3838
}
3939
);

test/parallel/test-assert-deep.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ require('../common');
44
const assert = require('assert');
55
const util = require('util');
66
const { AssertionError } = assert;
7-
const defaultMsgStart = 'Expected inputs to be strictly deep-equal:\n';
7+
const defaultMsgStart = 'Expected values to be strictly deep-equal:\n';
88
const defaultMsgStartFull = `${defaultMsgStart}+ actual - expected`;
99

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

test/parallel/test-assert.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ const a = assert;
3434
if (process.stdout.isTTY)
3535
process.env.NODE_DISABLE_COLORS = '1';
3636

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

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

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

1110-
// Check for reference equal objects in `notStrictEqual()`
1110+
// Check for reference-equal objects in `notStrictEqual()`
11111111
assert.throws(
11121112
() => {
11131113
const obj = {};

test/pseudo-tty/test-assert-colors.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ try {
77
process.env.COLORTERM = '1';
88
assert.deepStrictEqual([1, 2, 2, 2], [2, 2, 2, 2]);
99
} catch (err) {
10-
const expected = 'Expected inputs to be strictly deep-equal:\n' +
10+
const expected = 'Expected values to be strictly deep-equal:\n' +
1111
'\u001b[32m+ actual\u001b[39m \u001b[31m- expected\u001b[39m' +
1212
' \u001b[34m...\u001b[39m Lines skipped\n\n' +
1313
' [\n' +

0 commit comments

Comments
 (0)