Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/rules/__tests__/test-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ const eslintRequire = createRequire(require.resolve('eslint'));

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

export const usingFlatConfig = semver.major(eslintVersion) >= 9;
export const eslintMajorVersion = semver.major(eslintVersion);
export const usingFlatConfig = eslintMajorVersion >= 9;

export class FlatCompatRuleTester extends TSESLint.RuleTester {
public constructor(testerConfig?: TSESLint.RuleTesterConfig) {
Expand Down
22 changes: 2 additions & 20 deletions src/rules/utils/__tests__/parseJestFnCall.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { JSONSchemaForNPMPackageJsonFiles } from '@schemastore/package';
import type { TSESTree } from '@typescript-eslint/utils';
import dedent from 'dedent';
import {
FlatCompatRuleTester as RuleTester,
eslintMajorVersion,
espreeParser,
} from '../../__tests__/test-utils';
import {
Expand All @@ -14,24 +14,6 @@ import {
parseJestFnCall,
} from '../../utils';

const findESLintVersion = (): number => {
const eslintPath = require.resolve('eslint/package.json');

const eslintPackageJson =
// eslint-disable-next-line @typescript-eslint/no-require-imports
require(eslintPath) as JSONSchemaForNPMPackageJsonFiles;

if (!eslintPackageJson.version) {
throw new Error('eslint package.json does not have a version!');
}

const [majorVersion] = eslintPackageJson.version.split('.');

return parseInt(majorVersion, 10);
};

const eslintVersion = findESLintVersion();

const ruleTester = new RuleTester({
parser: espreeParser,
parserOptions: {
Expand Down Expand Up @@ -463,7 +445,7 @@ ruleTester.run('esm', rule, {
invalid: [],
});

if (eslintVersion >= 8) {
if (eslintMajorVersion >= 8) {
ruleTester.run('esm (dynamic)', rule, {
valid: [
{
Expand Down