From c9c8177f58353fc4b71aa39cb6b8d40ee74d4779 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Wed, 4 Aug 2021 09:46:39 +0100
Subject: [PATCH] Start a call immediately after creating a room via the dial
 pad (#6529)

---
 src/CallHandler.tsx      | 2 ++
 test/CallHandler-test.ts | 6 +++++-
 test/test-utils.js       | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/CallHandler.tsx b/src/CallHandler.tsx
index caf010200a..30fcf46790 100644
--- a/src/CallHandler.tsx
+++ b/src/CallHandler.tsx
@@ -930,6 +930,8 @@ export default class CallHandler extends EventEmitter {
             action: 'view_room',
             room_id: roomId,
         });
+
+        await this.placeCall(roomId, PlaceCallType.Voice, null);
     }
 
     private async startTransferToPhoneNumber(call: MatrixCall, destination: string, consultFirst: boolean) {
diff --git a/test/CallHandler-test.ts b/test/CallHandler-test.ts
index 4c3dd25fb4..1a4560ad4a 100644
--- a/test/CallHandler-test.ts
+++ b/test/CallHandler-test.ts
@@ -156,13 +156,14 @@ describe('CallHandler', () => {
         DMRoomMap.setShared(null);
         // @ts-ignore
         window.mxCallHandler = null;
+        fakeCall = null;
         MatrixClientPeg.unset();
 
         document.body.removeChild(audioElement);
         SdkConfig.unset();
     });
 
-    it('should look up the correct user and open the room when a phone number is dialled', async () => {
+    it('should look up the correct user and start a call in the room when a phone number is dialled', async () => {
         MatrixClientPeg.get().getThirdpartyUser = jest.fn().mockResolvedValue([{
             userid: '@user2:example.org',
             protocol: "im.vector.protocol.sip_native",
@@ -179,6 +180,9 @@ describe('CallHandler', () => {
 
         const viewRoomPayload = await untilDispatch('view_room');
         expect(viewRoomPayload.room_id).toEqual(MAPPED_ROOM_ID);
+
+        // Check that a call was started
+        expect(fakeCall.roomId).toEqual(MAPPED_ROOM_ID);
     });
 
     it('should move calls between rooms when remote asserted identity changes', async () => {
diff --git a/test/test-utils.js b/test/test-utils.js
index 217c399443..bbab47589a 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -78,6 +78,7 @@ export function createTestClient() {
         },
         mxcUrlToHttp: (mxc) => 'http://this.is.a.url/',
         setAccountData: jest.fn(),
+        setRoomAccountData: jest.fn(),
         sendTyping: jest.fn().mockResolvedValue({}),
         sendMessage: () => jest.fn().mockResolvedValue({}),
         getSyncState: () => "SYNCING",