Skip to content

Commit 7b7f7bc

Browse files
G-RathG-Rath
authored
chore: change rules to always report on matcher even when modifier is present (#1177)
1 parent 6d1663e commit 7b7f7bc

File tree

6 files changed

+36
-36
lines changed

6 files changed

+36
-36
lines changed

‎src/rules/__tests__/prefer-comparison-matcher.test.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ const generateInvalidCases = (
9595
{
9696
messageId: 'useToBeComparison',
9797
data: { preferredMatcher: preferredMatcherWhenNegated },
98-
column: 18 + operator.length,
98+
column: 22 + operator.length,
9999
line: 1,
100100
},
101101
],
@@ -107,7 +107,7 @@ const generateInvalidCases = (
107107
{
108108
messageId: 'useToBeComparison',
109109
data: { preferredMatcher: preferredMatcherWhenNegated },
110-
column: 18 + operator.length,
110+
column: 25 + operator.length,
111111
line: 1,
112112
},
113113
],
@@ -119,7 +119,7 @@ const generateInvalidCases = (
119119
{
120120
messageId: 'useToBeComparison',
121121
data: { preferredMatcher: preferredMatcherWhenNegated },
122-
column: 27 + operator.length,
122+
column: 31 + operator.length,
123123
line: 1,
124124
},
125125
],
@@ -131,7 +131,7 @@ const generateInvalidCases = (
131131
{
132132
messageId: 'useToBeComparison',
133133
data: { preferredMatcher },
134-
column: 18 + operator.length,
134+
column: 22 + operator.length,
135135
line: 1,
136136
},
137137
],
@@ -143,7 +143,7 @@ const generateInvalidCases = (
143143
{
144144
messageId: 'useToBeComparison',
145145
data: { preferredMatcher },
146-
column: 27 + operator.length,
146+
column: 31 + operator.length,
147147
line: 1,
148148
},
149149
],
@@ -155,7 +155,7 @@ const generateInvalidCases = (
155155
{
156156
messageId: 'useToBeComparison',
157157
data: { preferredMatcher },
158-
column: 30 + operator.length,
158+
column: 34 + operator.length,
159159
line: 1,
160160
},
161161
],
@@ -167,7 +167,7 @@ const generateInvalidCases = (
167167
{
168168
messageId: 'useToBeComparison',
169169
data: { preferredMatcher },
170-
column: 30 + operator.length,
170+
column: 37 + operator.length,
171171
line: 1,
172172
},
173173
],
@@ -179,7 +179,7 @@ const generateInvalidCases = (
179179
{
180180
messageId: 'useToBeComparison',
181181
data: { preferredMatcher },
182-
column: 30 + operator.length,
182+
column: 37 + operator.length,
183183
line: 1,
184184
},
185185
],

‎src/rules/__tests__/prefer-equality-matcher.test.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ ruleTester.run('prefer-equality-matcher: ===', rule, {
9797
suggestions: expectSuggestions(
9898
equalityMatcher => `expect(a).not.${equalityMatcher}(b);`,
9999
),
100-
column: 17,
100+
column: 21,
101101
line: 1,
102102
},
103103
],
@@ -110,7 +110,7 @@ ruleTester.run('prefer-equality-matcher: ===', rule, {
110110
suggestions: expectSuggestions(
111111
equalityMatcher => `expect(a).${equalityMatcher}(b);`,
112112
),
113-
column: 17,
113+
column: 21,
114114
line: 1,
115115
},
116116
],
@@ -123,7 +123,7 @@ ruleTester.run('prefer-equality-matcher: ===', rule, {
123123
suggestions: expectSuggestions(
124124
equalityMatcher => `expect(a).resolves.not.${equalityMatcher}(b);`,
125125
),
126-
column: 26,
126+
column: 30,
127127
line: 1,
128128
},
129129
],
@@ -136,7 +136,7 @@ ruleTester.run('prefer-equality-matcher: ===', rule, {
136136
suggestions: expectSuggestions(
137137
equalityMatcher => `expect(a).resolves.${equalityMatcher}(b);`,
138138
),
139-
column: 26,
139+
column: 30,
140140
line: 1,
141141
},
142142
],
@@ -149,7 +149,7 @@ ruleTester.run('prefer-equality-matcher: ===', rule, {
149149
suggestions: expectSuggestions(
150150
equalityMatcher => `expect(a).resolves.${equalityMatcher}(b);`,
151151
),
152-
column: 29,
152+
column: 33,
153153
line: 1,
154154
},
155155
],
@@ -162,7 +162,7 @@ ruleTester.run('prefer-equality-matcher: ===', rule, {
162162
suggestions: expectSuggestions(
163163
equalityMatcher => `expect(a).resolves.${equalityMatcher}(b);`,
164164
),
165-
column: 29,
165+
column: 36,
166166
line: 1,
167167
},
168168
],
@@ -237,7 +237,7 @@ ruleTester.run('prefer-equality-matcher: !==', rule, {
237237
suggestions: expectSuggestions(
238238
equalityMatcher => `expect(a).${equalityMatcher}(b);`,
239239
),
240-
column: 17,
240+
column: 21,
241241
line: 1,
242242
},
243243
],
@@ -250,7 +250,7 @@ ruleTester.run('prefer-equality-matcher: !==', rule, {
250250
suggestions: expectSuggestions(
251251
equalityMatcher => `expect(a).not.${equalityMatcher}(b);`,
252252
),
253-
column: 17,
253+
column: 21,
254254
line: 1,
255255
},
256256
],
@@ -263,7 +263,7 @@ ruleTester.run('prefer-equality-matcher: !==', rule, {
263263
suggestions: expectSuggestions(
264264
equalityMatcher => `expect(a).resolves.${equalityMatcher}(b);`,
265265
),
266-
column: 26,
266+
column: 30,
267267
line: 1,
268268
},
269269
],
@@ -276,7 +276,7 @@ ruleTester.run('prefer-equality-matcher: !==', rule, {
276276
suggestions: expectSuggestions(
277277
equalityMatcher => `expect(a).resolves.not.${equalityMatcher}(b);`,
278278
),
279-
column: 26,
279+
column: 30,
280280
line: 1,
281281
},
282282
],

‎src/rules/__tests__/prefer-to-contain.test.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,17 @@ ruleTester.run('prefer-to-contain', rule, {
5050
{
5151
code: "expect(a['includes'](b)).not.toEqual(false);",
5252
output: 'expect(a).toContain(b);',
53-
errors: [{ messageId: 'useToContain', column: 26, line: 1 }],
53+
errors: [{ messageId: 'useToContain', column: 30, line: 1 }],
5454
},
5555
{
5656
code: "expect(a['includes'](b))['not'].toEqual(false);",
5757
output: 'expect(a).toContain(b);',
58-
errors: [{ messageId: 'useToContain', column: 26, line: 1 }],
58+
errors: [{ messageId: 'useToContain', column: 33, line: 1 }],
5959
},
6060
{
6161
code: "expect(a['includes'](b))['not']['toEqual'](false);",
6262
output: 'expect(a).toContain(b);',
63-
errors: [{ messageId: 'useToContain', column: 26, line: 1 }],
63+
errors: [{ messageId: 'useToContain', column: 33, line: 1 }],
6464
},
6565
{
6666
code: 'expect(a.includes(b)).toEqual(false);',
@@ -70,12 +70,12 @@ ruleTester.run('prefer-to-contain', rule, {
7070
{
7171
code: 'expect(a.includes(b)).not.toEqual(false);',
7272
output: 'expect(a).toContain(b);',
73-
errors: [{ messageId: 'useToContain', column: 23, line: 1 }],
73+
errors: [{ messageId: 'useToContain', column: 27, line: 1 }],
7474
},
7575
{
7676
code: 'expect(a.includes(b)).not.toEqual(true);',
7777
output: 'expect(a).not.toContain(b);',
78-
errors: [{ messageId: 'useToContain', column: 23, line: 1 }],
78+
errors: [{ messageId: 'useToContain', column: 27, line: 1 }],
7979
},
8080
{
8181
code: 'expect(a.includes(b)).toBe(true);',
@@ -90,12 +90,12 @@ ruleTester.run('prefer-to-contain', rule, {
9090
{
9191
code: 'expect(a.includes(b)).not.toBe(false);',
9292
output: 'expect(a).toContain(b);',
93-
errors: [{ messageId: 'useToContain', column: 23, line: 1 }],
93+
errors: [{ messageId: 'useToContain', column: 27, line: 1 }],
9494
},
9595
{
9696
code: 'expect(a.includes(b)).not.toBe(true);',
9797
output: 'expect(a).not.toContain(b);',
98-
errors: [{ messageId: 'useToContain', column: 23, line: 1 }],
98+
errors: [{ messageId: 'useToContain', column: 27, line: 1 }],
9999
},
100100
{
101101
code: 'expect(a.includes(b)).toStrictEqual(true);',
@@ -110,12 +110,12 @@ ruleTester.run('prefer-to-contain', rule, {
110110
{
111111
code: 'expect(a.includes(b)).not.toStrictEqual(false);',
112112
output: 'expect(a).toContain(b);',
113-
errors: [{ messageId: 'useToContain', column: 23, line: 1 }],
113+
errors: [{ messageId: 'useToContain', column: 27, line: 1 }],
114114
},
115115
{
116116
code: 'expect(a.includes(b)).not.toStrictEqual(true);',
117117
output: 'expect(a).not.toContain(b);',
118-
errors: [{ messageId: 'useToContain', column: 23, line: 1 }],
118+
errors: [{ messageId: 'useToContain', column: 27, line: 1 }],
119119
},
120120
{
121121
code: 'expect(a.test(t).includes(b.test(p))).toEqual(true);',
@@ -130,12 +130,12 @@ ruleTester.run('prefer-to-contain', rule, {
130130
{
131131
code: 'expect(a.test(t).includes(b.test(p))).not.toEqual(true);',
132132
output: 'expect(a.test(t)).not.toContain(b.test(p));',
133-
errors: [{ messageId: 'useToContain', column: 39, line: 1 }],
133+
errors: [{ messageId: 'useToContain', column: 43, line: 1 }],
134134
},
135135
{
136136
code: 'expect(a.test(t).includes(b.test(p))).not.toEqual(false);',
137137
output: 'expect(a.test(t)).toContain(b.test(p));',
138-
errors: [{ messageId: 'useToContain', column: 39, line: 1 }],
138+
errors: [{ messageId: 'useToContain', column: 43, line: 1 }],
139139
},
140140
{
141141
code: 'expect([{a:1}].includes({a:1})).toBe(true);',
@@ -150,12 +150,12 @@ ruleTester.run('prefer-to-contain', rule, {
150150
{
151151
code: 'expect([{a:1}].includes({a:1})).not.toBe(true);',
152152
output: 'expect([{a:1}]).not.toContain({a:1});',
153-
errors: [{ messageId: 'useToContain', column: 33, line: 1 }],
153+
errors: [{ messageId: 'useToContain', column: 37, line: 1 }],
154154
},
155155
{
156156
code: 'expect([{a:1}].includes({a:1})).not.toBe(false);',
157157
output: 'expect([{a:1}]).toContain({a:1});',
158-
errors: [{ messageId: 'useToContain', column: 33, line: 1 }],
158+
errors: [{ messageId: 'useToContain', column: 37, line: 1 }],
159159
},
160160
{
161161
code: 'expect([{a:1}].includes({a:1})).toStrictEqual(true);',
@@ -170,12 +170,12 @@ ruleTester.run('prefer-to-contain', rule, {
170170
{
171171
code: 'expect([{a:1}].includes({a:1})).not.toStrictEqual(true);',
172172
output: 'expect([{a:1}]).not.toContain({a:1});',
173-
errors: [{ messageId: 'useToContain', column: 33, line: 1 }],
173+
errors: [{ messageId: 'useToContain', column: 37, line: 1 }],
174174
},
175175
{
176176
code: 'expect([{a:1}].includes({a:1})).not.toStrictEqual(false);',
177177
output: 'expect([{a:1}]).toContain({a:1});',
178-
errors: [{ messageId: 'useToContain', column: 33, line: 1 }],
178+
errors: [{ messageId: 'useToContain', column: 37, line: 1 }],
179179
},
180180
],
181181
});

‎src/rules/prefer-comparison-matcher.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ export default createRule({
168168
},
169169
messageId: 'useToBeComparison',
170170
data: { preferredMatcher },
171-
node: (negation || matcher).node.property,
171+
node: matcher.node.property,
172172
});
173173
},
174174
};

‎src/rules/prefer-equality-matcher.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ export default createRule({
140140
fix: buildFixer(equalityMatcher),
141141
}),
142142
),
143-
node: (negation || matcher).node.property,
143+
node: matcher.node.property,
144144
});
145145
},
146146
};

‎src/rules/prefer-to-contain.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ export default createRule({
135135
];
136136
},
137137
messageId: 'useToContain',
138-
node: (modifier || matcher).node.property,
138+
node: matcher.node.property,
139139
});
140140
},
141141
};

0 commit comments

Comments
 (0)