Merge branch 'master' into bug/reconnect-callbacks

aws · Jan 2, 2020 · af7bb4d · af7bb4d
2 parents 04695c4 + 9f1ea6f
commit af7bb4d
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/src/screenviewing/DefaultScreenViewing.ts b/src/screenviewing/DefaultScreenViewing.ts
@@ -29,7 +29,11 @@ export default class DefaultScreenViewing implements ScreenViewing {
    * Stops screen viewing and closes the screen signaling connection
    */
   close(): Promise<void> {
-    return this.stop().then(() => this.componentContext.signalingSession.close());
+    return this.stop()
+      .catch(() => {})
+      .finally(() => {
+        return this.componentContext.signalingSession.close();
+      });
   }
 
   /**

diff --git a/test/screenviewing/DefaultScreenViewing.test.ts b/test/screenviewing/DefaultScreenViewing.test.ts
@@ -29,6 +29,30 @@ describe('DefaultScreenViewing', () => {
   });
 
   describe('close', () => {
+    describe('with error', () => {
+      it('is closed', () => {
+        return new DefaultScreenViewing({
+          ...Substitute.for(),
+          viewer: {
+            ...Substitute.for(),
+            stop(): void {},
+          },
+          signalingSession: {
+            ...Substitute.for(),
+            close(): Promise<void> {
+              return Promise.resolve();
+            },
+          },
+          viewingSession: {
+            ...Substitute.for(),
+            closeConnection(): Promise<void> {
+              return Promise.reject(new Error('bummers'));
+            },
+          },
+        }).close();
+      });
+    });
+
     it('calls viewer close', () => {
       return new DefaultScreenViewing({
         ...Substitute.for(),