Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Tests] fix skip usage #2232

Merged
merged 4 commits into from Sep 21, 2021
Merged

[Tests] fix skip usage #2232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
471790f
[Tests] fix skip usage
jablko Sep 19, 2021
28669b9
[Tests] `no-extraneous-dependencies` ignores unresolved imports
jablko Sep 19, 2021
47e9c89
[Tests] type-only imports were added in TypeScript ESTree 2.23.0
jablko Sep 20, 2021
430d16c
[Tests] eslint-import-resolver-typescript@1.0.2 doesn't resolve .js
jablko Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/files/with-typescript-dev-dependencies/package.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"devDependencies": {
"@types/json-schema": "*"
"a": "*"
ljharb marked this conversation as resolved.
Show resolved Hide resolved
}
}
1 change: 0 additions & 1 deletion tests/src/rules/first.js
View file
Open in desktop
Expand Up @@ -80,7 +80,6 @@ ruleTester.run('first', rule, {

context('TypeScript', function () {
getTSParsers()
.filter((parser) => parser !== require.resolve('typescript-eslint-parser'))
.forEach((parser) => {
const parserConfig = {
parser,
Expand Down
81 changes: 41 additions & 40 deletions tests/src/rules/max-dependencies.js
View file
Open in desktop
@@ -1,8 +1,6 @@
import { test, getTSParsers } from '../utils';

import { RuleTester } from 'eslint';
import eslintPkg from 'eslint/package.json';
import semver from 'semver';

const ruleTester = new RuleTester();
const rule = require('rules/max-dependencies');
Expand Down Expand Up @@ -91,43 +89,46 @@ ruleTester.run('max-dependencies', rule, {
],
});

context('TypeScript', { skip: semver.satisfies(eslintPkg.version, '>5.0.0') }, () => {
ljharb marked this conversation as resolved.
Show resolved Hide resolved
getTSParsers().forEach((parser) => {
ruleTester.run(`max-dependencies (${parser.replace(process.cwd(), '.')})`, rule, {
valid: [
test({
code: 'import type { x } from \'./foo\'; import { y } from \'./bar\';',
parser,
options: [{
max: 1,
ignoreTypeImports: true,
}],
}),
],
invalid: [
test({
code: 'import type { x } from \'./foo\'; import type { y } from \'./bar\'',
parser,
options: [{
max: 1,
}],
errors: [
'Maximum number of dependencies (1) exceeded.',
],
}),

test({
code: 'import type { x } from \'./foo\'; import type { y } from \'./bar\'; import type { z } from \'./baz\'',
parser,
options: [{
max: 2,
ignoreTypeImports: false,
}],
errors: [
'Maximum number of dependencies (2) exceeded.',
],
}),
],
describe('TypeScript', () => {
getTSParsers()
// Type-only imports were added in TypeScript ESTree 2.23.0
.filter((parser) => parser !== require.resolve('typescript-eslint-parser'))
.forEach((parser) => {
ruleTester.run(`max-dependencies (${parser.replace(process.cwd(), '.')})`, rule, {
valid: [
test({
code: 'import type { x } from \'./foo\'; import { y } from \'./bar\';',
parser,
options: [{
max: 1,
ignoreTypeImports: true,
}],
}),
],
invalid: [
test({
code: 'import type { x } from \'./foo\'; import type { y } from \'./bar\'',
parser,
options: [{
max: 1,
}],
errors: [
'Maximum number of dependencies (1) exceeded.',
],
}),

test({
code: 'import type { x } from \'./foo\'; import type { y } from \'./bar\'; import type { z } from \'./baz\'',
parser,
options: [{
max: 2,
ignoreTypeImports: false,
}],
errors: [
'Maximum number of dependencies (2) exceeded.',
],
}),
],
});
});
});
});
1 change: 1 addition & 0 deletions tests/src/rules/no-duplicates.js
View file
Open in desktop
Expand Up @@ -417,6 +417,7 @@ import {x,y} from './foo'

context('TypeScript', function () {
getNonDefaultParsers()
// Type-only imports were added in TypeScript ESTree 2.23.0
.filter((parser) => parser !== require.resolve('typescript-eslint-parser'))
.forEach((parser) => {
const parserConfig = {
Expand Down
88 changes: 32 additions & 56 deletions tests/src/rules/no-extraneous-dependencies.js
View file
Open in desktop
Expand Up @@ -2,8 +2,6 @@ import { getTSParsers, test, testFilePath } from '../utils';
import typescriptConfig from '../../../config/typescript';
import path from 'path';
import fs from 'fs';
import semver from 'semver';
import eslintPkg from 'eslint/package.json';

import { RuleTester } from 'eslint';
import flatMap from 'array.prototype.flatmap';
Expand Down Expand Up @@ -380,74 +378,52 @@ ruleTester.run('no-extraneous-dependencies', rule, {
],
});

// TODO: figure out why these tests fail in eslint 4
describe('TypeScript', { skip: semver.satisfies(eslintPkg.version, '^4') }, function () {
getTSParsers().forEach((parser) => {
const parserConfig = {
parser,
settings: {
'import/parsers': { [parser]: ['.ts'] },
'import/resolver': { 'eslint-import-resolver-typescript': true },
ljharb marked this conversation as resolved.
Show resolved Hide resolved
},
};
describe('TypeScript', () => {
getTSParsers()
// Type-only imports were added in TypeScript ESTree 2.23.0
.filter((parser) => parser !== require.resolve('typescript-eslint-parser'))
.forEach((parser) => {
const parserConfig = {
parser,
settings: {
'import/parsers': { [parser]: ['.ts'] },
'import/resolver': ['node', 'typescript'],
},
};

if (parser !== require.resolve('typescript-eslint-parser')) {
ruleTester.run('no-extraneous-dependencies', rule, {
valid: [
test(Object.assign({
code: 'import type { JSONSchema7Type } from "@types/json-schema";',
code: 'import type T from "a";',
options: [{ packageDir: packageDirWithTypescriptDevDependencies, devDependencies: false }],
}, parserConfig)),
],
invalid: [
test(Object.assign({
code: 'import { JSONSchema7Type } from "@types/json-schema";',
code: 'import T from "a";',
options: [{ packageDir: packageDirWithTypescriptDevDependencies, devDependencies: false }],
errors: [{
message: "'@types/json-schema' should be listed in the project's dependencies, not devDependencies.",
message: "'a' should be listed in the project's dependencies, not devDependencies.",
}],
}, parserConfig)),
],
});
} else {
ruleTester.run('no-extraneous-dependencies', rule, {
valid: [],
invalid: [
test(Object.assign({
code: 'import { JSONSchema7Type } from "@types/json-schema"; /* typescript-eslint-parser */',
options: [{ packageDir: packageDirWithTypescriptDevDependencies, devDependencies: false }],
errors: [{
message: "'@types/json-schema' should be listed in the project's dependencies, not devDependencies.",
}],
}, parserConfig)),
test(Object.assign({
code: 'import type { JSONSchema7Type } from "@types/json-schema"; /* typescript-eslint-parser */',
options: [{ packageDir: packageDirWithTypescriptDevDependencies, devDependencies: false }],
errors: [{
message: "'@types/json-schema' should be listed in the project's dependencies, not devDependencies.",
}],
}, parserConfig)),
],
});
}
});
});
});

if (semver.satisfies(eslintPkg.version, '>5.0.0')) {
typescriptRuleTester.run('no-extraneous-dependencies typescript type imports', rule, {
valid: [
test({
code: 'import type MyType from "not-a-dependency";',
filename: testFilePath('./no-unused-modules/typescript/file-ts-a.ts'),
parser: require.resolve('babel-eslint'),
}),
test({
code: 'import type { MyType } from "not-a-dependency";',
filename: testFilePath('./no-unused-modules/typescript/file-ts-a.ts'),
parser: require.resolve('babel-eslint'),
}),
],
invalid: [
],
});
}
typescriptRuleTester.run('no-extraneous-dependencies typescript type imports', rule, {
valid: [
test({
code: 'import type MyType from "not-a-dependency";',
filename: testFilePath('./no-unused-modules/typescript/file-ts-a.ts'),
parser: require.resolve('babel-eslint'),
}),
test({
code: 'import type { MyType } from "not-a-dependency";',
filename: testFilePath('./no-unused-modules/typescript/file-ts-a.ts'),
parser: require.resolve('babel-eslint'),
}),
],
invalid: [
],
});
1 change: 1 addition & 0 deletions tests/src/rules/no-unresolved.js
View file
Open in desktop
Expand Up @@ -443,6 +443,7 @@ ruleTester.run('import() with built-in parser', rule, {
});

context('TypeScript', () => {
// Type-only imports were added in TypeScript ESTree 2.23.0
getTSParsers().filter(x => x !== require.resolve('typescript-eslint-parser')).forEach((parser) => {
ruleTester.run(`${parser}: no-unresolved ignore type-only`, rule, {
valid: [
Expand Down
1 change: 1 addition & 0 deletions tests/src/rules/order.js
View file
Open in desktop
Expand Up @@ -2283,6 +2283,7 @@ ruleTester.run('order', rule, {

context('TypeScript', function () {
getNonDefaultParsers()
// Type-only imports were added in TypeScript ESTree 2.23.0
.filter((parser) => parser !== require.resolve('typescript-eslint-parser'))
.forEach((parser) => {
const parserConfig = {
Expand Down