@@ -40,6 +40,7 @@ import { MediaHandler } from "matrix-js-sdk/src/webrtc/mediaHandler";
4040import { Feature , ServerSupport } from "matrix-js-sdk/src/feature" ;
4141import { CryptoBackend } from "matrix-js-sdk/src/common-crypto/CryptoBackend" ;
4242import { IEventDecryptionResult } from "matrix-js-sdk/src/@types/crypto" ;
43+ import { MapperOpts } from "matrix-js-sdk/src/event-mapper" ;
4344
4445import type { GroupCall } from "matrix-js-sdk/src/webrtc/groupCall" ;
4546import { MatrixClientPeg as peg } from "../../src/MatrixClientPeg" ;
@@ -145,7 +146,7 @@ export function createTestClient(): MatrixClient {
145146 content : { } ,
146147 } ) ;
147148 } ) ,
148- mxcUrlToHttp : ( mxc ) => `http://this.is.a.url/${ mxc . substring ( 6 ) } ` ,
149+ mxcUrlToHttp : ( mxc : string ) => `http://this.is.a.url/${ mxc . substring ( 6 ) } ` ,
149150 setAccountData : jest . fn ( ) ,
150151 setRoomAccountData : jest . fn ( ) ,
151152 setRoomTopic : jest . fn ( ) ,
@@ -200,7 +201,7 @@ export function createTestClient(): MatrixClient {
200201 stopAllStreams : jest . fn ( ) ,
201202 } as unknown as MediaHandler ) ,
202203 uploadContent : jest . fn ( ) ,
203- getEventMapper : ( ) => ( opts ) => new MatrixEvent ( opts ) ,
204+ getEventMapper : ( _options ?: MapperOpts ) => ( event : Partial < IEvent > ) => new MatrixEvent ( event ) ,
204205 leaveRoomChain : jest . fn ( ( roomId ) => ( { [ roomId ] : null } ) ) ,
205206 doesServerSupportLogoutDevices : jest . fn ( ) . mockReturnValue ( true ) ,
206207 requestPasswordEmailToken : jest . fn ( ) . mockRejectedValue ( { } ) ,
@@ -476,34 +477,11 @@ export function mkMessage({
476477}
477478
478479export function mkStubRoom ( roomId : string = null , name : string , client : MatrixClient ) : Room {
479- const stubTimeline = { getEvents : ( ) => [ ] } as unknown as EventTimeline ;
480+ const stubTimeline = { getEvents : ( ) => [ ] as MatrixEvent [ ] } as unknown as EventTimeline ;
480481 return {
481- roomId,
482- getReceiptsForEvent : jest . fn ( ) . mockReturnValue ( [ ] ) ,
483- getMember : jest . fn ( ) . mockReturnValue ( {
484- userId : "@member:domain.bla" ,
485- name : "Member" ,
486- rawDisplayName : "Member" ,
487- roomId : roomId ,
488- getAvatarUrl : ( ) => "mxc://avatar.url/image.png" ,
489- getMxcAvatarUrl : ( ) => "mxc://avatar.url/image.png" ,
490- } ) ,
491- getMembersWithMembership : jest . fn ( ) . mockReturnValue ( [ ] ) ,
492- getJoinedMembers : jest . fn ( ) . mockReturnValue ( [ ] ) ,
493- getJoinedMemberCount : jest . fn ( ) . mockReturnValue ( 1 ) ,
494- getInvitedAndJoinedMemberCount : jest . fn ( ) . mockReturnValue ( 1 ) ,
495- setUnreadNotificationCount : jest . fn ( ) ,
496- getMembers : jest . fn ( ) . mockReturnValue ( [ ] ) ,
497- getPendingEvents : ( ) => [ ] ,
498- getLiveTimeline : jest . fn ( ) . mockReturnValue ( stubTimeline ) ,
499- getUnfilteredTimelineSet : jest . fn ( ) ,
500- findEventById : ( ) => null ,
501- getAccountData : ( ) => null ,
502- hasMembershipState : ( ) => null ,
503- getVersion : ( ) => "1" ,
504- shouldUpgradeToVersion : ( ) => null ,
505- getMyMembership : jest . fn ( ) . mockReturnValue ( "join" ) ,
506- maySendMessage : jest . fn ( ) . mockReturnValue ( true ) ,
482+ canInvite : jest . fn ( ) ,
483+ client,
484+ createThreadsTimelineSets : jest . fn ( ) . mockReturnValue ( new Promise ( ( ) => { } ) ) ,
507485 currentState : {
508486 getStateEvents : jest . fn ( ( _type , key ) => ( key === undefined ? [ ] : null ) ) ,
509487 getMember : jest . fn ( ) ,
@@ -516,37 +494,62 @@ export function mkStubRoom(roomId: string = null, name: string, client: MatrixCl
516494 on : jest . fn ( ) ,
517495 off : jest . fn ( ) ,
518496 } as unknown as RoomState ,
519- tags : { } ,
520- setBlacklistUnverifiedDevices : jest . fn ( ) ,
521- on : jest . fn ( ) ,
522- off : jest . fn ( ) ,
523- removeListener : jest . fn ( ) ,
524- getDMInviter : jest . fn ( ) ,
525- name,
526- normalizedName : normalize ( name || "" ) ,
497+ eventShouldLiveIn : jest . fn ( ) . mockReturnValue ( { } ) ,
498+ fetchRoomThreads : jest . fn ( ) . mockReturnValue ( Promise . resolve ( ) ) ,
499+ findEventById : ( _ : string ) => undefined as MatrixEvent | undefined ,
500+ findPredecessor : jest . fn ( ) . mockReturnValue ( { roomId : "" , eventId : null } ) ,
501+ getAccountData : ( _ : EventType | string ) => undefined as MatrixEvent | undefined ,
502+ getAltAliases : jest . fn ( ) . mockReturnValue ( [ ] ) ,
527503 getAvatarUrl : ( ) => "mxc://avatar.url/room.png" ,
504+ getCanonicalAlias : jest . fn ( ) ,
505+ getDMInviter : jest . fn ( ) ,
506+ getEventReadUpTo : jest . fn ( ( ) => null ) ,
507+ getInvitedAndJoinedMemberCount : jest . fn ( ) . mockReturnValue ( 1 ) ,
508+ getJoinRule : jest . fn ( ) . mockReturnValue ( "invite" ) ,
509+ getJoinedMemberCount : jest . fn ( ) . mockReturnValue ( 1 ) ,
510+ getJoinedMembers : jest . fn ( ) . mockReturnValue ( [ ] ) ,
511+ getLiveTimeline : jest . fn ( ) . mockReturnValue ( stubTimeline ) ,
512+ getMember : jest . fn ( ) . mockReturnValue ( {
513+ userId : "@member:domain.bla" ,
514+ name : "Member" ,
515+ rawDisplayName : "Member" ,
516+ roomId : roomId ,
517+ getAvatarUrl : ( ) => "mxc://avatar.url/image.png" ,
518+ getMxcAvatarUrl : ( ) => "mxc://avatar.url/image.png" ,
519+ } ) ,
520+ getMembers : jest . fn ( ) . mockReturnValue ( [ ] ) ,
521+ getMembersWithMembership : jest . fn ( ) . mockReturnValue ( [ ] ) ,
528522 getMxcAvatarUrl : ( ) => "mxc://avatar.url/room.png" ,
529- isSpaceRoom : jest . fn ( ) . mockReturnValue ( false ) ,
523+ getMyMembership : jest . fn ( ) . mockReturnValue ( "join" ) ,
524+ getPendingEvents : ( ) => [ ] as MatrixEvent [ ] ,
525+ getReceiptsForEvent : jest . fn ( ) . mockReturnValue ( [ ] ) ,
526+ getRecommendedVersion : jest . fn ( ) . mockReturnValue ( Promise . resolve ( "" ) ) ,
527+ getThreads : jest . fn ( ) . mockReturnValue ( [ ] ) ,
530528 getType : jest . fn ( ) . mockReturnValue ( undefined ) ,
531- isElementVideoRoom : jest . fn ( ) . mockReturnValue ( false ) ,
529+ getUnfilteredTimelineSet : jest . fn ( ) ,
532530 getUnreadNotificationCount : jest . fn ( ( ) => 0 ) ,
533- getEventReadUpTo : jest . fn ( ( ) => null ) ,
534- getCanonicalAlias : jest . fn ( ) ,
535- getAltAliases : jest . fn ( ) . mockReturnValue ( [ ] ) ,
536- timeline : [ ] ,
537- getJoinRule : jest . fn ( ) . mockReturnValue ( "invite" ) ,
531+ getVersion : jest . fn ( ) . mockReturnValue ( "1" ) ,
532+ hasMembershipState : ( ) => false ,
533+ isElementVideoRoom : jest . fn ( ) . mockReturnValue ( false ) ,
534+ isSpaceRoom : jest . fn ( ) . mockReturnValue ( false ) ,
538535 loadMembersIfNeeded : jest . fn ( ) ,
539- client ,
536+ maySendMessage : jest . fn ( ) . mockReturnValue ( true ) ,
540537 myUserId : client ?. getUserId ( ) ,
541- canInvite : jest . fn ( ) ,
542- getThreads : jest . fn ( ) . mockReturnValue ( [ ] ) ,
543- eventShouldLiveIn : jest . fn ( ) . mockReturnValue ( { } ) ,
544- createThreadsTimelineSets : jest . fn ( ) . mockReturnValue ( new Promise ( ( ) => { } ) ) ,
545- fetchRoomThreads : jest . fn ( ) . mockReturnValue ( new Promise ( ( ) => { } ) ) ,
538+ name,
539+ normalizedName : normalize ( name || "" ) ,
540+ off : jest . fn ( ) ,
541+ on : jest . fn ( ) ,
542+ removeListener : jest . fn ( ) ,
543+ roomId,
544+ setBlacklistUnverifiedDevices : jest . fn ( ) ,
545+ setUnreadNotificationCount : jest . fn ( ) ,
546+ shouldUpgradeToVersion : ( ( ) => null ) as ( ) => string | null ,
547+ tags : { } ,
548+ timeline : [ ] ,
546549 } as unknown as Room ;
547550}
548551
549- export function mkServerConfig ( hsUrl , isUrl ) {
552+ export function mkServerConfig ( hsUrl : string , isUrl : string ) {
550553 return makeType ( ValidatedServerConfig , {
551554 hsUrl,
552555 hsName : "TEST_ENVIRONMENT" ,
0 commit comments