Make test pass

Don't send events all the way via the mock HTTP backend: we're not
trying to test that here. This meant we weren't actually getting
into the right state because the request to send the invite never
actually returned. Now this works, we need to clear the invite timer
otherwise jest has a timer hanging around at the end of the test
(plus we should be doing it anyway).

spec/unit/webrtc/call.spec.ts

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import {TestClient} from '../../TestClient';
-import {MatrixCall} from '../../../src/webrtc/call';
+import {MatrixCall, CallErrorCode} from '../../../src/webrtc/call';
 
 const DUMMY_SDP = (
     "v=0\r\n" +
@@ -78,6 +78,7 @@ class MockRTCPeerConnection {
     setLocalDescription() {
         return Promise.resolve();
     }
+    close() {}
 }
 
 describe('Call', function() {
@@ -118,6 +119,9 @@ describe('Call', function() {
         global.document = {};
 
         client = new TestClient("@alice:foo", "somedevice", "token", undefined, {});
+        // We just stub out sendEvent: we're not interested in testing the client's
+        // event sending code here
+        client.client.sendEvent = () => {};
         call = new MatrixCall({
             client: client.client,
             roomId: '!foo:bar',
@@ -135,12 +139,16 @@ describe('Call', function() {
 
     it('should ignore candidate events from non-matching party ID', async function() {
         await call.placeVoiceCall();
-        await call.receivedAnswer({
+        await call.onAnswerReceived({
-            version: 0,
+            getContent: () => {
-            call_id: call.callId,
+                return {
-            party_id: 'the_correct_party_id',
+                    version: 0,
-            answer: {
+                    call_id: call.callId,
-                sdp: DUMMY_SDP,
+                    party_id: 'the_correct_party_id',
+                    answer: {
+                        sdp: DUMMY_SDP,
+                    },
+                };
             },
         });
 
@@ -178,5 +186,8 @@ describe('Call', function() {
             },
         });
         expect(call.peerConn.addIceCandidate.mock.calls.length).toBe(1);
+
+        // Hangup to stop timers
+        call.hangup(CallErrorCode.UserHangup, true);
     });
 });

src/webrtc/call.ts

@@ -236,6 +236,7 @@ export class MatrixCall extends EventEmitter {
     // The party ID of the other side: undefined if we haven't chosen a partner
     // yet, null if we have but they didn't send a party ID.
     private opponentPartyId: string;
+    private inviteTimeout;
 
     constructor(opts: CallOpts) {
         super();
@@ -941,7 +942,8 @@ export class MatrixCall extends EventEmitter {
         try {
             await this.sendVoipEvent(EventType.CallInvite, content);
             this.setState(CallState.InviteSent);
-            setTimeout(() => {
+            this.inviteTimeout = setTimeout(() => {
+                this.inviteTimeout = null;
                 if (this.state === CallState.InviteSent) {
                     this.hangup(CallErrorCode.InviteTimeout, false);
                 }
@@ -1165,6 +1167,11 @@ export class MatrixCall extends EventEmitter {
     private terminate(hangupParty: CallParty, hangupReason: CallErrorCode, shouldEmit: boolean) {
         if (this.state === CallState.Ended) return;
 
+        if (this.inviteTimeout) {
+            clearTimeout(this.inviteTimeout);
+            this.inviteTimeout = null;
+        }
+
         const remoteVid = this.getRemoteVideoElement();
         const remoteAud = this.getRemoteAudioElement();
         const localVid = this.getLocalVideoElement();