Skip to content

Commit 5d7cfa2

Browse files
fix CI failure and other tiny improvements
1 parent 6064b02 commit 5d7cfa2

File tree

8 files changed

+21
-71
lines changed

8 files changed

+21
-71
lines changed

.circleci/config.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,10 @@ jobs:
380380
name: wait for rails server to start
381381
command: |
382382
while ! curl -s http://localhost:3000 > /dev/null; do sleep 1; done
383+
- run:
384+
name: install playwright dependencies
385+
working_directory: react_on_rails_pro/spec/dummy
386+
command: yarn playwright install --with-deps
383387
- run:
384388
name: Run playwright tests (Pro dummy app)
385389
working_directory: react_on_rails_pro/spec/dummy

react_on_rails_pro/spec/dummy/app/controllers/pages_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def redis_receiver
9494

9595
def redis_receiver_for_testing
9696
@request_id = params[:request_id]
97-
raise "request_id is required at the url" if @request_id.empty?
97+
raise "request_id is required at the url" if @request_id.blank?
9898

9999
stream_view_containing_react_components(template: "/pages/redis_receiver")
100100
end

react_on_rails_pro/spec/dummy/client/app/ror-auto-load-components/RedisReceiver.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const RedisItem = async ({ getValue, itemIndex }) => {
99
}
1010

1111
const RedisItemWithWrapper = ({ getValue, itemIndex }) => (
12-
<section class={`redis-item${itemIndex}-container`}>
12+
<section className={`redis-item${itemIndex}-container`}>
1313
<Suspense fallback={<p className={`redis-item${itemIndex}-fallback`}>Waiting for the key "Item{itemIndex + 1}"</p>}>
1414
<RedisItem getValue={getValue} itemIndex={itemIndex} />
1515
</Suspense>

react_on_rails_pro/spec/dummy/e2e-tests/dummt-fixture.ts

Lines changed: 0 additions & 33 deletions
This file was deleted.

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

Lines changed: 0 additions & 22 deletions
This file was deleted.

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ type RedisReceiverPageFixture = {
1717

1818
export type RedisReceiverControllerFixture = {
1919
sendRedisValue: (key: string, value: unknown) => Promise<void>;
20-
sendRedisItemValue: (itemIndex: Number, value: unknown) => Promise<void>;
20+
sendRedisItemValue: (itemIndex: number, value: unknown) => Promise<void>;
2121
matchPageSnapshot: (snapshotPath: string) => Promise<void>;
2222
waitForConsoleMessage: (msg: string) => Promise<void>;
2323
getNetworkRequests: (requestUrlPattern: RegExp) => Promise<Request[]>;
@@ -33,8 +33,9 @@ const redisControlledTest = base.extend<RedisRequestIdFixture, RedisClientFixtur
3333
await client.close();
3434
}, { scope: 'worker' }],
3535

36-
redisRequestId: async ({}, use) => {
36+
redisRequestId: async ({ redisClient }, use) => {
3737
await use(randomUUID());
38+
redisClient.del
3839
},
3940

4041
nonBlockingNavigateWithRequestId: async ({ redisRequestId, page }, use) => {

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,24 @@ import {
2222
test(`incremental rendering of page: ${pageName}`, async ({ matchPageSnapshot, sendRedisItemValue }) => {
2323
await matchPageSnapshot('stage0');
2424

25-
sendRedisItemValue(0, 'Incremental Value1');
25+
await sendRedisItemValue(0, 'Incremental Value1');
2626
await matchPageSnapshot('stage1');
2727

28-
sendRedisItemValue(3, 'Incremental Value4');
28+
await sendRedisItemValue(3, 'Incremental Value4');
2929
await matchPageSnapshot('stage2');
3030

31-
sendRedisItemValue(1, 'Incremental Value2');
31+
await sendRedisItemValue(1, 'Incremental Value2');
3232
await matchPageSnapshot('stage3');
3333

34-
sendRedisItemValue(2, 'Incremental Value3');
34+
await sendRedisItemValue(2, 'Incremental Value3');
3535
await matchPageSnapshot('stage4');
3636

37-
sendRedisItemValue(4, 'Incremental Value5');
37+
await sendRedisItemValue(4, 'Incremental Value5');
3838
await matchPageSnapshot('stage5');
3939
});
4040

4141
test(`early hydration of page: ${pageName}`, async ({ page, waitForConsoleMessage, matchPageSnapshot, sendRedisItemValue }) => {
42-
waitForConsoleMessage('ToggleContainer with title');
42+
await waitForConsoleMessage('ToggleContainer with title');
4343

4444
await page.click('.toggle-button');
4545
await expect(page.getByText(/Waiting for the key "Item\d"/)).not.toBeVisible();
@@ -52,19 +52,19 @@ import {
5252
}
5353
await matchPageSnapshot('stage0');
5454

55-
sendRedisItemValue(0, 'Incremental Value1');
55+
await sendRedisItemValue(0, 'Incremental Value1');
5656
await matchPageSnapshot('stage1');
5757

58-
sendRedisItemValue(3, 'Incremental Value4');
58+
await sendRedisItemValue(3, 'Incremental Value4');
5959
await matchPageSnapshot('stage2');
6060

61-
sendRedisItemValue(1, 'Incremental Value2');
61+
await sendRedisItemValue(1, 'Incremental Value2');
6262
await matchPageSnapshot('stage3');
6363

64-
sendRedisItemValue(2, 'Incremental Value3');
64+
await sendRedisItemValue(2, 'Incremental Value3');
6565
await matchPageSnapshot('stage4');
6666

67-
sendRedisItemValue(4, 'Incremental Value5');
67+
await sendRedisItemValue(4, 'Incremental Value5');
6868
await matchPageSnapshot('stage5');
6969
})
7070
})

react_on_rails_pro/spec/dummy/playwright.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export default defineConfig({
2727
/* Opt out of parallel tests on CI. */
2828
workers: process.env.CI ? 1 : undefined,
2929
/* Reporter to use. See https://playwright.dev/docs/test-reporters */
30-
reporter: process.env.ci ? [
30+
reporter: process.env.CI ? [
3131
['html'],
3232
['junit', { outputFile: 'test-results/results.xml' }]
3333
] : 'html',

0 commit comments

Comments
 (0)