Skip to content

Commit 226f181

Browse files
committed
chore: update emitSocketLog type usage and adjust mock parameters
1 parent bdd7991 commit 226f181

File tree

1 file changed

+10
-17
lines changed

1 file changed

+10
-17
lines changed

tests/unit/socket/service-socket-adapter.vitest.ts

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ import type {
1010
InterServerEvents,
1111
SocketData
1212
} from '../../../app/types/contracts/v1/socket.js'
13-
import type { LogLevel } from '../../../app/logging/levels.js'
14-
import type { LogEventName } from '../../../app/logging/event-catalog.js'
15-
import type { SocketLogOptions } from '../../../app/logging/socket-logger.js'
13+
import type { emitSocketLog } from '../../../app/logging/socket-logger.js'
1614
import {
1715
TEST_NETWORK,
1816
TEST_SECRET,
@@ -22,15 +20,9 @@ import {
2220
import { DEFAULT_AUTH_METHODS } from '../../../app/constants/index.js'
2321
import { createAuthMethod } from '../../../app/types/branded.js'
2422

25-
type EmitSocketLogArgs = [
26-
AdapterContext,
27-
LogLevel,
28-
LogEventName,
29-
string,
30-
SocketLogOptions | undefined
31-
]
23+
type EmitSocketLogFn = typeof emitSocketLog
3224

33-
const emitSocketLogMock = vi.fn<EmitSocketLogArgs, void>()
25+
const emitSocketLogMock = vi.fn<EmitSocketLogFn>()
3426

3527
const {
3628
REMOTE_PASSWORD_HEADER,
@@ -49,7 +41,7 @@ const ensureSocket = (context: AdapterContext): Socket<
4941
}
5042

5143
vi.mock('../../../app/logging/socket-logger.js', () => ({
52-
emitSocketLog: (...args: EmitSocketLogArgs) => {
44+
emitSocketLog: (...args: Parameters<EmitSocketLogFn>) => {
5345
emitSocketLogMock(...args)
5446
}
5547
}))
@@ -161,6 +153,7 @@ const createConfig = (): Config => ({
161153
background: '#000000'
162154
},
163155
options: {
156+
challengeButton: false,
164157
allowReplay: true,
165158
allowReauth: true,
166159
allowReconnect: true,
@@ -197,11 +190,11 @@ const createSocket = (): TestSocket => {
197190
handshake: {
198191
headers,
199192
address: TEST_NETWORK.HANDSHAKE_IP
200-
},
193+
} as unknown as TestSocket['handshake'],
201194
request: {
202195
headers,
203196
session: { [SESSION_CREDENTIALS_KEY]: { passwordSource: PASSWORD_SOURCE_NONE } }
204-
},
197+
} as unknown as TestSocket['request'],
205198
on: vi.fn(),
206199
onAny: vi.fn(),
207200
emit: vi.fn()
@@ -227,7 +220,7 @@ describe('ServiceSocketAdapter', () => {
227220
expect(adapter).toBeInstanceOf(ServiceSocketAdapter)
228221

229222
expect(emitSocketLogMock).toHaveBeenCalled()
230-
const callArgs: EmitSocketLogArgs = emitSocketLogMock.mock.calls[0]
223+
const callArgs: Parameters<EmitSocketLogFn> = emitSocketLogMock.mock.calls[0]
231224
const [context, level, event, message, options] = callArgs
232225

233226
expect(level).toBe('info')
@@ -254,7 +247,7 @@ describe('ServiceSocketAdapter', () => {
254247
const services = {} as Services
255248

256249
// eslint-disable-next-line no-new -- constructor called for side effects (emits events)
257-
new ServiceSocketAdapter(socket, config, services)
250+
new ServiceSocketAdapter(socket, config, services) //NOSONAR
258251

259252
expect(socket.emit).toHaveBeenCalledWith('permissions', {
260253
hostKeyVerification: {
@@ -274,7 +267,7 @@ describe('ServiceSocketAdapter', () => {
274267
const services = {} as Services
275268

276269
// eslint-disable-next-line no-new -- constructor called for side effects (emits events)
277-
new ServiceSocketAdapter(socket, config, services)
270+
new ServiceSocketAdapter(socket, config, services) //NOSONAR
278271

279272
expect(socket.emit).toHaveBeenCalledWith('permissions', {
280273
hostKeyVerification: {

0 commit comments

Comments
 (0)