test(voip): tighten ringing endCall assertion and add VideoConf VoIP-lock saga coverage - #7177
Conversation
- Assert ringing endCall uses reject, not hangup - Document media-signaling mock limits (no real WebRTC in Jest) - Add videoConf saga tests for voipBlocksIncomingVideoconf short-circuit Made-with: Cursor
WalkthroughClarifies mocking scope and refines assertions in a VoIP call lifecycle integration test; adds a new Jest test file validating videoConf root saga behavior for incoming "direct videoconf" websocket messages covering both blocked and allowed call scenarios. Changes
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Suggested labels
🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
There was a problem hiding this comment.
🧹 Nitpick comments (2)
app/sagas/__tests__/videoConf.voipBlock.test.ts (2)
1-3: Nit: redundant default in the mock factory.The factory sets
voipBlocksIncomingVideoconftojest.fn(() => false), andbeforeEachalso callsmockReset()+mockReturnValue(false). SincemockResetwipes the factory implementation, the initial() => falsenever actually takes effect after the first test runs. Consider using plainjest.fn()in the factory to make it explicit thatbeforeEachowns the default.🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@app/sagas/__tests__/videoConf.voipBlock.test.ts` around lines 1 - 3, The mock factory currently sets voipBlocksIncomingVideoconf to jest.fn(() => false) even though your beforeEach calls mockReset() and mockReturnValue(false), so the initial default is redundant; change the factory to export voipBlocksIncomingVideoconf as plain jest.fn() and rely on the test-suite beforeEach to set/reset the default mockReturnValue(false) via mockReset()/mockReturnValue to make ownership of the default explicit.
38-41: Minor: the tuple destructure is a no-op.
const [wsAction, wsParams] = [envelope, undefined]unpacks a literal pair created on the same line, sowsAction === envelopeandwsParams === undefinedunconditionally. If the goal is only to mirror therooms.ts → handleVideoConfIncomingWebsocketMessagescall shape for readers, a single-line dispatch with an inline comment would be clearer:♻️ Proposed simplification
function dispatchIncomingCallLikeRooms(store: ReturnType<typeof setupStoreWithVideoConfSaga>): void { - const [wsAction, wsParams] = [envelope, undefined] as const; - store.dispatch(handleVideoConfIncomingWebsocketMessages({ action: wsAction, params: wsParams })); + // Mirrors rooms.ts: envelope is passed as `action`, `params` is undefined on the outer payload. + store.dispatch(handleVideoConfIncomingWebsocketMessages({ action: envelope, params: undefined })); }🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@app/sagas/__tests__/videoConf.voipBlock.test.ts` around lines 38 - 41, The tuple destructure in dispatchIncomingCallLikeRooms is a no-op; replace the two-line const unpack with a single-line dispatch that directly passes the expected shape to handleVideoConfIncomingWebsocketMessages (e.g., store.dispatch(handleVideoConfIncomingWebsocketMessages({ action: envelope, params: undefined }))), keeping the function name dispatchIncomingCallLikeRooms and the referenced envelope and setupStoreWithVideoConfSaga symbols intact and optionally add an inline comment that this mirrors rooms.ts call shape for clarity.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Nitpick comments:
In `@app/sagas/__tests__/videoConf.voipBlock.test.ts`:
- Around line 1-3: The mock factory currently sets voipBlocksIncomingVideoconf
to jest.fn(() => false) even though your beforeEach calls mockReset() and
mockReturnValue(false), so the initial default is redundant; change the factory
to export voipBlocksIncomingVideoconf as plain jest.fn() and rely on the
test-suite beforeEach to set/reset the default mockReturnValue(false) via
mockReset()/mockReturnValue to make ownership of the default explicit.
- Around line 38-41: The tuple destructure in dispatchIncomingCallLikeRooms is a
no-op; replace the two-line const unpack with a single-line dispatch that
directly passes the expected shape to handleVideoConfIncomingWebsocketMessages
(e.g., store.dispatch(handleVideoConfIncomingWebsocketMessages({ action:
envelope, params: undefined }))), keeping the function name
dispatchIncomingCallLikeRooms and the referenced envelope and
setupStoreWithVideoConfSaga symbols intact and optionally add an inline comment
that this mirrors rooms.ts call shape for clarity.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: ccd3049b-5fb9-407b-9701-9cb1022e8d64
📒 Files selected for processing (2)
app/containers/NewMediaCall/VoipCallLifecycle.integration.test.tsxapp/sagas/__tests__/videoConf.voipBlock.test.ts
📜 Review details
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
- GitHub Check: ESLint and Test / run-eslint-and-test
🧰 Additional context used
📓 Path-based instructions (6)
**/*.{js,jsx,ts,tsx,json}
📄 CodeRabbit inference engine (CLAUDE.md)
Configure Prettier with tabs, single quotes, 130 character width, no trailing commas, arrow parens avoid, and bracket same line
Files:
app/sagas/__tests__/videoConf.voipBlock.test.tsapp/containers/NewMediaCall/VoipCallLifecycle.integration.test.tsx
**/*.{js,jsx,ts,tsx}
📄 CodeRabbit inference engine (CLAUDE.md)
Use ESLint with
@rocket.chat/eslint-configbase configuration including React, React Native, TypeScript, and Jest plugins
Files:
app/sagas/__tests__/videoConf.voipBlock.test.tsapp/containers/NewMediaCall/VoipCallLifecycle.integration.test.tsx
**/*.{ts,tsx}
📄 CodeRabbit inference engine (CLAUDE.md)
Use TypeScript with strict mode enabled and configure baseUrl to app/ for import resolution
**/*.{ts,tsx}: Use TypeScript for type safety; add explicit type annotations to function parameters and return types
Prefer interfaces over type aliases for defining object shapes in TypeScript
Use enums for sets of related constants rather than magic strings or numbers
Files:
app/sagas/__tests__/videoConf.voipBlock.test.tsapp/containers/NewMediaCall/VoipCallLifecycle.integration.test.tsx
app/sagas/**/*.{ts,tsx}
📄 CodeRabbit inference engine (CLAUDE.md)
Place Redux sagas in app/sagas/ directory with separate files for init, login, rooms, messages, encryption, deepLinking, and videoConf side effects
Files:
app/sagas/__tests__/videoConf.voipBlock.test.ts
**/*.{js,ts,jsx,tsx}
📄 CodeRabbit inference engine (AGENTS.md)
**/*.{js,ts,jsx,tsx}: Use descriptive names for functions, variables, and classes that clearly convey their purpose
Write comments that explain the 'why' behind code decisions, not the 'what'
Keep functions small and focused on a single responsibility
Use const by default, let when reassignment is needed, and avoid var
Prefer async/await over .then() chains for handling asynchronous operations
Use explicit error handling with try/catch blocks for async operations
Avoid deeply nested code; refactor complex logic into helper functions
Files:
app/sagas/__tests__/videoConf.voipBlock.test.tsapp/containers/NewMediaCall/VoipCallLifecycle.integration.test.tsx
app/containers/**/*.{ts,tsx}
📄 CodeRabbit inference engine (CLAUDE.md)
Place reusable UI components in app/containers/ directory
Files:
app/containers/NewMediaCall/VoipCallLifecycle.integration.test.tsx
🧠 Learnings (5)
📓 Common learnings
Learnt from: CR
Repo: RocketChat/Rocket.Chat.ReactNative PR: 0
File: CLAUDE.md:0-0
Timestamp: 2026-04-07T17:49:17.538Z
Learning: Applies to app/lib/services/voip/**/*.{ts,tsx} : Implement VoIP with WebRTC peer-to-peer audio calls in app/lib/services/voip/ using Zustand stores instead of Redux, with native CallKit (iOS) and Telecom (Android) integration; keep VoIP and VideoConf separate
Learnt from: CR
Repo: RocketChat/Rocket.Chat.ReactNative PR: 0
File: CLAUDE.md:0-0
Timestamp: 2026-04-07T17:49:17.538Z
Learning: Applies to @(app/sagas/videoConf.ts|app/lib/methods/videoConf.ts) : Manage video conferencing via Redux actions/reducers/sagas in app/sagas/videoConf.ts and app/lib/methods/videoConf.ts using server-managed Jitsi integration; do not conflate with VoIP
📚 Learning: 2026-04-07T17:49:17.538Z
Learnt from: CR
Repo: RocketChat/Rocket.Chat.ReactNative PR: 0
File: CLAUDE.md:0-0
Timestamp: 2026-04-07T17:49:17.538Z
Learning: Applies to @(app/sagas/videoConf.ts|app/lib/methods/videoConf.ts) : Manage video conferencing via Redux actions/reducers/sagas in app/sagas/videoConf.ts and app/lib/methods/videoConf.ts using server-managed Jitsi integration; do not conflate with VoIP
Applied to files:
app/sagas/__tests__/videoConf.voipBlock.test.tsapp/containers/NewMediaCall/VoipCallLifecycle.integration.test.tsx
📚 Learning: 2026-04-07T17:49:17.538Z
Learnt from: CR
Repo: RocketChat/Rocket.Chat.ReactNative PR: 0
File: CLAUDE.md:0-0
Timestamp: 2026-04-07T17:49:17.538Z
Learning: Applies to app/lib/services/voip/**/*.{ts,tsx} : Implement VoIP with WebRTC peer-to-peer audio calls in app/lib/services/voip/ using Zustand stores instead of Redux, with native CallKit (iOS) and Telecom (Android) integration; keep VoIP and VideoConf separate
Applied to files:
app/sagas/__tests__/videoConf.voipBlock.test.tsapp/containers/NewMediaCall/VoipCallLifecycle.integration.test.tsx
📚 Learning: 2026-04-07T17:49:17.538Z
Learnt from: CR
Repo: RocketChat/Rocket.Chat.ReactNative PR: 0
File: CLAUDE.md:0-0
Timestamp: 2026-04-07T17:49:17.538Z
Learning: Applies to app/sagas/**/*.{ts,tsx} : Place Redux sagas in app/sagas/ directory with separate files for init, login, rooms, messages, encryption, deepLinking, and videoConf side effects
Applied to files:
app/sagas/__tests__/videoConf.voipBlock.test.ts
📚 Learning: 2026-03-30T15:49:30.957Z
Learnt from: Rohit3523
Repo: RocketChat/Rocket.Chat.ReactNative PR: 6875
File: app/containers/RoomItem/Actions.tsx:12-12
Timestamp: 2026-03-30T15:49:30.957Z
Learning: In RocketChat/Rocket.Chat.ReactNative, `react-native-worklets` version 0.6.1 does NOT export a built-in Jest mock (e.g., no `react-native-worklets/lib/module/mock`). The correct Jest mock approach for this version is to add a manual mock in `jest.setup.js`: `jest.mock('react-native-worklets', () => ({ scheduleOnRN: jest.fn((fn, ...args) => fn(...args)) }))`.
Applied to files:
app/containers/NewMediaCall/VoipCallLifecycle.integration.test.tsx
🔇 Additional comments (1)
app/containers/NewMediaCall/VoipCallLifecycle.integration.test.tsx (1)
655-668: B3 assertions look correct.The updated test properly covers the reject-vs-hangup branch for ringing calls, and the default
state: 'ringing'inmakeCallkeeps the setup aligned with the scenario.
…oms.ts comment Inline the one-line dispatch helper and correct the envelope comment to point at app/lib/methods/subscriptions/rooms.ts (the real DDP arg destructure site), not the saga. No behavior change; 22 tests still pass.
…/Decline (#7215) * merge feat.voip-lib * feat(voip): enhance call handling with UUID mapping and event listeners * Base call UI * feat(voip): integrate Zustand for call state management and enhance CallView UI * feat(voip): add simulateCall function for mock call handling in UI development * refactor(CallView): update button handlers and improve UI responsiveness * Add pause-shape-unfilled icon * Base CallHeader * toggleFocus * collapse buttons * Header components * Hide header when no call * Timer * Add use memo * Add voice call item on sidebar * cleanup * Temp use @rocket.chat/media-signaling from .tgz * cleanup * Check module and permissions to enable voip * Refactor stop method to use optional chaining for media signal listeners * voip push first test * Add VoIP call handling with pending call management - Implemented VoIP push notification handling in index.js, including storing call info for later processing. - Added CallKeep event handlers for answering and ending calls from a cold start. - Introduced a new CallIdUUID module to convert call IDs to deterministic UUIDs for compatibility with CallKit. - Created a pending call store to manage incoming calls when the app is not fully initialized. - Updated deep linking actions to include VoIP call handling. - Enhanced MediaSessionInstance to process pending calls and manage call states effectively. * Remove pending store and create getInitialEvents on app/index * Attempt to make iOS calls work from cold state * lint and format * Patch callkeep ios * Temp send iOS voip push token on gcm * Temp fix require cycle * chore: format code and fix lint issues [skip ci] * CallIDUUID module on android and voip push * Add setCallUUID on useCallStore to persist calls accepted on native Android * remove callkeep from notification * Android Incoming Call UI POC * Refactor VoIP handling: Migrate VoIP-related classes to a new package structure, removing deprecated modules and consolidating functionality. Update imports in MainApplication and NotificationIntentHandler to reflect changes. This cleanup enhances code organization and prepares for future VoIP feature enhancements. * Remove VoipForegroundService * cleanup and use caller instead of callerName * Cleanup and make iOS build again * Refactor VoIP handling: Remove unused event emissions for call answered and declined, switch from SharedPreferences to in-memory storage for pending VoIP call data, and update method signatures for better clarity. This cleanup enhances performance and prepares for future VoIP feature improvements. * Refactor VoIP handling: Introduce a new VoipPayload class to encapsulate call data, streamline notification processing, and enhance method signatures across the VoIP module. This update improves code clarity and prepares for future feature enhancements. * Migrate react-native-voip-push-notifications to VoipModule * Refactor VoIP module: Update package structure by moving VoipTurboPackage to the main package and removing the obsolete NativeVoipSpec class. Adjust imports in MainApplication and VoipModule to reflect these changes, enhancing code organization and maintainability. * Unify emitters * Move CallKeep listeners from MediaSessionInstance to getInitialEvents * Clear callkeep on endcall * Unify getInitialEvents logic * getInitialEvents -> MediaCallEvents * chore: format code and fix lint issues [skip ci] * feat(Android): Add full screen incoming call (#6977) * feat: Update call UI (#6990) * feat: Handle audio routing, e.g., Bluetooth headset vs. internal speaker switching (#6992) * fix: empty space when not on call (#6993) * feat: Dialpad (#7000) * action: organized translations * feat: start call (#7024) * chore: format code and fix lint issues * feat: Pre flight (#7038) * action: organized translations * feat: Receive voip push notifications from backend (#7045) * feat: Refactor media session handling and improve disconnect logic (#7065) * feat: Control incoming call from native (#7066) * feat: Voice message blocks (#7057) * feat: native accept success event (#7068) * feat(voip): call waiting, busy detection, and videoconf blocking (#7077) * action: organized translations * feat(voip): tap-to-hide call controls with animations (#7078) * feat(voip): navigate to call DM from message button and header (#7082) * feat(voip): tablet and landscape layout (#7110) * chore: develop into feat.voip-lib-new (RN 81 + Expo 54 + reanimated 4 + true-sheet + iOS 26) (#7114) * chore: format code and fix lint issues * feat(voip): android landscape layout for IncomingCallActivity (#7116) * Update agents files * feat(voip): Support a11y (#7106) * Fix content cutting on iOS on some edge cases * pods * Ignore .worktrees on jest * chore: Merge develop into feat.voip-lib-new (#7129) * fix(voip): show CallKit UI when call is active in background (#7128) * chore: Update media-signaling to 0.2.0 (#7153) * feat(voip): migrate iOS accept/reject from DDP to REST (#7124) * Fix icons * feat(voip): migrate Android accept/reject from DDP to REST (#7127) * test(voip): integration tests for CallView pipeline (#7161) * feat(voip): display video conf provider as subtitle (#7160) * fix(voip): CallView button grid and correct landscape/dialpad layouts (#7164) * fix(voip): prevent stale MMKV cache on Android first-install accept MMKVKeyManager.initialize ran in MainApplication.onCreate before the JS engine started and opened the default MMKV file via the Tencent 1.2 JAR when it was still empty. Tencent caches instances per-ID in a singleton registry, so that empty-state view was held for the rest of the process. JS later wrote credentials through react-native-mmkv (MMKV Core 2.0), which has its own separate registry. When a VoIP push arrived, Ejson.getMMKV() got the cached empty Tencent instance and reported "No userId found in MMKV for server". Closing and reopening the app cleared the cache, which is why only the very first call after install failed. Drop the open/verify block — the encryption key is already cached from SecureKeystore, so no MMKV handle is needed here. The first Tencent instance is now created inside Ejson.getMMKV() after JS has written, so it scans the file fresh. * fix(voip): prevent duplicate ringtone on Android incoming call (#7158) * fix(voip): set explicit snaps for NewMediaCall bottom sheet (#7165) * Update app/lib/services/voip/MediaSessionStore.ts Co-authored-by: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com> * fix: make startVoipFork reactive to permissions-changed (#7151) * fix(android): remove MediaProjectionService from merged manifest (#7190) * fix(voip): Phone account creation (#7170) * feat: add Enable Mobile Ringing toggle in user preferences (#7155) * fix(voip): ship blockers for PushKit, licensing, outbound calls, push tokens (#7167) * fix(android): Play Store mic discoverability, safer FCM logs, avatar auth via headers (#7171) * fix(ios): serialize VoipService bridge statics (#7169) * fix(voip): Android DDP thread safety and VoipPayload bundle parity (#7168) * chore(voip): dead-code and hygiene sweep (#7174) * refactor(voip): decouple navigateToCallRoom from Redux and backfill REST/connect tests (#7176) * test(voip): tighten ringing endCall assertion and add VideoConf VoIP-lock saga coverage (#7177) * fix(ios): harden VoIP DDP WebSocket client on receive failures and TLS (#7173) * refactor(voip): MediaCallEvents Redux adapters and resetVoipState (#7178) * refactor(voip): decouple peer autocomplete from Redux; simplify NewMediaCall (#7175) * fix(ios): add NS_SWIFT_NAME to Challenge.runChallenge for Swift 6.2 compatibility Swift 6.2 (Xcode 26.x / macos-26 runner) auto-renames the Objective-C method runChallenge:didReceiveChallenge:completionHandler: to run(_:didReceive:completionHandler:) when imported into Swift. Add NS_SWIFT_NAME to explicitly pin the Swift import name, preventing the compiler from applying its heuristics. This keeps the existing Swift call site in DDPClient.swift working without changes. * fix(ios): cancel old URLSession/webSocketTask before reconnecting in DDPClient.connect (#7197) * fix(ios): add NSLock to nativeAcceptHandledCallIds and 10s REST timeout to handleNativeAccept (#7198) * feat(android): create VoipCallService with FOREGROUND_SERVICE_MICROPHONE (#7199) * fix(android): start VoipCallService on accept, stop on hangup/timeout, install end-call listener (#7200) * fix(voip): enable DM nav for users with SIP extension (#7203) * fix(android): handle null VoiceConnection in answerIncomingCall, notify JS (#7201) * fix(voip): resolve closure capture ordering in handleNativeAccept (#7209) * fix(android): integrate VoIP modules with SSL-pinned OkHttpClient (#7208) * fix(push): gate id and voipToken behind server version checks, fix VideoConf caller extra (#7210) * fix(voip): remove sensitive data from production logs (#7207) * fix(android): remove isRunning guard + add double-tap guard on Accept/Decline - VoipCallService: remove if (!isRunning) guard, call startForeground unconditionally (idempotent on Android, fixes Android 14+ foreground service requirement) - IncomingCallActivity: add AtomicBoolean guard on handleAccept/handleDecline to prevent double-tap from triggering multiple service starts --------- Co-authored-by: diegolmello <diegolmello@users.noreply.github.com> Co-authored-by: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com>
Proposed changes
Strengthens the VoIP integration and saga test suites without touching production code.
app/containers/NewMediaCall/VoipCallLifecycle.integration.test.tsxMediaSessionInstance.endCallcase so it now assertscall.rejectwas invoked andcall.hangupwas not, matching the ringing-vs-active branching insideMediaSessionInstance.endCall. ExistingRNCallKeep.endCallanduseCallStoreassertions are preserved.@rocket.chat/media-signalingis fully mocked at the SDK boundary, so these tests exercise signaling orchestration, Zustand state and navigation — not real WebRTC (peer connections, ICE, media tracks). Regressions in the real WebRTC stack still require device or E2E coverage.app/sagas/__tests__/videoConf.voipBlock.test.ts(new)Covers the interaction between VoIP and incoming direct videoconf rings:
voipBlocksIncomingVideoconf()returns true, an incoming videoconfcallwebsocket message is short-circuited atonDirectCallandstate.videoConf.callsis left unchanged (same array reference, length 0).state.videoConf.callswithcallId,uid,ridandaction: 'call'.handleVideoConfIncomingWebsocketMessages, so the test exercises the real action → saga → reducer path end-to-end.beforeEachresets the VoIP guard mock between cases.Issue(s)
How to test or reproduce
Screenshots
N/A (tests only)
Types of changes
Checklist
Further comments
hangupnot called on ringing) guards against an accidental swap of the reject/hangup branches inMediaSessionInstance.endCall.