Skip to content

Commit d5178be

Browse files
ljharbljharb
committed
[Tests] add disambiguators to tests with multiple errors
1 parent d73cd51 commit d5178be

File tree

5 files changed

+188
-37
lines changed

5 files changed

+188
-37
lines changed

‎tests/lib/rules/jsx-equals-spacing.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -91,70 +91,70 @@ ruleTester.run('jsx-equals-spacing', rule, {
9191
code: '<App foo = {bar} />',
9292
output: '<App foo={bar} />',
9393
errors: [
94-
{ messageId: 'noSpaceBefore' },
95-
{ messageId: 'noSpaceAfter' },
94+
{ messageId: 'noSpaceBefore', type: 'JSXAttribute' },
95+
{ messageId: 'noSpaceAfter', type: 'JSXAttribute' },
9696
],
9797
},
9898
{
9999
code: '<App foo = {bar} />',
100100
output: '<App foo={bar} />',
101101
options: ['never'],
102102
errors: [
103-
{ messageId: 'noSpaceBefore' },
104-
{ messageId: 'noSpaceAfter' },
103+
{ messageId: 'noSpaceBefore', type: 'JSXAttribute' },
104+
{ messageId: 'noSpaceAfter', type: 'JSXAttribute' },
105105
],
106106
},
107107
{
108108
code: '<App foo ={bar} />',
109109
output: '<App foo={bar} />',
110110
options: ['never'],
111-
errors: [{ messageId: 'noSpaceBefore' }],
111+
errors: [{ messageId: 'noSpaceBefore', type: 'JSXAttribute' }],
112112
},
113113
{
114114
code: '<App foo= {bar} />',
115115
output: '<App foo={bar} />',
116116
options: ['never'],
117-
errors: [{ messageId: 'noSpaceAfter' }],
117+
errors: [{ messageId: 'noSpaceAfter', type: 'JSXAttribute' }],
118118
},
119119
{
120120
code: '<App foo= {bar} bar = {baz} />',
121121
output: '<App foo={bar} bar={baz} />',
122122
options: ['never'],
123123
errors: [
124-
{ messageId: 'noSpaceAfter' },
125-
{ messageId: 'noSpaceBefore' },
126-
{ messageId: 'noSpaceAfter' },
124+
{ messageId: 'noSpaceAfter', type: 'JSXAttribute' },
125+
{ messageId: 'noSpaceBefore', type: 'JSXAttribute' },
126+
{ messageId: 'noSpaceAfter', type: 'JSXAttribute' },
127127
],
128128
},
129129
{
130130
code: '<App foo={bar} />',
131131
output: '<App foo = {bar} />',
132132
options: ['always'],
133133
errors: [
134-
{ messageId: 'needSpaceBefore' },
135-
{ messageId: 'needSpaceAfter' },
134+
{ messageId: 'needSpaceBefore', type: 'JSXAttribute' },
135+
{ messageId: 'needSpaceAfter', type: 'JSXAttribute' },
136136
],
137137
},
138138
{
139139
code: '<App foo ={bar} />',
140140
output: '<App foo = {bar} />',
141141
options: ['always'],
142-
errors: [{ messageId: 'needSpaceAfter' }],
142+
errors: [{ messageId: 'needSpaceAfter', type: 'JSXAttribute' }],
143143
},
144144
{
145145
code: '<App foo= {bar} />',
146146
output: '<App foo = {bar} />',
147147
options: ['always'],
148-
errors: [{ messageId: 'needSpaceBefore' }],
148+
errors: [{ messageId: 'needSpaceBefore', type: 'JSXAttribute' }],
149149
},
150150
{
151151
code: '<App foo={bar} bar ={baz} />',
152152
output: '<App foo = {bar} bar = {baz} />',
153153
options: ['always'],
154154
errors: [
155-
{ messageId: 'needSpaceBefore' },
156-
{ messageId: 'needSpaceAfter' },
157-
{ messageId: 'needSpaceAfter' },
155+
{ messageId: 'needSpaceBefore', type: 'JSXAttribute' },
156+
{ messageId: 'needSpaceAfter', type: 'JSXAttribute' },
157+
{ messageId: 'needSpaceAfter', type: 'JSXAttribute' },
158158
],
159159
},
160160
]),

‎tests/lib/rules/jsx-no-useless-fragment.js‎

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,10 @@ ruleTester.run('jsx-no-useless-fragment', rule, {
102102
{
103103
code: '<p>moo<>foo</></p>',
104104
output: '<p>moofoo</p>',
105-
errors: [{ messageId: 'NeedsMoreChildren' }, { messageId: 'ChildOfHtmlElement' }],
105+
errors: [
106+
{ messageId: 'NeedsMoreChildren', type: 'JSXFragment' },
107+
{ messageId: 'ChildOfHtmlElement', type: 'JSXFragment' },
108+
],
106109
features: ['fragment', 'no-ts-old'], // TODO: FIXME: remove no-ts-old
107110
},
108111
{
@@ -114,13 +117,16 @@ ruleTester.run('jsx-no-useless-fragment', rule, {
114117
{
115118
code: '<p><>{meow}</></p>',
116119
output: '<p>{meow}</p>',
117-
errors: [{ messageId: 'NeedsMoreChildren' }, { messageId: 'ChildOfHtmlElement' }],
120+
errors: [
121+
{ messageId: 'NeedsMoreChildren', type: 'JSXFragment' },
122+
{ messageId: 'ChildOfHtmlElement', type: 'JSXFragment' },
123+
],
118124
features: ['fragment', 'no-ts-old'], // TODO: FIXME: remove no-ts-old
119125
},
120126
{
121127
code: '<><div/></>',
122128
output: '<div/>',
123-
errors: [{ messageId: 'NeedsMoreChildren' }],
129+
errors: [{ messageId: 'NeedsMoreChildren', type: 'JSXFragment' }],
124130
features: ['fragment', 'no-ts-old'], // TODO: FIXME: remove no-ts-old
125131
},
126132
{
@@ -132,12 +138,12 @@ ruleTester.run('jsx-no-useless-fragment', rule, {
132138
output: `
133139
<div/>
134140
`,
135-
errors: [{ messageId: 'NeedsMoreChildren' }],
141+
errors: [{ messageId: 'NeedsMoreChildren', type: 'JSXFragment' }],
136142
features: ['fragment', 'no-ts-old'], // TODO: FIXME: remove no-ts-old
137143
},
138144
{
139145
code: '<Fragment />',
140-
errors: [{ messageId: 'NeedsMoreChildren' }],
146+
errors: [{ messageId: 'NeedsMoreChildren', type: 'JSXElement' }],
141147
},
142148
{
143149
code: `
@@ -148,7 +154,7 @@ ruleTester.run('jsx-no-useless-fragment', rule, {
148154
output: `
149155
<Foo />
150156
`,
151-
errors: [{ messageId: 'NeedsMoreChildren' }],
157+
errors: [{ messageId: 'NeedsMoreChildren', type: 'JSXElement' }],
152158
},
153159
{
154160
code: `
@@ -162,31 +168,34 @@ ruleTester.run('jsx-no-useless-fragment', rule, {
162168
fragment: 'SomeFragment',
163169
},
164170
},
165-
errors: [{ messageId: 'NeedsMoreChildren' }],
171+
errors: [{ messageId: 'NeedsMoreChildren', type: 'JSXElement' }],
166172
},
167173
{
168174
// Not safe to fix this case because `Eeee` might require child be ReactElement
169175
code: '<Eeee><>foo</></Eeee>',
170176
output: null,
171-
errors: [{ messageId: 'NeedsMoreChildren' }],
177+
errors: [{ messageId: 'NeedsMoreChildren', type: 'JSXFragment' }],
172178
features: ['fragment', 'no-ts-old'], // TODO: FIXME: remove no-ts-old
173179
},
174180
{
175181
code: '<div><>foo</></div>',
176182
output: '<div>foo</div>',
177-
errors: [{ messageId: 'NeedsMoreChildren' }, { messageId: 'ChildOfHtmlElement' }],
183+
errors: [
184+
{ messageId: 'NeedsMoreChildren', type: 'JSXFragment' },
185+
{ messageId: 'ChildOfHtmlElement', type: 'JSXFragment' },
186+
],
178187
features: ['fragment', 'no-ts-old'], // TODO: FIXME: remove no-ts-old
179188
},
180189
{
181190
code: '<div><>{"a"}{"b"}</></div>',
182191
output: '<div>{"a"}{"b"}</div>',
183-
errors: [{ messageId: 'ChildOfHtmlElement' }],
192+
errors: [{ messageId: 'ChildOfHtmlElement', type: 'JSXFragment' }],
184193
features: ['fragment', 'no-ts-old'], // TODO: FIXME: remove no-ts-old and next test case
185194
},
186195
{
187196
code: '<div><>{"a"}{"b"}</></div>',
188197
output: '<div><>{"a"}{"b"}</></div>',
189-
errors: [{ messageId: 'ChildOfHtmlElement' }],
198+
errors: [{ messageId: 'ChildOfHtmlElement', type: 'JSXFragment' }],
190199
features: ['fragment', 'ts-old', 'no-ts-new', 'no-babel', 'no-default'],
191200
},
192201
{
@@ -202,13 +211,13 @@ ruleTester.run('jsx-no-useless-fragment', rule, {
202211
<Eeee />
203212
{"a"}{"b"}
204213
</section>`,
205-
errors: [{ messageId: 'ChildOfHtmlElement' }],
214+
errors: [{ messageId: 'ChildOfHtmlElement', type: 'JSXFragment' }],
206215
features: ['fragment', 'no-ts-old'], // TODO: FIXME: remove no-ts-old
207216
},
208217
{
209218
code: '<div><Fragment>{"a"}{"b"}</Fragment></div>',
210219
output: '<div>{"a"}{"b"}</div>',
211-
errors: [{ messageId: 'ChildOfHtmlElement' }],
220+
errors: [{ messageId: 'ChildOfHtmlElement', type: 'JSXElement' }],
212221
},
213222
{
214223
// whitepace tricky case
@@ -226,13 +235,16 @@ ruleTester.run('jsx-no-useless-fragment', rule, {
226235
227236
git <b>hub</b>
228237
</section>`,
229-
errors: [{ messageId: 'ChildOfHtmlElement' }, { messageId: 'ChildOfHtmlElement' }],
238+
errors: [
239+
{ messageId: 'ChildOfHtmlElement', type: 'JSXFragment', line: 3 },
240+
{ messageId: 'ChildOfHtmlElement', type: 'JSXFragment', line: 7 },
241+
],
230242
features: ['fragment', 'no-ts-old'], // TODO: FIXME: remove no-ts-old
231243
},
232244
{
233245
code: '<div>a <>{""}{""}</> a</div>',
234246
output: '<div>a {""}{""} a</div>',
235-
errors: [{ messageId: 'ChildOfHtmlElement' }],
247+
errors: [{ messageId: 'ChildOfHtmlElement', type: 'JSXFragment' }],
236248
features: ['fragment', 'no-ts-old'], // TODO: FIXME: remove no-ts-old
237249
},
238250
{
@@ -250,13 +262,16 @@ ruleTester.run('jsx-no-useless-fragment', rule, {
250262
</html>
251263
);
252264
`,
253-
errors: [{ messageId: 'NeedsMoreChildren' }, { messageId: 'ChildOfHtmlElement' }],
265+
errors: [
266+
{ messageId: 'NeedsMoreChildren', type: 'JSXElement', line: 4 },
267+
{ messageId: 'ChildOfHtmlElement', type: 'JSXElement', line: 4 },
268+
],
254269
},
255270
// Ensure allowExpressions still catches expected violations
256271
{
257272
code: '<><Foo>{moo}</Foo></>',
258273
options: [{ allowExpressions: true }],
259-
errors: [{ messageId: 'NeedsMoreChildren' }],
274+
errors: [{ messageId: 'NeedsMoreChildren', type: 'JSXFragment' }],
260275
output: '<Foo>{moo}</Foo>',
261276
features: ['fragment', 'no-ts-old'], // TODO: FIXME: remove no-ts-old
262277
},

‎tests/lib/rules/no-deprecated.js‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,20 @@ ruleTester.run('no-deprecated', rule, {
231231
{
232232
code: 'var {createClass, PropTypes} = require(\'react\');',
233233
errors: [
234-
errorMessage('React.createClass', '15.5.0', 'the npm module create-react-class'),
235-
errorMessage('React.PropTypes', '15.5.0', 'the npm module prop-types'),
234+
errorMessage(
235+
'React.createClass',
236+
'15.5.0',
237+
'the npm module create-react-class',
238+
null,
239+
{ type: 'VariableDeclarator', column: 5 }
240+
),
241+
errorMessage(
242+
'React.PropTypes',
243+
'15.5.0',
244+
'the npm module prop-types',
245+
null,
246+
{ type: 'VariableDeclarator', column: 5 }
247+
),
236248
],
237249
},
238250
{
@@ -252,8 +264,20 @@ ruleTester.run('no-deprecated', rule, {
252264
const {createClass, PropTypes} = React;
253265
`,
254266
errors: [
255-
errorMessage('React.createClass', '15.5.0', 'the npm module create-react-class'),
256-
errorMessage('React.PropTypes', '15.5.0', 'the npm module prop-types'),
267+
errorMessage(
268+
'React.createClass',
269+
'15.5.0',
270+
'the npm module create-react-class',
271+
null,
272+
{ type: 'VariableDeclarator', line: 3, column: 13 }
273+
),
274+
errorMessage(
275+
'React.PropTypes',
276+
'15.5.0',
277+
'the npm module prop-types',
278+
null,
279+
{ type: 'VariableDeclarator', line: 3, column: 13 }
280+
),
257281
],
258282
},
259283
{

0 commit comments

Comments
 (0)