Skip to content

Commit a1b8a98

Browse files
Add Redis service container with health checks for package-js-tests
1 parent dd70d41 commit a1b8a98

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

.github/workflows/pro-package-tests.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,17 @@ jobs:
9898
package-js-tests:
9999
needs: build-dummy-app-webpack-test-bundles
100100
runs-on: ubuntu-22.04
101+
# Redis service container
102+
services:
103+
redis:
104+
image: cimg/redis:6.2.6
105+
ports:
106+
- 6379:6379
107+
options: >-
108+
--health-cmd "redis-cli ping"
109+
--health-interval 10s
110+
--health-timeout 5s
111+
--health-retries 5
101112
env:
102113
REACT_ON_RAILS_PRO_LICENSE: ${{ secrets.REACT_ON_RAILS_PRO_LICENSE }}
103114
steps:

react_on_rails_pro/packages/node-renderer/tests/redisClient.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// This test in only for documenting Redis client usage
2+
13
import { createClient } from 'redis';
24

35
const redisClient = createClient({ url: process.env.REDIS_URL || 'redis://localhost:6379' });

react_on_rails_pro/spec/dummy/client/app/utils/redisReceiver.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export function listenToRequestData(requestId: string): RequestListener {
7575
}
7676

7777
// Create new listening promise
78-
listenToStreamPromise = (async (): Promise<void> => {
78+
const promise = (async (): Promise<void> => {
7979
if (isClosed) {
8080
throw new Error('Redis Connection is closed');
8181
}
@@ -123,10 +123,12 @@ export function listenToRequestData(requestId: string): RequestListener {
123123
}
124124
})();
125125

126-
return listenToStreamPromise.finally(() => {
126+
listenToStreamPromise = promise.finally(() => {
127127
// Reset so next call creates new promise
128128
listenToStreamPromise = null;
129129
});
130+
131+
return listenToStreamPromise;
130132
}
131133

132134
/**

0 commit comments

Comments
 (0)