Completing SkyModalInstance.closed upon close

src/modules/modal/modal-instance.spec.ts

@@ -14,28 +14,53 @@ describe('Modal instance', () => {
   });
 
   it('should allow users to subscribe to the instanceClose event', function () {
-    let instance = new SkyModalInstance();
+    let instance: SkyModalInstance;
     let expectedResult: SkyModalCloseArgs;
 
-    instance.closed.subscribe((result: SkyModalCloseArgs) => {
-      expectedResult = result;
-    });
-
+    instance = subscribeToClosed();
     instance.cancel('My result');
 
     expect(expectedResult.data).toBe('My result');
     expect(expectedResult.reason).toBe('cancel');
 
+    instance = subscribeToClosed();
     instance.save('My data');
     expect(expectedResult.data).toBe('My data');
     expect(expectedResult.reason).toBe('save');
 
+    instance = subscribeToClosed();
     instance.close('My close', 'reason');
     expect(expectedResult.data).toBe('My close');
     expect(expectedResult.reason).toBe('reason');
 
+    instance = subscribeToClosed();
     instance.close('close data');
     expect(expectedResult.data).toBe('close data');
     expect(expectedResult.reason).toBe('close');
+
+    function subscribeToClosed() {
+      const modalInstance = new SkyModalInstance();
+
+      modalInstance.closed.subscribe((result: SkyModalCloseArgs) => {
+        expectedResult = result;
+      });
+
+      return modalInstance;
+    }
+  });
+
+  it('should only emit closed and complete', () => {
+    const instance = new SkyModalInstance();
+    let wasClosedEmitted = false;
+    let wasClosedCompleted = false;
+
+    instance.closed.subscribe({
+      next: () => wasClosedEmitted = true,
+      complete: () => wasClosedCompleted = true
+    });
+
+    instance.close();
+    expect(wasClosedEmitted).toBe(true);
+    expect(wasClosedCompleted).toBe(true);
   });
 });

src/modules/modal/modal-instance.ts

@@ -39,6 +39,7 @@ export class SkyModalInstance {
     args.data = result;
 
     this.closed.emit(args);
+    this.closed.complete();
   }
 
 }