Skip to content

Commit 21492f6

Browse files
aladdin-addaladdin-add
committed
chore: switch to eslint flat-rule-tester
1 parent 47ca8c1 commit 21492f6

32 files changed

+189
-113
lines changed

‎lib/rules/no-unused-placeholders.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,12 @@ module.exports = {
101101
const PLACEHOLDER_MATCHER = /{{\s*([^{}]+?)\s*}}/g;
102102
const placeholdersInMessage = new Set();
103103

104-
messageValue.replace(PLACEHOLDER_MATCHER, (fullMatch, term) => {
105-
placeholdersInMessage.add(term);
106-
});
104+
messageValue.replaceAll(
105+
PLACEHOLDER_MATCHER,
106+
(fullMatch, term) => {
107+
placeholdersInMessage.add(term);
108+
}
109+
);
107110

108111
data.properties.forEach((prop) => {
109112
const key = utils.getKeyName(prop);

‎lib/rules/require-meta-docs-url.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ module.exports = {
6262
const expectedUrl =
6363
!options.pattern || !ruleName
6464
? undefined
65-
: options.pattern.replace(/{{\s*name\s*}}/g, ruleName);
65+
: options.pattern.replaceAll(/{{\s*name\s*}}/g, ruleName);
6666

6767
/**
6868
* Check whether a given URL is the expected URL.

‎lib/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ module.exports = {
719719
return fixer.replaceText(node, `{\n${propertyText}\n}`);
720720
}
721721
return fixer.insertTextAfter(
722-
sourceCode.getLastToken(node.properties[node.properties.length - 1]),
722+
sourceCode.getLastToken(node.properties.at(-1)),
723723
`,\n${propertyText}`
724724
);
725725
},

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"eslint-plugin-markdown": "^3.0.0",
7171
"eslint-plugin-n": "^16.6.2",
7272
"eslint-plugin-prettier": "^4.2.1",
73-
"eslint-plugin-unicorn": "^46.0.0",
73+
"eslint-plugin-unicorn": "^52.0.0",
7474
"eslint-remote-tester": "^3.0.1",
7575
"eslint-scope": "^8.0.1",
7676
"espree": "^10.0.1",

‎tests/lib/eslint-rule-tester.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/**
2+
* @fileoverview Helpers for tests.
3+
* @author 唯然<[email protected]>
4+
*/
5+
6+
'use strict';
7+
8+
const eslintVersion = require('eslint/package.json').version;
9+
const { RuleTester } = require('eslint');
10+
const { FlatRuleTester } = require('eslint/use-at-your-own-risk');
11+
12+
// greater than or equal to ESLint v9
13+
exports.gteEslintV9 = +eslintVersion.split('.')[0] >= 9;
14+
15+
exports.RuleTester = exports.gteEslintV9 ? RuleTester : FlatRuleTester;

‎tests/lib/rules/consistent-output.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,17 @@
1010
// ------------------------------------------------------------------------------
1111

1212
const rule = require('../../../lib/rules/consistent-output');
13-
const RuleTester = require('eslint').RuleTester;
13+
const RuleTester = require('../eslint-rule-tester').RuleTester;
1414

1515
const ERROR = { messageId: 'missingOutput', type: 'ObjectExpression' };
1616

1717
// ------------------------------------------------------------------------------
1818
// Tests
1919
// ------------------------------------------------------------------------------
2020

21-
const ruleTester = new RuleTester();
21+
const ruleTester = new RuleTester({
22+
languageOptions: { sourceType: 'commonjs' },
23+
});
2224
ruleTester.run('consistent-output', rule, {
2325
valid: [
2426
`

‎tests/lib/rules/fixer-return.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010
// ------------------------------------------------------------------------------
1111

1212
const rule = require('../../../lib/rules/fixer-return');
13-
const RuleTester = require('eslint').RuleTester;
13+
const RuleTester = require('../eslint-rule-tester').RuleTester;
1414

1515
// ------------------------------------------------------------------------------
1616
// Tests
1717
// ------------------------------------------------------------------------------
1818

19-
const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 6 } });
19+
const ruleTester = new RuleTester({
20+
languageOptions: { sourceType: 'commonjs' },
21+
});
2022
ruleTester.run('fixer-return', rule, {
2123
valid: [
2224
`

‎tests/lib/rules/meta-property-ordering.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@
99
// ------------------------------------------------------------------------------
1010

1111
const rule = require('../../../lib/rules/meta-property-ordering');
12-
const RuleTester = require('eslint').RuleTester;
12+
const RuleTester = require('../eslint-rule-tester').RuleTester;
1313

1414
// ------------------------------------------------------------------------------
1515
// Tests
1616
// ------------------------------------------------------------------------------
1717

18-
const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 6 } });
18+
const ruleTester = new RuleTester({
19+
languageOptions: { sourceType: 'commonjs' },
20+
});
1921
ruleTester.run('test-case-property-ordering', rule, {
2022
valid: [
2123
`
@@ -31,7 +33,7 @@ ruleTester.run('test-case-property-ordering', rule, {
3133
meta: {type, docs, fixable, schema, messages},
3234
create() {},
3335
};`,
34-
parserOptions: { sourceType: 'module' },
36+
languageOptions: { sourceType: 'module' },
3537
},
3638

3739
`
@@ -124,13 +126,13 @@ ruleTester.run('test-case-property-ordering', rule, {
124126
},
125127
create() {},
126128
};`,
127-
parserOptions: { sourceType: 'module' },
128129
errors: [
129130
{
130131
messageId: 'inconsistentOrder',
131132
data: { order: ['type', 'docs', 'fixable'].join(', ') },
132133
},
133134
],
135+
languageOptions: { sourceType: 'module' },
134136
},
135137
{
136138
code: `

‎tests/lib/rules/no-deprecated-context-methods.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010
// ------------------------------------------------------------------------------
1111

1212
const rule = require('../../../lib/rules/no-deprecated-context-methods');
13-
const RuleTester = require('eslint').RuleTester;
13+
const RuleTester = require('../eslint-rule-tester').RuleTester;
1414

1515
// ------------------------------------------------------------------------------
1616
// Tests
1717
// ------------------------------------------------------------------------------
1818

19-
const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 6 } });
19+
const ruleTester = new RuleTester({
20+
languageOptions: { sourceType: 'commonjs' },
21+
});
2022
ruleTester.run('no-deprecated-context-methods', rule, {
2123
valid: [
2224
`

‎tests/lib/rules/no-deprecated-report-api.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010
// ------------------------------------------------------------------------------
1111

1212
const rule = require('../../../lib/rules/no-deprecated-report-api');
13-
const RuleTester = require('eslint').RuleTester;
13+
const RuleTester = require('../eslint-rule-tester').RuleTester;
1414

1515
// ------------------------------------------------------------------------------
1616
// Tests
1717
// ------------------------------------------------------------------------------
1818

19-
const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 6 } });
19+
const ruleTester = new RuleTester({
20+
languageOptions: { sourceType: 'commonjs' },
21+
});
2022
ruleTester.run('no-deprecated-report-api', rule, {
2123
valid: [
2224
`

‎tests/lib/rules/no-identical-tests.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// ------------------------------------------------------------------------------
1111

1212
const rule = require('../../../lib/rules/no-identical-tests');
13-
const RuleTester = require('eslint').RuleTester;
13+
const RuleTester = require('../eslint-rule-tester').RuleTester;
1414

1515
const ERROR_OBJECT_TEST = { messageId: 'identical', type: 'ObjectExpression' };
1616
const ERROR_STRING_TEST = { messageId: 'identical', type: 'Literal' };
@@ -19,7 +19,9 @@ const ERROR_STRING_TEST = { messageId: 'identical', type: 'Literal' };
1919
// Tests
2020
// ------------------------------------------------------------------------------
2121

22-
const ruleTester = new RuleTester();
22+
const ruleTester = new RuleTester({
23+
languageOptions: { sourceType: 'commonjs' },
24+
});
2325
ruleTester.run('no-identical-tests', rule, {
2426
valid: [
2527
`
@@ -232,8 +234,8 @@ ruleTester.run('no-identical-tests', rule, {
232234
});
233235
}
234236
`,
235-
parserOptions: { ecmaVersion: 2015 },
236237
errors: [{ messageId: 'identical', type: 'TemplateLiteral' }],
238+
languageOptions: { ecmaVersion: 2015 },
237239
},
238240
],
239241
});

‎tests/lib/rules/no-missing-message-ids.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
// ------------------------------------------------------------------------------
66

77
const rule = require('../../../lib/rules/no-missing-message-ids');
8-
const RuleTester = require('eslint').RuleTester;
8+
const RuleTester = require('../eslint-rule-tester').RuleTester;
99

1010
// ------------------------------------------------------------------------------
1111
// Tests
1212
// ------------------------------------------------------------------------------
1313

14-
const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 9 } });
14+
const ruleTester = new RuleTester({
15+
languageOptions: { sourceType: 'commonjs' },
16+
});
1517

1618
ruleTester.run('no-missing-message-ids', rule, {
1719
valid: [
@@ -75,7 +77,7 @@ ruleTester.run('no-missing-message-ids', rule, {
7577
}
7678
};
7779
`,
78-
parserOptions: { sourceType: 'module' },
80+
languageOptions: { sourceType: 'module' },
7981
},
8082
// unrelated function 1
8183
`
@@ -321,14 +323,14 @@ ruleTester.run('no-missing-message-ids', rule, {
321323
}
322324
};
323325
`,
324-
parserOptions: { sourceType: 'module' },
325326
errors: [
326327
{
327328
messageId: 'missingMessage',
328329
data: { messageId: 'foo' },
329330
type: 'Literal',
330331
},
331332
],
333+
languageOptions: { sourceType: 'module' },
332334
},
333335
{
334336
// Helper function with messageId parameter, inside rule, with missing messageId due to parameter reassignment.

‎tests/lib/rules/no-missing-placeholders.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// ------------------------------------------------------------------------------
1111

1212
const rule = require('../../../lib/rules/no-missing-placeholders');
13-
const RuleTester = require('eslint').RuleTester;
13+
const RuleTester = require('../eslint-rule-tester').RuleTester;
1414

1515
/**
1616
* Create an error for the given key
@@ -29,7 +29,9 @@ function error(missingKey, type, extra) {
2929
// Tests
3030
// ------------------------------------------------------------------------------
3131

32-
const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 6 } });
32+
const ruleTester = new RuleTester({
33+
languageOptions: { sourceType: 'commonjs' },
34+
});
3335
ruleTester.run('no-missing-placeholders', rule, {
3436
valid: [
3537
`

0 commit comments

Comments
 (0)