Skip to content

Commit 7176d49

Browse files
adjust eslint config to work with e2e-tests
1 parent 6454b9e commit 7176d49

File tree

4 files changed

+31
-9
lines changed

4 files changed

+31
-9
lines changed

packages/react-on-rails-pro/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"compilerOptions": {
44
"outDir": "./lib"
55
},
6-
"include": ["src/**/*"],
6+
"include": ["src/**/*"]
77
}

react_on_rails_pro/eslint.config.mjs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,24 @@ export default defineConfig([
196196
],
197197
},
198198
},
199+
{
200+
files: ['spec/dummy/e2e-tests/*'],
201+
202+
rules: {
203+
'no-empty-pattern': [
204+
'error',
205+
{
206+
allowObjectPatternsAsParameters: true,
207+
},
208+
],
209+
},
210+
},
211+
{
212+
files: ['spec/dummy/e2e-tests/*'],
213+
rules: {
214+
'react-hooks/rules-of-hooks': ['off'],
215+
},
216+
},
199217
// must be the last config in the array
200218
// https://github.com/prettier/eslint-plugin-prettier?tab=readme-ov-file#configuration-new-eslintconfigjs
201219
prettierRecommended,

react_on_rails_pro/spec/dummy/e2e-tests/streaming.spec.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { expect, test } from '@playwright/test';
1+
import { expect } from '@playwright/test';
22
import {
33
redisReceiverPageController,
44
redisReceiverPageTest,
@@ -57,9 +57,7 @@ import {
5757
await page.click('.toggle-button');
5858
const fallbackElements = page.getByText(/Waiting for the key "Item\d"/);
5959
await expect(fallbackElements).toHaveCount(5);
60-
for (const el of await fallbackElements.all()) {
61-
await expect(el).toBeVisible();
62-
}
60+
await Promise.all((await fallbackElements.all()).map((el) => expect(el).toBeVisible()));
6361
await matchPageSnapshot('stage0');
6462

6563
await sendRedisItemValue(0, 'Incremental Value1');
@@ -82,14 +80,14 @@ import {
8280
redisReceiverInsideRouterPageTest(
8381
'no RSC payload request is made when the page is server side rendered',
8482
async ({ getNetworkRequests }) => {
85-
await expect(await getNetworkRequests(/rsc_payload/)).toHaveLength(0);
83+
expect(await getNetworkRequests(/rsc_payload/)).toHaveLength(0);
8684
},
8785
);
8886

8987
redisReceiverPageAfterNavigationTest(
9088
'RSC payload request is made on navigation',
9189
async ({ getNetworkRequests }) => {
92-
await expect(await getNetworkRequests(/rsc_payload/)).toHaveLength(1);
90+
expect(await getNetworkRequests(/rsc_payload/)).toHaveLength(1);
9391
},
9492
);
9593

@@ -100,6 +98,6 @@ redisReceiverPageController(
10098

10199
await expect(page.getByText('Post 1')).toBeVisible();
102100
await expect(page.getByText('Toggle')).toBeVisible();
103-
await expect(await getNetworkRequests(/rsc_payload/)).toHaveLength(1);
101+
expect(await getNetworkRequests(/rsc_payload/)).toHaveLength(1);
104102
},
105103
);

react_on_rails_pro/spec/dummy/tsconfig.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,11 @@
77
"strict": true,
88
"skipLibCheck": true
99
},
10-
"include": ["client/**/*.ts", "client/**/*.tsx", "client/**/*.d.ts", "e2e-tests/*"]
10+
"include": [
11+
"client/**/*.ts",
12+
"client/**/*.tsx",
13+
"client/**/*.d.ts",
14+
"e2e-tests/*",
15+
"./playwright.config.ts"
16+
]
1117
}

0 commit comments

Comments
 (0)