@@ -23,62 +23,41 @@ type RuleInvalidTestCase = TSESLint.InvalidTestCase<MessageIds, Options>;
23
23
type AssertionFnParams = {
24
24
query : string ;
25
25
matcher : string ;
26
- includeDefaultOptionsCase ?: boolean ;
27
26
options : Options ;
28
27
} ;
29
28
30
29
const getValidAssertions = ( {
31
30
query,
32
31
matcher,
33
- includeDefaultOptionsCase = true ,
34
32
options,
35
33
} : AssertionFnParams ) : RuleValidTestCase [ ] => {
36
34
const code = `expect(${ query } ('Hello'))${ matcher } ` ;
37
35
const screenCode = `expect(screen.${ query } ('Hello'))${ matcher } ` ;
38
36
return [
39
- ...( includeDefaultOptionsCase
40
- ? [
41
- {
42
- name : `${ code } with default options` ,
43
- code,
44
- } ,
45
- ]
46
- : [ ] ) ,
47
37
{
48
- name : `${ code } with provided options` ,
38
+ name : `${ code } with default options of empty validEntries ` ,
49
39
code,
50
- options,
51
40
} ,
52
41
{
53
- name : `${ code } with no validEntries ` ,
42
+ name : `${ code } with provided options ` ,
54
43
code,
55
- options : [ { validEntries : [ ] } ] ,
44
+ options,
56
45
} ,
57
- ...( includeDefaultOptionsCase
58
- ? [
59
- {
60
- name : `${ screenCode } with default options` ,
61
- code,
62
- } ,
63
- ]
64
- : [ ] ) ,
65
46
{
66
- name : `${ screenCode } with provided options` ,
47
+ name : `${ screenCode } with default options of empty validEntries ` ,
67
48
code : screenCode ,
68
- options,
69
49
} ,
70
50
{
71
- name : `${ screenCode } with no validEntries ` ,
51
+ name : `${ screenCode } with provided options ` ,
72
52
code : screenCode ,
73
- options : [ { validEntries : [ ] } ] ,
53
+ options,
74
54
} ,
75
55
] ;
76
56
} ;
77
57
78
58
const getInvalidAssertions = ( {
79
59
query,
80
60
matcher,
81
- includeDefaultOptionsCase = true ,
82
61
options,
83
62
} : AssertionFnParams ) : RuleInvalidTestCase [ ] => {
84
63
const code = `expect(${ query } ('Hello'))${ matcher } ` ;
@@ -90,22 +69,6 @@ const getInvalidAssertions = ({
90
69
} ,
91
70
] = options ;
92
71
return [
93
- ...( includeDefaultOptionsCase
94
- ? [
95
- {
96
- name : `${ code } with default options` ,
97
- code,
98
- errors : [
99
- {
100
- messageId,
101
- line : 1 ,
102
- column : 8 ,
103
- data : { query : validEntry . query , matcher : validEntry . matcher } ,
104
- } ,
105
- ] ,
106
- } ,
107
- ]
108
- : [ ] ) ,
109
72
{
110
73
name : `${ code } with provided options` ,
111
74
code,
@@ -119,22 +82,6 @@ const getInvalidAssertions = ({
119
82
} ,
120
83
] ,
121
84
} ,
122
- ...( includeDefaultOptionsCase
123
- ? [
124
- {
125
- name : `${ screenCode } with default options` ,
126
- code : screenCode ,
127
- errors : [
128
- {
129
- messageId,
130
- line : 1 ,
131
- column : 15 ,
132
- data : { query : validEntry . query , matcher : validEntry . matcher } ,
133
- } ,
134
- ] ,
135
- } ,
136
- ]
137
- : [ ] ) ,
138
85
{
139
86
name : `${ screenCode } with provided options` ,
140
87
code : screenCode ,
@@ -247,31 +194,27 @@ ruleTester.run(RULE_NAME, rule, {
247
194
...getValidAssertions ( {
248
195
query : queryName ,
249
196
matcher : '.toBeVisible()' ,
250
- includeDefaultOptionsCase : false ,
251
197
options : [
252
198
{ validEntries : [ { query : 'query' , matcher : 'toBeVisible' } ] } ,
253
199
] ,
254
200
} ) ,
255
201
...getValidAssertions ( {
256
202
query : queryName ,
257
203
matcher : '.toBeHelloWorld()' ,
258
- includeDefaultOptionsCase : false ,
259
204
options : [
260
205
{ validEntries : [ { query : 'query' , matcher : 'toBeVisible' } ] } ,
261
206
] ,
262
207
} ) ,
263
208
...getValidAssertions ( {
264
209
query : queryName ,
265
210
matcher : '.not.toBeVisible()' ,
266
- includeDefaultOptionsCase : false ,
267
211
options : [
268
212
{ validEntries : [ { query : 'query' , matcher : 'toBeVisible' } ] } ,
269
213
] ,
270
214
} ) ,
271
215
...getValidAssertions ( {
272
216
query : queryName ,
273
217
matcher : '.not.toBeHelloWorld()' ,
274
- includeDefaultOptionsCase : false ,
275
218
options : [
276
219
{ validEntries : [ { query : 'query' , matcher : 'toBeVisible' } ] } ,
277
220
] ,
@@ -293,31 +236,27 @@ ruleTester.run(RULE_NAME, rule, {
293
236
...getValidAssertions ( {
294
237
query : queryName ,
295
238
matcher : '.toBeVisible()' ,
296
- includeDefaultOptionsCase : false ,
297
239
options : [
298
240
{ validEntries : [ { query : 'query' , matcher : 'toBeVisible' } ] } ,
299
241
] ,
300
242
} ) ,
301
243
...getValidAssertions ( {
302
244
query : queryName ,
303
245
matcher : '.toBeHelloWorld()' ,
304
- includeDefaultOptionsCase : false ,
305
246
options : [
306
247
{ validEntries : [ { query : 'query' , matcher : 'toBeVisible' } ] } ,
307
248
] ,
308
249
} ) ,
309
250
...getValidAssertions ( {
310
251
query : queryName ,
311
252
matcher : '.not.toBeVisible()' ,
312
- includeDefaultOptionsCase : false ,
313
253
options : [
314
254
{ validEntries : [ { query : 'query' , matcher : 'toBeVisible' } ] } ,
315
255
] ,
316
256
} ) ,
317
257
...getValidAssertions ( {
318
258
query : queryName ,
319
259
matcher : '.not.toBeHelloWorld()' ,
320
- includeDefaultOptionsCase : false ,
321
260
options : [
322
261
{ validEntries : [ { query : 'query' , matcher : 'toBeVisible' } ] } ,
323
262
] ,
@@ -371,7 +310,6 @@ ruleTester.run(RULE_NAME, rule, {
371
310
...getInvalidAssertions ( {
372
311
query : queryName ,
373
312
matcher : '.toBeHelloWorld()' ,
374
- includeDefaultOptionsCase : false ,
375
313
options : [
376
314
{ validEntries : [ { query : 'query' , matcher : 'toBeHelloWorld' } ] } ,
377
315
] ,
@@ -386,7 +324,6 @@ ruleTester.run(RULE_NAME, rule, {
386
324
...getInvalidAssertions ( {
387
325
query : queryName ,
388
326
matcher : '.toBeHelloWorld()' ,
389
- includeDefaultOptionsCase : false ,
390
327
options : [
391
328
{ validEntries : [ { query : 'query' , matcher : 'toBeHelloWorld' } ] } ,
392
329
] ,
@@ -425,6 +362,7 @@ ruleTester.run(RULE_NAME, rule, {
425
362
// cases: indexing into an `AllBy` result within the expectation
426
363
{
427
364
code : 'expect(screen.queryAllByText("button")[1]).toBeVisible()' ,
365
+ options : [ { validEntries : [ { query : 'get' , matcher : 'toBeVisible' } ] } ] ,
428
366
errors : [
429
367
{
430
368
messageId : 'wrongQueryForMatcher' ,
@@ -439,6 +377,7 @@ ruleTester.run(RULE_NAME, rule, {
439
377
// case: asserting presence incorrectly with custom queryBy* query
440
378
expect(queryByCustomQuery("button")).toBeVisible()
441
379
` ,
380
+ options : [ { validEntries : [ { query : 'get' , matcher : 'toBeVisible' } ] } ] ,
442
381
errors : [
443
382
{
444
383
messageId : 'wrongQueryForMatcher' ,
0 commit comments