Skip to content

Commit a86ba06

Browse files
golopotgolopot
committed
[Tests] add missing outputs in test cases
1 parent 3adb3f9 commit a86ba06

File tree

2 files changed

+77
-25
lines changed

2 files changed

+77
-25
lines changed

‎tests/src/rules/no-useless-path-segments.js

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,174 +40,209 @@ function runResolverTests(resolver) {
4040
// CommonJS modules
4141
test({
4242
code: 'require("./../files/malformed.js")',
43+
output: 'require("../files/malformed.js")',
4344
options: [{ commonjs: true }],
4445
errors: [ 'Useless path segments for "./../files/malformed.js", should be "../files/malformed.js"'],
4546
}),
4647
test({
4748
code: 'require("./../files/malformed")',
49+
output: 'require("../files/malformed")',
4850
options: [{ commonjs: true }],
4951
errors: [ 'Useless path segments for "./../files/malformed", should be "../files/malformed"'],
5052
}),
5153
test({
5254
code: 'require("../files/malformed.js")',
55+
output: 'require("./malformed.js")',
5356
options: [{ commonjs: true }],
5457
errors: [ 'Useless path segments for "../files/malformed.js", should be "./malformed.js"'],
5558
}),
5659
test({
5760
code: 'require("../files/malformed")',
61+
output: 'require("./malformed")',
5862
options: [{ commonjs: true }],
5963
errors: [ 'Useless path segments for "../files/malformed", should be "./malformed"'],
6064
}),
6165
test({
6266
code: 'require("./test-module/")',
67+
output: 'require("./test-module")',
6368
options: [{ commonjs: true }],
6469
errors: [ 'Useless path segments for "./test-module/", should be "./test-module"'],
6570
}),
6671
test({
6772
code: 'require("./")',
73+
output: 'require(".")',
6874
options: [{ commonjs: true }],
6975
errors: [ 'Useless path segments for "./", should be "."'],
7076
}),
7177
test({
7278
code: 'require("../")',
79+
output: 'require("..")',
7380
options: [{ commonjs: true }],
7481
errors: [ 'Useless path segments for "../", should be ".."'],
7582
}),
7683
test({
7784
code: 'require("./deep//a")',
85+
output: 'require("./deep/a")',
7886
options: [{ commonjs: true }],
7987
errors: [ 'Useless path segments for "./deep//a", should be "./deep/a"'],
8088
}),
8189

8290
// CommonJS modules + noUselessIndex
8391
test({
8492
code: 'require("./bar/index.js")',
93+
output: 'require("./bar/")',
8594
options: [{ commonjs: true, noUselessIndex: true }],
8695
errors: ['Useless path segments for "./bar/index.js", should be "./bar/"'], // ./bar.js exists
8796
}),
8897
test({
8998
code: 'require("./bar/index")',
99+
output: 'require("./bar/")',
90100
options: [{ commonjs: true, noUselessIndex: true }],
91101
errors: ['Useless path segments for "./bar/index", should be "./bar/"'], // ./bar.js exists
92102
}),
93103
test({
94104
code: 'require("./importPath/")',
105+
output: 'require("./importPath")',
95106
options: [{ commonjs: true, noUselessIndex: true }],
96107
errors: ['Useless path segments for "./importPath/", should be "./importPath"'], // ./importPath.js does not exist
97108
}),
98109
test({
99110
code: 'require("./importPath/index.js")',
111+
output: 'require("./importPath")',
100112
options: [{ commonjs: true, noUselessIndex: true }],
101113
errors: ['Useless path segments for "./importPath/index.js", should be "./importPath"'], // ./importPath.js does not exist
102114
}),
103115
test({
104116
code: 'require("./importType/index")',
117+
output: 'require("./importType")',
105118
options: [{ commonjs: true, noUselessIndex: true }],
106119
errors: ['Useless path segments for "./importType/index", should be "./importType"'], // ./importPath.js does not exist
107120
}),
108121
test({
109122
code: 'require("./index")',
123+
output: 'require(".")',
110124
options: [{ commonjs: true, noUselessIndex: true }],
111125
errors: ['Useless path segments for "./index", should be "."'],
112126
}),
113127
test({
114128
code: 'require("../index")',
129+
output: 'require("..")',
115130
options: [{ commonjs: true, noUselessIndex: true }],
116131
errors: ['Useless path segments for "../index", should be ".."'],
117132
}),
118133
test({
119134
code: 'require("../index.js")',
135+
output: 'require("..")',
120136
options: [{ commonjs: true, noUselessIndex: true }],
121137
errors: ['Useless path segments for "../index.js", should be ".."'],
122138
}),
123139

124140
// ES modules
125141
test({
126142
code: 'import "./../files/malformed.js"',
143+
output: 'import "../files/malformed.js"',
127144
errors: [ 'Useless path segments for "./../files/malformed.js", should be "../files/malformed.js"'],
128145
}),
129146
test({
130147
code: 'import "./../files/malformed"',
148+
output: 'import "../files/malformed"',
131149
errors: [ 'Useless path segments for "./../files/malformed", should be "../files/malformed"'],
132150
}),
133151
test({
134152
code: 'import "../files/malformed.js"',
153+
output: 'import "./malformed.js"',
135154
errors: [ 'Useless path segments for "../files/malformed.js", should be "./malformed.js"'],
136155
}),
137156
test({
138157
code: 'import "../files/malformed"',
158+
output: 'import "./malformed"',
139159
errors: [ 'Useless path segments for "../files/malformed", should be "./malformed"'],
140160
}),
141161
test({
142162
code: 'import "./test-module/"',
163+
output: 'import "./test-module"',
143164
errors: [ 'Useless path segments for "./test-module/", should be "./test-module"'],
144165
}),
145166
test({
146167
code: 'import "./"',
168+
output: 'import "."',
147169
errors: [ 'Useless path segments for "./", should be "."'],
148170
}),
149171
test({
150172
code: 'import "../"',
173+
output: 'import ".."',
151174
errors: [ 'Useless path segments for "../", should be ".."'],
152175
}),
153176
test({
154177
code: 'import "./deep//a"',
178+
output: 'import "./deep/a"',
155179
errors: [ 'Useless path segments for "./deep//a", should be "./deep/a"'],
156180
}),
157181

158182
// ES modules + noUselessIndex
159183
test({
160184
code: 'import "./bar/index.js"',
185+
output: 'import "./bar/"',
161186
options: [{ noUselessIndex: true }],
162187
errors: ['Useless path segments for "./bar/index.js", should be "./bar/"'], // ./bar.js exists
163188
}),
164189
test({
165190
code: 'import "./bar/index"',
191+
output: 'import "./bar/"',
166192
options: [{ noUselessIndex: true }],
167193
errors: ['Useless path segments for "./bar/index", should be "./bar/"'], // ./bar.js exists
168194
}),
169195
test({
170196
code: 'import "./importPath/"',
197+
output: 'import "./importPath"',
171198
options: [{ noUselessIndex: true }],
172199
errors: ['Useless path segments for "./importPath/", should be "./importPath"'], // ./importPath.js does not exist
173200
}),
174201
test({
175202
code: 'import "./importPath/index.js"',
203+
output: 'import "./importPath"',
176204
options: [{ noUselessIndex: true }],
177205
errors: ['Useless path segments for "./importPath/index.js", should be "./importPath"'], // ./importPath.js does not exist
178206
}),
179207
test({
180208
code: 'import "./importPath/index"',
209+
output: 'import "./importPath"',
181210
options: [{ noUselessIndex: true }],
182211
errors: ['Useless path segments for "./importPath/index", should be "./importPath"'], // ./importPath.js does not exist
183212
}),
184213
test({
185214
code: 'import "./index"',
215+
output: 'import "."',
186216
options: [{ noUselessIndex: true }],
187217
errors: ['Useless path segments for "./index", should be "."'],
188218
}),
189219
test({
190220
code: 'import "../index"',
221+
output: 'import ".."',
191222
options: [{ noUselessIndex: true }],
192223
errors: ['Useless path segments for "../index", should be ".."'],
193224
}),
194225
test({
195226
code: 'import "../index.js"',
227+
output: 'import ".."',
196228
options: [{ noUselessIndex: true }],
197229
errors: ['Useless path segments for "../index.js", should be ".."'],
198230
}),
199231
test({
200232
code: 'import("./")',
233+
output: 'import(".")',
201234
errors: [ 'Useless path segments for "./", should be "."'],
202235
parser: require.resolve('babel-eslint'),
203236
}),
204237
test({
205238
code: 'import("../")',
239+
output: 'import("..")',
206240
errors: [ 'Useless path segments for "../", should be ".."'],
207241
parser: require.resolve('babel-eslint'),
208242
}),
209243
test({
210244
code: 'import("./deep//a")',
245+
output: 'import("./deep/a")',
211246
errors: [ 'Useless path segments for "./deep//a", should be "./deep/a"'],
212247
parser: require.resolve('babel-eslint'),
213248
}),

‎tests/src/rules/order.js

Lines changed: 42 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { test, getTSParsers } from '../utils'
22

33
import { RuleTester } from 'eslint'
4+
import eslintPkg from 'eslint/package.json'
5+
import semver from 'semver'
46

57
const ruleTester = new RuleTester()
68
, rule = require('rules/order')
@@ -886,18 +888,25 @@ ruleTester.run('order', rule, {
886888
}],
887889
}),
888890
// Multiple errors
889-
test({
890-
code: `
891-
var sibling = require('./sibling');
892-
var async = require('async');
893-
var fs = require('fs');
894-
`,
895-
errors: [{
896-
message: '`async` import should occur before import of `./sibling`',
897-
}, {
898-
message: '`fs` import should occur before import of `./sibling`',
899-
}],
900-
}),
891+
...semver.satisfies(eslintPkg.version, '< 3.0.0') ? [] : [
892+
test({
893+
code: `
894+
var sibling = require('./sibling');
895+
var async = require('async');
896+
var fs = require('fs');
897+
`,
898+
output: `
899+
var async = require('async');
900+
var sibling = require('./sibling');
901+
var fs = require('fs');
902+
`,
903+
errors: [{
904+
message: '`async` import should occur before import of `./sibling`',
905+
}, {
906+
message: '`fs` import should occur before import of `./sibling`',
907+
}],
908+
}),
909+
],
901910
// Uses 'after' wording if it creates less errors
902911
test({
903912
code: `
@@ -1974,18 +1983,26 @@ ruleTester.run('order', rule, {
19741983
}],
19751984
}),
19761985
// Alphabetize with require
1977-
test({
1978-
code: `
1979-
const { cello } = require('./cello');
1980-
import { int } from './int';
1981-
const blah = require('./blah');
1982-
import { hello } from './hello';
1983-
`,
1984-
errors: [{
1985-
message: '`./int` import should occur before import of `./cello`',
1986-
}, {
1987-
message: '`./hello` import should occur before import of `./cello`',
1988-
}],
1989-
}),
1986+
...semver.satisfies(eslintPkg.version, '< 3.0.0') ? [] : [
1987+
test({
1988+
code: `
1989+
const { cello } = require('./cello');
1990+
import { int } from './int';
1991+
const blah = require('./blah');
1992+
import { hello } from './hello';
1993+
`,
1994+
output: `
1995+
import { int } from './int';
1996+
const { cello } = require('./cello');
1997+
const blah = require('./blah');
1998+
import { hello } from './hello';
1999+
`,
2000+
errors: [{
2001+
message: '`./int` import should occur before import of `./cello`',
2002+
}, {
2003+
message: '`./hello` import should occur before import of `./cello`',
2004+
}],
2005+
}),
2006+
],
19902007
].filter((t) => !!t),
19912008
})

0 commit comments

Comments
 (0)