Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 154287d

Browse files
JamesHenryJamesHenry
authored
test: add integration test for plugins together (typescript-eslint#72)
1 parent bf58003 commit 154287d

File tree

92 files changed

+259
-638
lines changed

Some content is hidden

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

92 files changed

+259
-638
lines changed

‎.github/ISSUE_TEMPLATE/eslint-plugin-tslint.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ assignees: ''
1414
**What version of the following packages are you using?**
1515

1616
- eslint-plugin-tslint: <!-- Please fill in -->
17-
- @typescript-eslint/parser: <!-- Please fill in -->
17+
- typescript-eslint-parser: <!-- Please fill in -->
1818
- TypeScript: <!-- Please fill in -->
1919
- ESLint: <!-- Please fill in -->
2020

‎.github/ISSUE_TEMPLATE/eslint-plugin-typescript.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ Please try to avoid code that isn't directly related to the bug, as it makes it
3838

3939
**Versions**
4040

41-
| package | version |
42-
| --------------------------- | ------- |
43-
| `eslint-plugin-typescript` | `X.Y.Z` |
44-
| `@typescript-eslint/parser` | `X.Y.Z` |
45-
| `typescript` | `X.Y.Z` |
41+
| package | version |
42+
| -------------------------- | ------- |
43+
| `eslint-plugin-typescript` | `X.Y.Z` |
44+
| `typescript-eslint-parser` | `X.Y.Z` |
45+
| `typescript` | `X.Y.Z` |

‎.github/ISSUE_TEMPLATE/typescript-eslint-parser.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
name: '@typescript-eslint/parser'
3-
about: Report an issue with the @typescript-eslint/parser package
2+
name: 'typescript-eslint-parser'
3+
about: Report an issue with the typescript-eslint-parser package
44
title: ''
55
labels: 'package: parser, triage'
66
assignees: ''
@@ -13,7 +13,7 @@ assignees: ''
1313

1414
**What version of the following packages are you using?**
1515

16-
- @typescript-eslint/parser: <!-- Please fill in -->
16+
- typescript-eslint-parser: <!-- Please fill in -->
1717
- TypeScript: <!-- Please fill in -->
1818
- ESLint: <!-- Please fill in -->
1919

‎.prettierignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
**/dist
33
**/coverage
44
**/typescript-eslint-shared-fixtures
5-
**/tests/integration/**/*
5+
**/tests/integration/fixtures/**/*
66
**/lib/configs/recommended.json
77
**/.vscode
88
**/.nyc_output

‎.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
sudo: required
2+
services:
3+
- docker
14
language: node_js
25
cache:
36
yarn: true
@@ -19,9 +22,7 @@ script:
1922
- yarn workspace eslint-plugin-typescript docs:check
2023
- yarn build
2124
- yarn test
22-
# TODO: Reimplement automated integration-tests from typescript-eslint-parser
23-
# for the monorepo, after the migrations are complete
24-
# yarn integration-tests
25+
- yarn integration-tests
2526
- yarn global add codecov
2627
after_success:
2728
- codecov

‎package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
"cz": "git-cz",
2626
"commitmsg": "commitlint -E GIT_PARAMS",
2727
"check-format": "prettier --list-different \"./**/*.{ts,js,json,md}\"",
28-
"format": "prettier --write \"./**/*.{ts,js,json,md}\""
28+
"format": "prettier --write \"./**/*.{ts,js,json,md}\"",
29+
"integration-tests": "docker-compose -f tests/integration/docker-compose.yml up",
30+
"kill-integration-test-containers": "docker-compose -f tests/integration/docker-compose.yml down -v --rmi local"
2931
},
3032
"lint-staged": {
3133
"*.{ts,js,json,md}": [

‎packages/eslint-plugin-tslint/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"devDependencies": {
3434
"@types/eslint": "^4.16.3",
3535
"@types/lodash.memoize": "^4.1.4",
36-
"@typescript-eslint/parser": "21.0.2",
36+
"typescript-eslint-parser": "21.0.2",
3737
"tslint": "^5.11.0"
3838
}
3939
}

‎packages/eslint-plugin-tslint/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ export const rules = {
9898

9999
/**
100100
* The user needs to have configured "project" in their parserOptions
101-
* for @typescript-eslint/parser
101+
* for typescript-eslint-parser
102102
*/
103103
if (!parserServices || !parserServices.program) {
104104
throw new Error(
105-
`You must provide a value for the "parserOptions.project" property for @typescript-eslint/parser`
105+
`You must provide a value for the "parserOptions.project" property for typescript-eslint-parser`
106106
);
107107
}
108108

‎packages/eslint-plugin-tslint/tests/index.spec.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const parserOptions: any = {
1010
ecmaFeatures: {},
1111
/**
1212
* Project is needed to generate the parserServices
13-
* within @typescript-eslint/parser
13+
* within typescript-eslint-parser
1414
*/
1515
project: './tests/tsconfig.json'
1616
};
@@ -40,7 +40,7 @@ ruleTester.run('tslint/config', rules.config, {
4040
valid: [
4141
{
4242
code: 'var foo = true;',
43-
parser: '@typescript-eslint/parser',
43+
parser: 'typescript-eslint-parser',
4444
parserOptions,
4545
options: [tslintRulesConfig]
4646
},
@@ -50,7 +50,7 @@ ruleTester.run('tslint/config', rules.config, {
5050
/\n/g,
5151
' '
5252
),
53-
parser: '@typescript-eslint/parser',
53+
parser: 'typescript-eslint-parser',
5454
parserOptions: {
5555
...parserOptions,
5656
project: `${__dirname}/test-project/tsconfig.json`
@@ -63,7 +63,7 @@ ruleTester.run('tslint/config', rules.config, {
6363
},
6464
{
6565
code: 'throw "should be ok because rule is not loaded";',
66-
parser: '@typescript-eslint/parser',
66+
parser: 'typescript-eslint-parser',
6767
parserOptions,
6868
options: [tslintRulesConfig]
6969
}
@@ -72,7 +72,7 @@ ruleTester.run('tslint/config', rules.config, {
7272
invalid: [
7373
{
7474
options: [{ lintFile: './tests/test-project/tslint.json' }],
75-
parser: '@typescript-eslint/parser',
75+
parser: 'typescript-eslint-parser',
7676
parserOptions,
7777
code: 'throw "err" // no-string-throw',
7878
errors: [
@@ -84,7 +84,7 @@ ruleTester.run('tslint/config', rules.config, {
8484
},
8585
{
8686
code: 'var foo = true // semicolon',
87-
parser: '@typescript-eslint/parser',
87+
parser: 'typescript-eslint-parser',
8888
parserOptions,
8989
options: [tslintRulesConfig],
9090
output: 'var foo = true // semicolon',
@@ -98,7 +98,7 @@ ruleTester.run('tslint/config', rules.config, {
9898
},
9999
{
100100
code: 'var foo = true // fail',
101-
parser: '@typescript-eslint/parser',
101+
parser: 'typescript-eslint-parser',
102102
parserOptions,
103103
options: [tslintRulesDirectoryConfig],
104104
output: 'var foo = true // fail',
@@ -116,7 +116,7 @@ ruleTester.run('tslint/config', rules.config, {
116116
/\n/g,
117117
' '
118118
),
119-
parser: '@typescript-eslint/parser',
119+
parser: 'typescript-eslint-parser',
120120
parserOptions: {
121121
...parserOptions,
122122
project: `${__dirname}/test-project/tsconfig.json`

‎packages/eslint-plugin-typescript/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Add `eslint-plugin-typescript/parser` to the `parser` field and `typescript` to
4141
}
4242
```
4343

44-
Note: The plugin provides its own version of the `@typescript-eslint/parser` via `eslint-plugin-typescript/parser`.
44+
Note: The plugin provides its own version of the `typescript-eslint-parser` via `eslint-plugin-typescript/parser`.
4545
This helps us guarantee 100% compatibility between the plugin and the parser.
4646

4747
Then configure the rules you want to use under the rules section.

‎packages/eslint-plugin-typescript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"dependencies": {
2727
"requireindex": "^1.2.0",
28-
"@typescript-eslint/parser": "21.0.2"
28+
"typescript-eslint-parser": "21.0.2"
2929
},
3030
"devDependencies": {
3131
"eslint": "^5.9.0",

‎packages/eslint-plugin-typescript/parser.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77

88
// export the typescript-eslint-parser.
99
// this forces the parser to be a direct dependency of the plugin.
10-
module.exports = require('@typescript-eslint/parser');
10+
module.exports = require('typescript-eslint-parser');

‎packages/eslint-plugin-typescript/tests/lib/eslint-rules/no-dupe-args.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const ruleTester = new RuleTester({
1313
sourceType: 'module',
1414
ecmaFeatures: {}
1515
},
16-
parser: '@typescript-eslint/parser'
16+
parser: 'typescript-eslint-parser'
1717
});
1818

1919
ruleTester.run('no-dupe-args', rule, {

‎packages/eslint-plugin-typescript/tests/lib/eslint-rules/no-implicit-globals.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const ruleTester = new RuleTester({
1212
ecmaVersion: 6,
1313
sourceType: 'module'
1414
},
15-
parser: '@typescript-eslint/parser'
15+
parser: 'typescript-eslint-parser'
1616
});
1717

1818
ruleTester.run('no-implicit-globals', rule, {

‎packages/eslint-plugin-typescript/tests/lib/eslint-rules/no-redeclare.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const ruleTester = new RuleTester({
1313
sourceType: 'module',
1414
ecmaFeatures: {}
1515
},
16-
parser: '@typescript-eslint/parser'
16+
parser: 'typescript-eslint-parser'
1717
});
1818

1919
ruleTester.run('no-redeclare', rule, {

‎packages/eslint-plugin-typescript/tests/lib/eslint-rules/no-restricted-globals.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const ruleTester = new RuleTester({
1313
sourceType: 'module',
1414
ecmaFeatures: {}
1515
},
16-
parser: '@typescript-eslint/parser'
16+
parser: 'typescript-eslint-parser'
1717
});
1818

1919
ruleTester.run('no-restricted-globals', rule, {

‎packages/eslint-plugin-typescript/tests/lib/eslint-rules/no-shadow.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const ruleTester = new RuleTester({
1313
sourceType: 'module',
1414
ecmaFeatures: {}
1515
},
16-
parser: '@typescript-eslint/parser'
16+
parser: 'typescript-eslint-parser'
1717
});
1818

1919
ruleTester.run('no-shadow', rule, {

‎packages/eslint-plugin-typescript/tests/lib/eslint-rules/no-undef.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const ruleTester = new RuleTester({
1717
sourceType: 'module',
1818
ecmaFeatures: {}
1919
},
20-
parser: '@typescript-eslint/parser'
20+
parser: 'typescript-eslint-parser'
2121
});
2222

2323
ruleTester.run('no-undef', rule, {

‎packages/eslint-plugin-typescript/tests/lib/eslint-rules/no-unused-vars.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const ruleTester = new RuleTester({
1313
sourceType: 'module',
1414
ecmaFeatures: {}
1515
},
16-
parser: '@typescript-eslint/parser'
16+
parser: 'typescript-eslint-parser'
1717
});
1818

1919
ruleTester.run('no-unused-vars', rule, {

‎packages/eslint-plugin-typescript/tests/lib/eslint-rules/no-use-before-define.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const ruleTester = new RuleTester({
1212
ecmaVersion: 6,
1313
sourceType: 'module'
1414
},
15-
parser: '@typescript-eslint/parser'
15+
parser: 'typescript-eslint-parser'
1616
});
1717

1818
ruleTester.run('no-undef', rule, {

‎packages/eslint-plugin-typescript/tests/lib/eslint-rules/strict.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const ruleTester = new RuleTester({
1212
ecmaVersion: 6,
1313
sourceType: 'module'
1414
},
15-
parser: '@typescript-eslint/parser'
15+
parser: 'typescript-eslint-parser'
1616
});
1717

1818
ruleTester.run('strict', rule, {

‎packages/eslint-plugin-typescript/tests/lib/rules/adjacent-overload-signatures.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const rule = require('../../../lib/rules/adjacent-overload-signatures'),
1616
//------------------------------------------------------------------------------
1717

1818
const ruleTester = new RuleTester({
19-
parser: '@typescript-eslint/parser'
19+
parser: 'typescript-eslint-parser'
2020
});
2121

2222
ruleTester.run('adjacent-overload-signatures', rule, {

‎packages/eslint-plugin-typescript/tests/lib/rules/array-type.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const rule = require('../../../lib/rules/array-type'),
1818
//------------------------------------------------------------------------------
1919

2020
const ruleTester = new eslint.RuleTester({
21-
parser: '@typescript-eslint/parser'
21+
parser: 'typescript-eslint-parser'
2222
});
2323

2424
ruleTester.run('array-type', rule, {
@@ -793,7 +793,7 @@ describe('array-type (nested)', () => {
793793
rules: {
794794
'array-type': [2, option]
795795
},
796-
parser: '@typescript-eslint/parser'
796+
parser: 'typescript-eslint-parser'
797797
},
798798
{
799799
fix: true

‎packages/eslint-plugin-typescript/tests/lib/rules/ban-types.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const rule = require('../../../lib/rules/ban-types'),
1616
//------------------------------------------------------------------------------
1717

1818
const ruleTester = new RuleTester({
19-
parser: '@typescript-eslint/parser'
19+
parser: 'typescript-eslint-parser'
2020
});
2121

2222
const options = [

‎packages/eslint-plugin-typescript/tests/lib/rules/camelcase.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const ruleCamelcase = require('../../../lib/rules/camelcase');
1414
const RuleTester = require('eslint').RuleTester;
1515

1616
const ruleTester = new RuleTester({
17-
parser: '@typescript-eslint/parser'
17+
parser: 'typescript-eslint-parser'
1818
});
1919

2020
//------------------------------------------------------------------------------

‎packages/eslint-plugin-typescript/tests/lib/rules/class-name-casing.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const rule = require('../../../lib/rules/class-name-casing'),
1717
//------------------------------------------------------------------------------
1818

1919
const ruleTester = new RuleTester({
20-
parser: '@typescript-eslint/parser'
20+
parser: 'typescript-eslint-parser'
2121
});
2222

2323
ruleTester.run('class-name-casing', rule, {

‎packages/eslint-plugin-typescript/tests/lib/rules/explicit-function-return-type.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const rule = require('../../../lib/rules/explicit-function-return-type'),
1616
//------------------------------------------------------------------------------
1717

1818
const ruleTester = new RuleTester({
19-
parser: '@typescript-eslint/parser'
19+
parser: 'typescript-eslint-parser'
2020
});
2121

2222
ruleTester.run('explicit-function-return-type', rule, {

‎packages/eslint-plugin-typescript/tests/lib/rules/explicit-member-accessibility.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const rule = require('../../../lib/rules/explicit-member-accessibility'),
1616
//------------------------------------------------------------------------------
1717

1818
const ruleTester = new RuleTester({
19-
parser: '@typescript-eslint/parser'
19+
parser: 'typescript-eslint-parser'
2020
});
2121

2222
ruleTester.run('explicit-member-accessibility', rule, {

‎packages/eslint-plugin-typescript/tests/lib/rules/generic-type-naming.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const rule = require('../../../lib/rules/generic-type-naming'),
1515
//------------------------------------------------------------------------------
1616

1717
const ruleTester = new RuleTester({
18-
parser: '@typescript-eslint/parser'
18+
parser: 'typescript-eslint-parser'
1919
});
2020

2121
ruleTester.run('generic-type-naming', rule, {

‎packages/eslint-plugin-typescript/tests/lib/rules/indent.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ const ruleTester = new RuleTester({
664664
sourceType: 'module',
665665
ecmaFeatures: {}
666666
},
667-
parser: '@typescript-eslint/parser'
667+
parser: 'typescript-eslint-parser'
668668
});
669669

670670
ruleTester.run('indent', rule, {

‎packages/eslint-plugin-typescript/tests/lib/rules/interface-name-prefix.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const rule = require('../../../lib/rules/interface-name-prefix'),
1616
//------------------------------------------------------------------------------
1717

1818
const ruleTester = new RuleTester({
19-
parser: '@typescript-eslint/parser'
19+
parser: 'typescript-eslint-parser'
2020
});
2121

2222
ruleTester.run('interface-name-prefix', rule, {

‎packages/eslint-plugin-typescript/tests/lib/rules/member-delimiter-style.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const rule = require('../../../lib/rules/member-delimiter-style'),
1717
//------------------------------------------------------------------------------
1818

1919
const ruleTester = new RuleTester({
20-
parser: '@typescript-eslint/parser'
20+
parser: 'typescript-eslint-parser'
2121
});
2222

2323
ruleTester.run('member-delimiter-style', rule, {

‎packages/eslint-plugin-typescript/tests/lib/rules/member-naming.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const rule = require('../../../lib/rules/member-naming'),
1616
//------------------------------------------------------------------------------
1717

1818
const ruleTester = new RuleTester({
19-
parser: '@typescript-eslint/parser'
19+
parser: 'typescript-eslint-parser'
2020
});
2121

2222
ruleTester.run('member-naming', rule, {

0 commit comments

Comments
 (0)