Skip to content

Commit ab990dd

Browse files
authored
test: simplify detection of ESLint major version (#1758)
1 parent 8b011b2 commit ab990dd

File tree

2 files changed

+4
-21
lines changed

2 files changed

+4
-21
lines changed

src/rules/__tests__/test-utils.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ const eslintRequire = createRequire(require.resolve('eslint'));
88

99
export const espreeParser = eslintRequire.resolve('espree');
1010

11-
export const usingFlatConfig = semver.major(eslintVersion) >= 9;
11+
export const eslintMajorVersion = semver.major(eslintVersion);
12+
export const usingFlatConfig = eslintMajorVersion >= 9;
1213

1314
export class FlatCompatRuleTester extends TSESLint.RuleTester {
1415
public constructor(testerConfig?: TSESLint.RuleTesterConfig) {

src/rules/utils/__tests__/parseJestFnCall.test.ts

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import type { JSONSchemaForNPMPackageJsonFiles } from '@schemastore/package';
21
import type { TSESTree } from '@typescript-eslint/utils';
32
import dedent from 'dedent';
43
import {
54
FlatCompatRuleTester as RuleTester,
5+
eslintMajorVersion,
66
espreeParser,
77
} from '../../__tests__/test-utils';
88
import {
@@ -14,24 +14,6 @@ import {
1414
parseJestFnCall,
1515
} from '../../utils';
1616

17-
const findESLintVersion = (): number => {
18-
const eslintPath = require.resolve('eslint/package.json');
19-
20-
const eslintPackageJson =
21-
// eslint-disable-next-line @typescript-eslint/no-require-imports
22-
require(eslintPath) as JSONSchemaForNPMPackageJsonFiles;
23-
24-
if (!eslintPackageJson.version) {
25-
throw new Error('eslint package.json does not have a version!');
26-
}
27-
28-
const [majorVersion] = eslintPackageJson.version.split('.');
29-
30-
return parseInt(majorVersion, 10);
31-
};
32-
33-
const eslintVersion = findESLintVersion();
34-
3517
const ruleTester = new RuleTester({
3618
parser: espreeParser,
3719
parserOptions: {
@@ -463,7 +445,7 @@ ruleTester.run('esm', rule, {
463445
invalid: [],
464446
});
465447

466-
if (eslintVersion >= 8) {
448+
if (eslintMajorVersion >= 8) {
467449
ruleTester.run('esm (dynamic)', rule, {
468450
valid: [
469451
{

0 commit comments

Comments
 (0)