fix($rootScope): TTL exception does not clear $$phase

When $digest() throws infinite digest exception it
does not properly clear the $phase leaving the scope
in an inconsistent state.

Closes #979

1 files changed, 23 insertions, 0 deletions

diff --git a/test/ng/rootScopeSpec.js b/test/ng/rootScopeSpec.js
index 9d343b08..934541c1 100644
--- a/test/ng/rootScopeSpec.js
+++ b/test/ng/rootScopeSpec.js
@@ -210,6 +210,8 @@ describe('Scope', function() {
             '["a; newVal: 98; oldVal: 97","b; newVal: 99; oldVal: 98"],' +
             '["a; newVal: 99; oldVal: 98","b; newVal: 100; oldVal: 99"],' +
             '["a; newVal: 100; oldVal: 99","b; newVal: 101; oldVal: 100"]]');
+
+        expect($rootScope.$$phase).toBeNull();
       });
     });
 
@@ -492,6 +494,27 @@ describe('Scope', function() {
     });
 
 
+    it('should log exceptions from $digest', function() {
+      module(function($rootScopeProvider, $exceptionHandlerProvider) {
+        $rootScopeProvider.digestTtl(2);
+        $exceptionHandlerProvider.mode('log');
+      });
+      inject(function($rootScope, $exceptionHandler) {
+        $rootScope.$watch('a', function() {$rootScope.b++;});
+        $rootScope.$watch('b', function() {$rootScope.a++;});
+        $rootScope.a = $rootScope.b = 0;
+
+        expect(function() {
+          $rootScope.$apply();
+        }).toThrow();
+
+        expect($exceptionHandler.errors[0]).toBeDefined();
+
+        expect($rootScope.$$phase).toBeNull();
+      });
+    });
+
+
     describe('exceptions', function() {
       var log;
       beforeEach(module(function($exceptionHandlerProvider) {