fix($dialog): fix $apply in progres on $location change

src/dialog/dialog.js

@@ -96,7 +96,6 @@ dialogModule.provider("$dialog", function(){
 
  this.handleLocationChange = function() {
  self.close();
- self.$scope.$apply();
  };
  }
 

src/dialog/test/dialog.spec.js

@@ -60,10 +60,6 @@ describe('Given ui.bootstrap.dialog', function(){
  provider.options({});
  };
 
- var changeLocation = function() {
- $rootScope.$broadcast('$locationChangeSuccess');
- $rootScope.$apply();
- };
 
  var dialogShouldBeClosed = function(){
  it('should not include a backdrop in the DOM', function(){
@@ -75,7 +71,7 @@ describe('Given ui.bootstrap.dialog', function(){
  });
 
  it('should return false for isOpen()', function(){
- expect(dialog.isOpen()).toBe(false);
+ expect(dialog.isOpen()).toBeFalsy();
  });
  };
 
@@ -292,16 +288,23 @@ describe('Given ui.bootstrap.dialog', function(){
  expect($document.find('body > div.modal > div.modal-header').length).toBe(1);
  });
  });
-
- describe('When dialog is open and location changes', function(){
- beforeEach(function(){
- createDialog({template:template});
- openDialog();
- changeLocation();
- });
 
- dialogShouldBeClosed();
- });
+ describe('When dialog is open and location changes', function () {
+
+ var changeLocation = function () {
+ $rootScope.$apply(function(){
+ $rootScope.$broadcast('$locationChangeSuccess');
+ });
+ };
+
+ beforeEach(function () {
+ createDialog({template: template});
+ openDialog();
+ changeLocation();
+ });
+
+ dialogShouldBeClosed();
+ });
 
  describe('when opening it with a template containing white-space', function(){
 

src/modal/test/modal.spec.js

@@ -170,10 +170,11 @@ describe('Give ui.boostrap.modal', function() {
  expect($scope.modalShown).not.toBeTruthy();
  });
 
- it('should update the model if the location change is successful', function() {
- $rootScope.$broadcast('$locationChangeSuccess');
- $scope.$digest();
- expect($scope.modalShown).not.toBeTruthy();
- });
+ it('should update the model if the location change is successful', function () {
+ $rootScope.$apply(function(){
+ $rootScope.$broadcast('$locationChangeSuccess');
+ });
+ expect($scope.modalShown).toBeFalsy();
+ });
  }); 
 });