Skip to content

Commit d4061a6

Browse files
committed
tools: replace custom ESLint rule with built-in
ESLint 3.5.0 introduces a `no-restricted-properties` rule. Replace our custom `no-deepEqual` rule with this rule. PR-URL: #8478 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 2da2625 commit d4061a6

13 files changed

+16
-43
lines changed

.eslintrc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@ rules:
5454
no-new-require: 2
5555
no-path-concat: 2
5656
no-restricted-modules: [2, sys, _linklist]
57+
no-restricted-properties: [2, {
58+
object: assert,
59+
property: deepEqual,
60+
message: Please use assert.deepStrictEqual().
61+
}]
5762

5863
# Stylistic Issues
5964
# http://eslint.org/docs/rules/#stylistic-issues
@@ -98,7 +103,6 @@ rules:
98103
align-multiline-assignment: 2
99104
assert-fail-single-argument: 2
100105
new-with-error: [2, Error, RangeError, TypeError, SyntaxError, ReferenceError]
101-
no-deepEqual: 2
102106
no-definegetter-definesetter: 2
103107

104108
# Global scoped method and vars

benchmark/assert/deepequal-prims-and-objs-big-array.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint no-deepEqual: 0 */
21
'use strict';
32
var common = require('../common.js');
43
var assert = require('assert');
@@ -35,6 +34,7 @@ function main(conf) {
3534

3635
bench.start();
3736
for (x = 0; x < n; x++) {
37+
// eslint-disable-next-line no-restricted-properties
3838
assert.deepEqual(primArray, primArrayCompare);
3939
}
4040
bench.end(n);

benchmark/assert/deepequal-prims-and-objs-big-loop.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint no-deepEqual: 0 */
21
'use strict';
32
var common = require('../common.js');
43
var assert = require('assert');
@@ -27,6 +26,7 @@ function main(conf) {
2726
bench.start();
2827

2928
for (x = 0; x < n; x++) {
29+
// eslint-disable-next-line no-restricted-properties
3030
assert.deepEqual(new Array([prim]), new Array([prim]));
3131
}
3232

benchmark/assert/deepequal-typedarrays.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint no-deepEqual: 0 */
21
'use strict';
32
var common = require('../common.js');
43
var assert = require('assert');
@@ -17,6 +16,7 @@ function main(conf) {
1716
var actual = new clazz(n * 1e6);
1817
var expected = new clazz(n * 1e6);
1918

19+
// eslint-disable-next-line no-restricted-properties
2020
assert.deepEqual(actual, expected);
2121

2222
bench.end(n);

lib/assert.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,13 @@ assert.notEqual = function notEqual(actual, expected, message) {
126126
// 7. The equivalence assertion tests a deep equality relation.
127127
// assert.deepEqual(actual, expected, message_opt);
128128

129+
/* eslint-disable no-restricted-properties */
129130
assert.deepEqual = function deepEqual(actual, expected, message) {
130131
if (!_deepEqual(actual, expected, false)) {
131132
fail(actual, expected, message, 'deepEqual', assert.deepEqual);
132133
}
133134
};
135+
/* eslint-enable */
134136

135137
assert.deepStrictEqual = function deepStrictEqual(actual, expected, message) {
136138
if (!_deepEqual(actual, expected, true)) {

test/parallel/test-assert-typedarray-deepequal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint no-deepEqual: 0 */
21
'use strict';
32

43
require('../common');
@@ -46,6 +45,7 @@ const notEqualArrayPairs = [
4645
];
4746

4847
equalArrayPairs.forEach((arrayPair) => {
48+
// eslint-disable-next-line no-restricted-properties
4949
assert.deepEqual(arrayPair[0], arrayPair[1]);
5050
});
5151

test/parallel/test-assert.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint no-deepEqual: 0 */
21
'use strict';
32
require('../common');
43
var assert = require('assert');

test/parallel/test-stream2-readable-from-list.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function run() {
2323
var fn = next[1];
2424
console.log('# %s', name);
2525
fn({
26-
same: assert.deepEqual,
26+
same: assert.deepStrictEqual,
2727
equal: assert.equal,
2828
end: function() {
2929
count--;

test/parallel/test-stream2-set-encoding.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function run() {
2222
var fn = next[1];
2323
console.log('# %s', name);
2424
fn({
25-
same: assert.deepEqual,
25+
same: assert.deepStrictEqual,
2626
equal: assert.equal,
2727
end: function() {
2828
count--;

test/parallel/test-stream2-transform.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function run() {
2222
var fn = next[1];
2323
console.log('# %s', name);
2424
fn({
25-
same: assert.deepEqual,
25+
same: assert.deepStrictEqual,
2626
equal: assert.equal,
2727
ok: assert,
2828
end: function() {

test/parallel/test-stream2-writable.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ function run() {
4545
var fn = next[1];
4646
console.log('# %s', name);
4747
fn({
48-
same: assert.deepEqual,
48+
same: assert.deepStrictEqual,
4949
equal: assert.equal,
5050
end: function() {
5151
count--;

test/pummel/test-stream2-basic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ function run() {
8585
var fn = next[1];
8686
console.log('# %s', name);
8787
fn({
88-
same: assert.deepEqual,
88+
same: assert.deepStrictEqual,
8989
ok: assert,
9090
equal: assert.equal,
9191
end: function() {

tools/eslint-rules/no-deepEqual.js

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)