add test

Signed-off-by: Timo K <[email protected]>

Author: toger5

spec/unit/matrixrtc/CallMembership.spec.ts

@@ -15,12 +15,7 @@ limitations under the License.
 */
 
 import { type MatrixEvent } from "../../../src";
-import {
-    CallMembership,
-    type SessionMembershipData,
-    DEFAULT_EXPIRE_DURATION,
-    type RtcMembershipData,
-} from "../../../src/matrixrtc/CallMembership";
+import { CallMembership, DEFAULT_EXPIRE_DURATION, type RtcMembershipData } from "../../../src/matrixrtc/CallMembership";
 import { membershipTemplate } from "./mocks";
 
 function makeMockEvent(originTs = 0, content = {}): MatrixEvent {
@@ -42,16 +37,6 @@ describe("CallMembership", () => {
             jest.useRealTimers();
         });
 
-        const membershipTemplate: SessionMembershipData = {
-            "call_id": "",
-            "scope": "m.room",
-            "application": "m.call",
-            "device_id": "AAAAAAA",
-            "focus_active": { type: "livekit", focus_selection: "oldest_membership" },
-            "foci_preferred": [{ type: "livekit" }],
-            "m.call.intent": "voice",
-        };
-
         it("rejects membership with no device_id", () => {
             expect(() => {
                 new CallMembership(makeMockEvent(0, Object.assign({}, membershipTemplate, { device_id: undefined })));
@@ -184,6 +169,19 @@ describe("CallMembership", () => {
                 expect(membership.isExpired()).toBe(true);
             });
         });
+        describe("expiry calculation", () => {
+            beforeEach(() => jest.useFakeTimers());
+            afterEach(() => jest.useRealTimers());
+
+            it("calculates time until expiry", () => {
+                // server origin timestamp for this event is 1000
+                const fakeEvent = makeMockEvent(1000, membershipTemplate);
+                const membership = new CallMembership(fakeEvent);
+                jest.setSystemTime(2000);
+                // should be using absolute expiry time
+                expect(membership.getMsUntilExpiry()).toEqual(DEFAULT_EXPIRE_DURATION - 1000);
+            });
+        });
     });
 
     describe("RtcMembershipData", () => {
@@ -328,28 +326,25 @@ describe("CallMembership", () => {
                 expect(membership.isExpired()).toBe(false);
             });
         });
-    });
-
-    describe("expiry calculation", () => {
-        let fakeEvent: MatrixEvent;
-        let membership: CallMembership;
-
-        beforeEach(() => {
-            // server origin timestamp for this event is 1000
-            fakeEvent = makeMockEvent(1000, membershipTemplate);
-            membership = new CallMembership(fakeEvent!);
 
-            jest.useFakeTimers();
-        });
+        describe("expiry calculation", () => {
+            beforeEach(() => jest.useFakeTimers());
+            afterEach(() => jest.useRealTimers());
 
-        afterEach(() => {
-            jest.useRealTimers();
-        });
+            afterEach(() => {
+                jest.useRealTimers();
+            });
 
-        it("calculates time until expiry", () => {
-            jest.setSystemTime(2000);
-            // should be using absolute expiry time
-            expect(membership.getMsUntilExpiry()).toEqual(DEFAULT_EXPIRE_DURATION - 1000);
+            it("calculates time until expiry", () => {
+                // server origin timestamp for this event is 1000
+                // The related event used for created_ts is at 500
+                const fakeEvent = makeMockEvent(1000, membershipTemplate);
+                const initialEvent = makeMockEvent(500, membershipTemplate);
+                const membership = new CallMembership(fakeEvent, initialEvent);
+                jest.setSystemTime(2000);
+                // should be using absolute expiry time
+                expect(membership.getMsUntilExpiry()).toEqual(DEFAULT_EXPIRE_DURATION - 1500);
+            });
         });
     });
 });

spec/unit/matrixrtc/mocks.ts

@@ -23,13 +23,13 @@ import { secureRandomString } from "../../../src/randomstring";
 export type MembershipData = (SessionMembershipData | {}) & { user_id: string };
 
 export const membershipTemplate: SessionMembershipData & { user_id: string } = {
-    application: "m.call",
-    call_id: "",
-    user_id: "@mock:user.example",
-    device_id: "AAAAAAA",
-    scope: "m.room",
-    focus_active: { type: "livekit", focus_selection: "oldest_membership" },
-    foci_preferred: [
+    "application": "m.call",
+    "call_id": "",
+    "user_id": "@mock:user.example",
+    "device_id": "AAAAAAA",
+    "scope": "m.room",
+    "focus_active": { type: "livekit", focus_selection: "oldest_membership" },
+    "foci_preferred": [
         {
             livekit_alias: "!alias:something.org",
             livekit_service_url: "https://livekit-jwt.something.io",
@@ -41,6 +41,7 @@ export const membershipTemplate: SessionMembershipData & { user_id: string } = {
             type: "livekit",
         },
     ],
+    "m.call.intent": "voice",
 };
 
 export type MockClient = Pick<