Skip to content

Commit 0d3c957

Browse files
mskeltonmskelton
committed
chore: Swap utils for dedent
1 parent b434289 commit 0d3c957

25 files changed

+495
-491
lines changed

‎src/rules/expect-expect.test.ts‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { javascript, runRuleTester } from '../utils/rule-tester.js'
1+
import dedent from 'dedent'
2+
import { runRuleTester } from '../utils/rule-tester.js'
23
import rule from './expect-expect.js'
34

45
runRuleTester('expect-expect', rule, {
@@ -12,15 +13,15 @@ runRuleTester('expect-expect', rule, {
1213
errors: [{ messageId: 'noAssertions', type: 'MemberExpression' }],
1314
},
1415
{
15-
code: javascript`
16+
code: dedent`
1617
test('should fail', async ({ page }) => {
1718
await assertCustomCondition(page)
1819
})
1920
`,
2021
errors: [{ messageId: 'noAssertions', type: 'Identifier' }],
2122
},
2223
{
23-
code: javascript`
24+
code: dedent`
2425
test('should fail', async ({ page }) => {
2526
await assertCustomCondition(page)
2627
})
@@ -30,7 +31,7 @@ runRuleTester('expect-expect', rule, {
3031
options: [{ assertFunctionNames: ['wayComplexCustomCondition'] }],
3132
},
3233
{
33-
code: javascript`
34+
code: dedent`
3435
test('should fail', async ({ page }) => {
3536
await assertCustomCondition(page)
3637
})
@@ -76,7 +77,7 @@ runRuleTester('expect-expect', rule, {
7677
'test.slow("foo", () => { expect(true).toBeDefined(); })',
7778
// test.step
7879
{
79-
code: javascript`
80+
code: dedent`
8081
test('steps', async ({ page }) => {
8182
await test.step('first tab', async () => {
8283
await expect(page.getByText('Hello')).toBeVisible();
@@ -85,7 +86,7 @@ runRuleTester('expect-expect', rule, {
8586
`,
8687
},
8788
{
88-
code: javascript`
89+
code: dedent`
8990
test.only('steps', async ({ page }) => {
9091
await test.step('first tab', async () => {
9192
await expect(page.getByText('Hello')).toBeVisible();
@@ -94,7 +95,7 @@ runRuleTester('expect-expect', rule, {
9495
`,
9596
},
9697
{
97-
code: javascript`
98+
code: dedent`
9899
test.only('steps', async ({ page }) => {
99100
await test.step.skip('first tab', async () => {
100101
await expect(page.getByText('Hello')).toBeVisible();
@@ -103,7 +104,7 @@ runRuleTester('expect-expect', rule, {
103104
`,
104105
},
105106
{
106-
code: javascript`
107+
code: dedent`
107108
test('should fail', async ({ page }) => {
108109
await assertCustomCondition(page)
109110
})
@@ -112,7 +113,7 @@ runRuleTester('expect-expect', rule, {
112113
options: [{ assertFunctionNames: ['assertCustomCondition'] }],
113114
},
114115
{
115-
code: javascript`
116+
code: dedent`
116117
test('should fail', async ({ myPage, page }) => {
117118
await myPage.assertCustomCondition(page)
118119
})
@@ -121,7 +122,7 @@ runRuleTester('expect-expect', rule, {
121122
options: [{ assertFunctionNames: ['assertCustomCondition'] }],
122123
},
123124
{
124-
code: javascript`
125+
code: dedent`
125126
test('should pass', async ({ page }) => {
126127
await verifyElementVisible(page.locator('button'))
127128
})
@@ -130,7 +131,7 @@ runRuleTester('expect-expect', rule, {
130131
options: [{ assertFunctionPatterns: ['^verify.*'] }],
131132
},
132133
{
133-
code: javascript`
134+
code: dedent`
134135
test('should pass', async ({ page }) => {
135136
await page.checkTextContent('Hello')
136137
await validateUserLoggedIn(page)
@@ -140,7 +141,7 @@ runRuleTester('expect-expect', rule, {
140141
options: [{ assertFunctionPatterns: ['^check.*', '^validate.*'] }],
141142
},
142143
{
143-
code: javascript`
144+
code: dedent`
144145
test('should pass', async ({ page }) => {
145146
await myCustomAssert(page)
146147
await anotherAssertion(true)

‎src/rules/max-expects.test.ts‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import { javascript, runRuleTester } from '../utils/rule-tester.js'
1+
import dedent from 'dedent'
2+
import { runRuleTester } from '../utils/rule-tester.js'
23
import rule from './max-expects.js'
34

45
runRuleTester('max-expects', rule, {
56
invalid: [
67
{
7-
code: javascript`
8+
code: dedent`
89
test('should not pass', function () {
910
expect(true).toBeDefined();
1011
expect(true).toBeDefined();
@@ -23,7 +24,7 @@ runRuleTester('max-expects', rule, {
2324
],
2425
},
2526
{
26-
code: javascript`
27+
code: dedent`
2728
test('should not pass', async () => {
2829
await test.step('part 1', async () => {
2930
expect(true).toBeDefined();
@@ -47,7 +48,7 @@ runRuleTester('max-expects', rule, {
4748
],
4849
},
4950
{
50-
code: javascript`
51+
code: dedent`
5152
test('should not pass', () => {
5253
expect(true).toBeDefined();
5354
expect(true).toBeDefined();
@@ -66,7 +67,7 @@ runRuleTester('max-expects', rule, {
6667
],
6768
},
6869
{
69-
code: javascript`
70+
code: dedent`
7071
test('should not pass', () => {
7172
expect(true).toBeDefined();
7273
expect(true).toBeDefined();
@@ -98,7 +99,7 @@ runRuleTester('max-expects', rule, {
9899
],
99100
},
100101
{
101-
code: javascript`
102+
code: dedent`
102103
describe('test', () => {
103104
test('should not pass', () => {
104105
expect(true).toBeDefined();
@@ -119,7 +120,7 @@ runRuleTester('max-expects', rule, {
119120
],
120121
},
121122
{
122-
code: javascript`
123+
code: dedent`
123124
test('should not pass', () => {
124125
expect(true).toBeDefined();
125126
expect(true).toBeDefined();
@@ -140,7 +141,7 @@ runRuleTester('max-expects', rule, {
140141
},
141142
// Global aliases
142143
{
143-
code: javascript`
144+
code: dedent`
144145
it('should not pass', function () {
145146
expect(true).toBeDefined();
146147
expect(true).toBeDefined();
@@ -168,12 +169,12 @@ runRuleTester('max-expects', rule, {
168169
`test('should pass')`,
169170
`test('should pass', () => {})`,
170171
`test.skip('should pass', () => {})`,
171-
javascript`
172+
dedent`
172173
test('should pass', function () {
173174
expect(true).toBeDefined();
174175
});
175176
`,
176-
javascript`
177+
dedent`
177178
test('should pass', () => {
178179
expect(true).toBeDefined();
179180
expect(true).toBeDefined();
@@ -182,7 +183,7 @@ runRuleTester('max-expects', rule, {
182183
expect(true).toBeDefined();
183184
});
184185
`,
185-
javascript`
186+
dedent`
186187
test('should pass', () => {
187188
expect(true).toBeDefined();
188189
expect(true).toBeDefined();
@@ -192,7 +193,7 @@ runRuleTester('max-expects', rule, {
192193
// expect(true).toBeDefined();
193194
});
194195
`,
195-
javascript`
196+
dedent`
196197
test('should pass', async () => {
197198
expect(true).toBeDefined();
198199
expect(true).toBeDefined();
@@ -201,7 +202,7 @@ runRuleTester('max-expects', rule, {
201202
expect(true).toBeDefined();
202203
});
203204
`,
204-
javascript`
205+
dedent`
205206
test('should pass', async () => {
206207
expect(true).toBeDefined();
207208
expect(true).toBeDefined();
@@ -210,7 +211,7 @@ runRuleTester('max-expects', rule, {
210211
expect(true).toEqual(expect.any(Boolean));
211212
});
212213
`,
213-
javascript`
214+
dedent`
214215
describe('test', () => {
215216
test('should pass', () => {
216217
expect(true).toBeDefined();
@@ -221,7 +222,7 @@ runRuleTester('max-expects', rule, {
221222
});
222223
});
223224
`,
224-
javascript`
225+
dedent`
225226
test.each(['should', 'pass'], () => {
226227
expect(true).toBeDefined();
227228
expect(true).toBeDefined();
@@ -230,7 +231,7 @@ runRuleTester('max-expects', rule, {
230231
expect(true).toBeDefined();
231232
});
232233
`,
233-
javascript`
234+
dedent`
234235
test('should pass', () => {
235236
expect(true).toBeDefined();
236237
expect(true).toBeDefined();
@@ -242,7 +243,7 @@ runRuleTester('max-expects', rule, {
242243
expect(true).toBeDefined();
243244
});
244245
`,
245-
javascript`
246+
dedent`
246247
function myHelper() {
247248
expect(true).toBeDefined();
248249
expect(true).toBeDefined();
@@ -255,7 +256,7 @@ runRuleTester('max-expects', rule, {
255256
expect(true).toBeDefined();
256257
});
257258
`,
258-
javascript`
259+
dedent`
259260
function myHelper1() {
260261
expect(true).toBeDefined();
261262
expect(true).toBeDefined();
@@ -274,7 +275,7 @@ runRuleTester('max-expects', rule, {
274275
expect(true).toBeDefined();
275276
};
276277
`,
277-
javascript`
278+
dedent`
278279
test('should pass', () => {
279280
expect(true).toBeDefined();
280281
expect(true).toBeDefined();
@@ -287,7 +288,7 @@ runRuleTester('max-expects', rule, {
287288
expect(true).toBeDefined();
288289
};
289290
`,
290-
javascript`
291+
dedent`
291292
const myHelper1 = () => {
292293
expect(true).toBeDefined();
293294
expect(true).toBeDefined();
@@ -307,7 +308,7 @@ runRuleTester('max-expects', rule, {
307308
};
308309
`,
309310
{
310-
code: javascript`
311+
code: dedent`
311312
test('should pass', () => {
312313
expect(true).toBeDefined();
313314
expect(true).toBeDefined();

0 commit comments

Comments
 (0)