Skip to content

Commit 58e17c3

Browse files
committed
test: Silence console logs
test: Prevent socket connection retries
1 parent 2e91b41 commit 58e17c3

File tree

4 files changed

+21
-17
lines changed

4 files changed

+21
-17
lines changed

src/renderer/components/SplashScreen.test.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { setMainState } from '@renderer/store/main/slice';
22
import { renderWithProviders } from '@test/redux';
3-
import { waitFor } from '@testing-library/react';
3+
import { act, waitFor } from '@testing-library/react';
44
import { describe, expect, it } from 'vitest';
55
import { SplashScreen } from './SplashScreen';
66

@@ -10,9 +10,9 @@ describe('SplashScreen', () => {
1010

1111
expect(container.querySelector('.splash-screen')).toBeInTheDocument();
1212

13-
store.dispatch(setMainState({
13+
act(() => store.dispatch(setMainState({
1414
loadedAll: true,
15-
}));
15+
})));
1616

1717
// Wait for it to disappear (with timeout slightly longer than 2000ms)
1818
await waitFor(

src/shared/back/SocketClient.ts

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -118,21 +118,23 @@ export class SocketClient<SOCKET extends BaseSocket> extends EventEmitter {
118118
}
119119

120120
if (this.url) {
121-
// Connect
122-
return SocketClient.connect(this.socketCon, this.url, this.secret)
123-
.then(socket => {
124-
this.setSocket(socket);
125-
if (this.onStateChange) {
126-
this.onStateChange(true);
127-
}
128-
})
129-
.catch(async (error) => {
130-
console.error(`Failed Connection Attempt: ${error}`);
131-
await new Promise<void>(resolve => {
132-
setTimeout(resolve, 2000);
121+
if (!this.abortReconnects) {
122+
// Connect
123+
return SocketClient.connect(this.socketCon, this.url, this.secret)
124+
.then(socket => {
125+
this.setSocket(socket);
126+
if (this.onStateChange) {
127+
this.onStateChange(true);
128+
}
129+
})
130+
.catch(async (error) => {
131+
console.error(`Failed Connection Attempt: ${error}`);
132+
await new Promise<void>(resolve => {
133+
setTimeout(resolve, 2000);
134+
});
135+
return this.reconnect();
133136
});
134-
return this.reconnect();
135-
});
137+
}
136138
} else {
137139
console.error('No client url stored, cannot reconnect (Is this a host?)');
138140
}

src/test/useTestServer.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export function useTestServer(mockHandlers?: MockHandlers) {
1111
server.listen();
1212
socket = await SocketClient.connect(WebSocket, mockServerUrl, 'flashpoint-launcher');
1313
window.Shared.back = new SocketClient(WebSocket);
14+
window.Shared.back.abortReconnects = true;
1415
window.Shared.back.secret = 'flashpoint-launcher';
1516
window.Shared.back.url = mockServerUrl;
1617
window.Shared.back.setSocket(socket);

vitest.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { defineConfig } from 'vitest/config';
33

44
export default defineConfig({
55
test: {
6+
silent: true,
67
environment: 'jsdom',
78
setupFiles: ['src/vitest-setup.ts'],
89
globals: true,

0 commit comments

Comments
 (0)