Skip to content

Commit d7fc095

Browse files
SukkaWSukkaW
committed
refactor: rewrite testrunner
1 parent dfc2efd commit d7fc095

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+242
-324
lines changed

‎patches/@typescript-eslint+utils+7.4.0.patch‎

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

‎test/rules/consistent-type-specifier-style.spec.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { TSESLint, TSESTree } from '@typescript-eslint/utils'
1+
import { TSESTree } from '@typescript-eslint/utils'
22

3-
import { parsers, test, wrapRun } from '../utils'
3+
import { parsers, test, RuleTester } from '../utils'
44

55
import rule from 'eslint-plugin-import-x/rules/consistent-type-specifier-style'
66

@@ -445,28 +445,28 @@ const FLOW_ONLY = {
445445
} as const
446446

447447
describe('TypeScript', () => {
448-
const ruleTester = new TSESLint.RuleTester({
448+
const ruleTester = new RuleTester({
449449
parser: parsers.TS,
450450
parserOptions: {
451451
ecmaVersion: 6,
452452
sourceType: 'module',
453453
},
454454
})
455-
wrapRun(ruleTester.run)('consistent-type-specifier-style', rule, {
455+
ruleTester.run$('consistent-type-specifier-style', rule, {
456456
valid: [...COMMON_TESTS.valid, ...TS_ONLY.valid],
457457
invalid: [...COMMON_TESTS.invalid, ...TS_ONLY.invalid],
458458
})
459459
})
460460

461461
describe('Babel/Flow', () => {
462-
const ruleTester = new TSESLint.RuleTester({
462+
const ruleTester = new RuleTester({
463463
parser: parsers.BABEL,
464464
parserOptions: {
465465
ecmaVersion: 6,
466466
sourceType: 'module',
467467
},
468468
})
469-
wrapRun(ruleTester.run)('consistent-type-specifier-style', rule, {
469+
ruleTester.run$('consistent-type-specifier-style', rule, {
470470
valid: [...COMMON_TESTS.valid, ...FLOW_ONLY.valid],
471471
invalid: [...COMMON_TESTS.invalid, ...FLOW_ONLY.invalid],
472472
})

‎test/rules/default.spec.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
import path from 'node:path'
22

3-
import { TSESLint } from '@typescript-eslint/utils'
4-
5-
import { test, SYNTAX_CASES, parsers, wrapRun } from '../utils'
3+
import { test, SYNTAX_CASES, parsers, RuleTester } from '../utils'
64

75
import rule from 'eslint-plugin-import-x/rules/default'
86
import { CASE_SENSITIVE_FS } from 'eslint-plugin-import-x/utils'
97

10-
const ruleTester = new TSESLint.RuleTester()
8+
const ruleTester = new RuleTester()
119

12-
wrapRun(ruleTester.run)('default', rule, {
10+
ruleTester.run$('default', rule, {
1311
valid: [
1412
test({ code: 'import "./malformed.js"' }),
1513

@@ -161,7 +159,7 @@ wrapRun(ruleTester.run)('default', rule, {
161159

162160
// #311: import of mismatched case
163161
if (!CASE_SENSITIVE_FS) {
164-
wrapRun(ruleTester.run)('default (path case-insensitivity)', rule, {
162+
ruleTester.run$('default (path case-insensitivity)', rule, {
165163
valid: [
166164
test({
167165
code: 'import foo from "./jsx/MyUncoolComponent.jsx"',
@@ -180,7 +178,7 @@ if (!CASE_SENSITIVE_FS) {
180178

181179
describe('TypeScript', () => {
182180
const parser = parsers.TS
183-
wrapRun(ruleTester.run)(`default`, rule, {
181+
ruleTester.run$(`default`, rule, {
184182
valid: [
185183
test({
186184
code: `import foobar from "./typescript-default"`,

‎test/rules/dynamic-import-chunkname.spec.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { TSESLint, TSESTree } from '@typescript-eslint/utils'
1+
import { TSESTree } from '@typescript-eslint/utils'
22

3-
import { SYNTAX_CASES, parsers, wrapRun } from '../utils'
3+
import { SYNTAX_CASES, parsers, RuleTester } from '../utils'
44

55
import rule from 'eslint-plugin-import-x/rules/dynamic-import-chunkname'
66

7-
const ruleTester = new TSESLint.RuleTester()
7+
const ruleTester = new RuleTester()
88

99
const pickyCommentFormat = '[a-zA-Z-_/.]+'
1010

@@ -43,7 +43,7 @@ const pickyChunkNameFormatError = {
4343
},
4444
} as const
4545

46-
wrapRun(ruleTester.run)('dynamic-import-chunkname', rule, {
46+
ruleTester.run$('dynamic-import-chunkname', rule, {
4747
valid: [
4848
{
4949
code: `dynamicImport(
@@ -971,7 +971,7 @@ describe('TypeScript', () => {
971971
const typescriptParser = parsers.TS
972972
const nodeType = TSESTree.AST_NODE_TYPES.ImportExpression
973973

974-
wrapRun(ruleTester.run)('dynamic-import-chunkname', rule, {
974+
ruleTester.run$('dynamic-import-chunkname', rule, {
975975
valid: [
976976
{
977977
code: `import('test')`,

‎test/rules/export.spec.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
import { TSESLint } from '@typescript-eslint/utils'
2-
3-
import { test, testFilePath, SYNTAX_CASES, parsers, wrapRun } from '../utils'
1+
import { test, testFilePath, SYNTAX_CASES, parsers, RuleTester } from '../utils'
42

53
import rule from 'eslint-plugin-import-x/rules/export'
64

7-
const ruleTester = new TSESLint.RuleTester()
5+
const ruleTester = new RuleTester()
86

9-
wrapRun(ruleTester.run)('export', rule, {
7+
ruleTester.run$('export', rule, {
108
valid: [
119
test({ code: 'import "./malformed.js"' }),
1210

@@ -166,7 +164,7 @@ describe('TypeScript', () => {
166164
},
167165
}
168166

169-
wrapRun(ruleTester.run)('export', rule, {
167+
ruleTester.run$('export', rule, {
170168
valid: [
171169
// type/value name clash
172170
test({

‎test/rules/exports-last.spec.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
import { TSESLint } from '@typescript-eslint/utils'
21
import type { TSESTree } from '@typescript-eslint/utils'
32

4-
import { test, wrapRun } from '../utils'
3+
import { test, RuleTester } from '../utils'
54

65
import rule from 'eslint-plugin-import-x/rules/exports-last'
76

8-
const ruleTester = new TSESLint.RuleTester()
7+
const ruleTester = new RuleTester()
98

109
const error = (type: `${TSESTree.AST_NODE_TYPES}`) =>
1110
({
1211
messageId: 'end',
1312
type,
1413
}) as const
1514

16-
wrapRun(ruleTester.run)('exports-last', rule, {
15+
ruleTester.run$('exports-last', rule, {
1716
valid: [
1817
// Empty file
1918
test({

‎test/rules/extensions.spec.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
import { TSESLint } from '@typescript-eslint/utils'
2-
3-
import { test, testFilePath, parsers, wrapRun } from '../utils'
1+
import { test, testFilePath, parsers, RuleTester } from '../utils'
42

53
import rule from 'eslint-plugin-import-x/rules/extensions'
64

7-
const ruleTester = new TSESLint.RuleTester()
5+
const ruleTester = new RuleTester()
86

9-
wrapRun(ruleTester.run)('extensions', rule, {
7+
ruleTester.run$('extensions', rule, {
108
valid: [
119
test({ code: 'import a from "@/a"' }),
1210
test({ code: 'import a from "a"' }),
@@ -662,7 +660,7 @@ wrapRun(ruleTester.run)('extensions', rule, {
662660
describe('TypeScript', () => {
663661
const parser = parsers.TS
664662

665-
wrapRun(ruleTester.run)(`${parser}: extensions ignore type-only`, rule, {
663+
ruleTester.run$(`${parser}: extensions ignore type-only`, rule, {
666664
valid: [
667665
test({
668666
code: 'import type T from "./typescript-declare";',

‎test/rules/first.spec.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
import fs from 'node:fs'
22

3-
import { TSESLint } from '@typescript-eslint/utils'
4-
5-
import { test, parsers, testFilePath, wrapRun } from '../utils'
3+
import { test, parsers, testFilePath, RuleTester } from '../utils'
64

75
import rule from 'eslint-plugin-import-x/rules/first'
86

9-
const ruleTester = new TSESLint.RuleTester()
7+
const ruleTester = new RuleTester()
108

11-
wrapRun(ruleTester.run)('first', rule, {
9+
ruleTester.run$('first', rule, {
1210
valid: [
1311
test({
1412
code: "import { x } from './foo'; import { y } from './bar';\
@@ -101,7 +99,7 @@ describe('TypeScript', () => {
10199
},
102100
}
103101

104-
wrapRun(ruleTester.run)('order', rule, {
102+
ruleTester.run$('order', rule, {
105103
valid: [
106104
test({
107105
code: `

‎test/rules/group-exports.spec.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import { TSESLint } from '@typescript-eslint/utils'
2-
3-
import { parsers, test, wrapRun } from '../utils'
1+
import { parsers, test, RuleTester } from '../utils'
42

53
import rule from 'eslint-plugin-import-x/rules/group-exports'
64

@@ -11,7 +9,7 @@ const errors = {
119
'Multiple CommonJS exports; consolidate all exports into a single assignment to `module.exports`',
1210
}
1311

14-
const ruleTester = new TSESLint.RuleTester({
12+
const ruleTester = new RuleTester({
1513
parser: parsers.BABEL,
1614
parserOptions: {
1715
requireConfigFile: false,
@@ -23,7 +21,7 @@ const ruleTester = new TSESLint.RuleTester({
2321
},
2422
})
2523

26-
wrapRun(ruleTester.run)('group-exports', rule, {
24+
ruleTester.run$('group-exports', rule, {
2725
valid: [
2826
test({ code: 'export const test = true' }),
2927
test({

‎test/rules/max-dependencies.spec.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
import { TSESLint } from '@typescript-eslint/utils'
2-
3-
import { test, parsers, wrapRun } from '../utils'
1+
import { test, parsers, RuleTester } from '../utils'
42

53
import rule from 'eslint-plugin-import-x/rules/max-dependencies'
64

7-
const ruleTester = new TSESLint.RuleTester()
5+
const ruleTester = new RuleTester()
86

9-
wrapRun(ruleTester.run)('max-dependencies', rule, {
7+
ruleTester.run$('max-dependencies', rule, {
108
valid: [
119
test({ code: 'import "./foo.js"' }),
1210

@@ -99,7 +97,7 @@ wrapRun(ruleTester.run)('max-dependencies', rule, {
9997
describe('TypeScript', () => {
10098
const parser = parsers.TS
10199

102-
wrapRun(ruleTester.run)('max-dependencies', rule, {
100+
ruleTester.run$('max-dependencies', rule, {
103101
valid: [
104102
test({
105103
code: "import type { x } from './foo'; import { y } from './bar';",

0 commit comments

Comments
 (0)