fix(modal): fix modal closed resolution

- Correctly resolve modal closed promise on close or dismissal

Closes #5322
Closes #5326

src/modal/modal.js

@@ -302,7 +302,7 @@ angular.module('ui.bootstrap.modal', ['ui.bootstrap.stackedMap'])
           openedClasses.remove(modalBodyClass, modalInstance);
           appendToElement.toggleClass(modalBodyClass, openedClasses.hasKey(modalBodyClass));
           toggleTopWindowClass(true);
-        });
+        }, modalWindow.closedDeferred);
         checkRemoveBackdrop();
 
         //move focus to specified element if available, or else to body

src/modal/test/modal.spec.js

@@ -480,16 +480,30 @@ describe('$uibModal', function() {
 
     it('should resolve the closed promise when modal is closed', function() {
       var modal = open({template: '<div>Content</div>'});
+      var closed = false;
       close(modal, 'closed ok');
 
-      expect(modal.closed).toBeResolvedWith(undefined);
+      modal.closed.then(function() {
+        closed = true;
+      });
+
+      $rootScope.$digest();
+
+      expect(closed).toBe(true);
     });
 
     it('should resolve the closed promise when modal is dismissed', function() {
       var modal = open({template: '<div>Content</div>'});
+      var closed = false;
       dismiss(modal, 'esc');
 
-      expect(modal.closed).toBeResolvedWith(undefined);
+      modal.closed.then(function() {
+        closed = true;
+      });
+
+      $rootScope.$digest();
+
+      expect(closed).toBe(true);
     });
 
     it('should expose a promise linked to the templateUrl / resolve promises', function() {