mirror of
https://github.com/vector-im/element-call.git
synced 2026-08-29 21:15:19 +00:00
Add test: reproduce "ring does not stop" race.
Signed-off-by: Timo K <toger5@hotmail.de>
This commit is contained in:
@@ -266,7 +266,7 @@ const mockLegacyRingEvent = {} as { event_id: string } & ICallNotifyContent;
|
|||||||
interface CallViewModelInputs {
|
interface CallViewModelInputs {
|
||||||
remoteParticipants$: Behavior<RemoteParticipant[]>;
|
remoteParticipants$: Behavior<RemoteParticipant[]>;
|
||||||
rtcMembers$: Behavior<Partial<CallMembership>[]>;
|
rtcMembers$: Behavior<Partial<CallMembership>[]>;
|
||||||
connectionState$: Observable<ECConnectionState>;
|
livekitConnectionState$: Observable<ECConnectionState>;
|
||||||
speaking: Map<Participant, Observable<boolean>>;
|
speaking: Map<Participant, Observable<boolean>>;
|
||||||
mediaDevices: MediaDevices;
|
mediaDevices: MediaDevices;
|
||||||
initialSyncState: SyncState;
|
initialSyncState: SyncState;
|
||||||
@@ -276,7 +276,7 @@ function withCallViewModel(
|
|||||||
{
|
{
|
||||||
remoteParticipants$ = constant([]),
|
remoteParticipants$ = constant([]),
|
||||||
rtcMembers$ = constant([localRtcMember]),
|
rtcMembers$ = constant([localRtcMember]),
|
||||||
connectionState$ = of(ConnectionState.Connected),
|
livekitConnectionState$: connectionState$ = of(ConnectionState.Connected),
|
||||||
speaking = new Map(),
|
speaking = new Map(),
|
||||||
mediaDevices = mockMediaDevices({}),
|
mediaDevices = mockMediaDevices({}),
|
||||||
initialSyncState = SyncState.Syncing,
|
initialSyncState = SyncState.Syncing,
|
||||||
@@ -384,7 +384,7 @@ test("participants are retained during a focus switch", () => {
|
|||||||
b: [],
|
b: [],
|
||||||
}),
|
}),
|
||||||
rtcMembers$: constant([localRtcMember, aliceRtcMember, bobRtcMember]),
|
rtcMembers$: constant([localRtcMember, aliceRtcMember, bobRtcMember]),
|
||||||
connectionState$: behavior(connectionInputMarbles, {
|
livekitConnectionState$: behavior(connectionInputMarbles, {
|
||||||
c: ConnectionState.Connected,
|
c: ConnectionState.Connected,
|
||||||
s: ECAddonConnectionState.ECSwitchingFocus,
|
s: ECAddonConnectionState.ECSwitchingFocus,
|
||||||
}),
|
}),
|
||||||
@@ -1251,6 +1251,41 @@ describe("waitForCallPickup$", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("regression test: does stop ringing in case livekitConnectionState$ emits after didSendCallNotification$ has already emitted", () => {
|
||||||
|
withTestScheduler(({ schedule, expectObservable, behavior }) => {
|
||||||
|
withCallViewModel(
|
||||||
|
{
|
||||||
|
livekitConnectionState$: behavior("d 9ms c", {
|
||||||
|
d: ConnectionState.Disconnected,
|
||||||
|
c: ConnectionState.Connected,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
(vm, rtcSession) => {
|
||||||
|
// Fire a call notification IMMEDIATELY (its important for this test, that this happens before the livekitConnectionState$ emits)
|
||||||
|
schedule("n", {
|
||||||
|
n: () => {
|
||||||
|
rtcSession.emit(
|
||||||
|
MatrixRTCSessionEvent.DidSendCallNotification,
|
||||||
|
mockRingEvent("$notif1", 30),
|
||||||
|
mockLegacyRingEvent,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
expectObservable(vm.callPickupState$).toBe("a 9ms b 29ms c", {
|
||||||
|
a: "unknown",
|
||||||
|
b: "ringing",
|
||||||
|
c: "timeout",
|
||||||
|
});
|
||||||
|
},
|
||||||
|
{
|
||||||
|
waitForCallPickup: true,
|
||||||
|
encryptionSystem: { kind: E2eeType.PER_PARTICIPANT },
|
||||||
|
},
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
test("ringing -> success if someone joins before timeout", () => {
|
test("ringing -> success if someone joins before timeout", () => {
|
||||||
withTestScheduler(({ behavior, schedule, expectObservable }) => {
|
withTestScheduler(({ behavior, schedule, expectObservable }) => {
|
||||||
// Someone joins at 20ms (both LiveKit participant and MatrixRTC member)
|
// Someone joins at 20ms (both LiveKit participant and MatrixRTC member)
|
||||||
@@ -1305,7 +1340,7 @@ describe("waitForCallPickup$", () => {
|
|||||||
a: [localRtcMember],
|
a: [localRtcMember],
|
||||||
b: [localRtcMember, aliceRtcMember],
|
b: [localRtcMember, aliceRtcMember],
|
||||||
}),
|
}),
|
||||||
connectionState$,
|
livekitConnectionState$: connectionState$,
|
||||||
},
|
},
|
||||||
(vm, rtcSession) => {
|
(vm, rtcSession) => {
|
||||||
// Notify at 5ms so we enter ringing, then get disconnected 5ms later
|
// Notify at 5ms so we enter ringing, then get disconnected 5ms later
|
||||||
|
|||||||
@@ -981,7 +981,7 @@ export class CallViewModel extends ViewModel {
|
|||||||
}
|
}
|
||||||
// Show the ringing state of the most recent ringing attempt.
|
// Show the ringing state of the most recent ringing attempt.
|
||||||
// ring$ is a behavior so it will emit the latest observable which very well might already have a running timer.
|
// ring$ is a behavior so it will emit the latest observable which very well might already have a running timer.
|
||||||
// this is important in case livekitConnectionState$ and someoneElseJoined$ emit after didSendCallNotification$ has already emitted.
|
// this is important in case livekitConnectionState$ after didSendCallNotification$ has already emitted.
|
||||||
return this.ring$.pipe(switchAll());
|
return this.ring$.pipe(switchAll());
|
||||||
}),
|
}),
|
||||||
// The state starts as 'unknown' because we don't know if the RTC
|
// The state starts as 'unknown' because we don't know if the RTC
|
||||||
|
|||||||
Reference in New Issue
Block a user