fixup: use gkalpak's fix, streamline tests

Author: Narretz

src/ngMessages/messages.js

@@ -451,6 +451,7 @@ angular.module('ngMessages', [])
          function findPreviousMessage(parent, comment) {
            var prevNode = comment;
            var parentLookup = [];
+
            while (prevNode && prevNode !== parent) {
              var prevKey = prevNode.$$ngMessageNode;
              if (prevKey && prevKey.length) {
@@ -459,14 +460,14 @@ angular.module('ngMessages', [])
 
              // dive deeper into the DOM and examine its children for any ngMessage
              // comments that may be in an element that appears deeper in the list
-             if (prevNode.childNodes.length &&
-                prevNode !== comment.parentNode &&
-                parentLookup.indexOf(prevNode) == -1
-              ) {
+             if (prevNode.childNodes.length && parentLookup.indexOf(prevNode) == -1) {
                parentLookup.push(prevNode);
                prevNode = prevNode.childNodes[prevNode.childNodes.length - 1];
+             } else if (prevNode.previousSibling) {
+               prevNode = prevNode.previousSibling;
              } else {
-               prevNode = prevNode.previousSibling || prevNode.parentNode;
+               prevNode = prevNode.parentNode;
+               parentLookup.push(prevNode);
              }
            }
          }

test/ngMessages/messagesSpec.js

@@ -430,20 +430,20 @@ describe('ngMessages', function() {
     inject(function($rootScope, $compile) {
 
       element = $compile('<div><div ng-if="show"><div message-wrap col="col">' +
-                         '        <div ng-message="required">Fill in the text field.</div>' +
-                         '        <div ng-message="extra">Extra error message.</div>' +
+                         '        <div ng-message="a">A</div>' +
+                         '        <div ng-message="b">B</div>' +
                          '</div></div></div>')($rootScope);
 
       $rootScope.$apply(function() {
         $rootScope.show = true;
         $rootScope.col = {
-          required: true,
-          extra: true
+          a: true,
+          b: true
         };
       });
 
       expect(messageChildren(element).length).toBe(1);
-      expect(trim(element.text())).toEqual('Fill in the text field.');
+      expect(trim(element.text())).toEqual('A');
 
       $rootScope.$apply('show = false');
 
@@ -453,91 +453,70 @@ describe('ngMessages', function() {
 
 
   it('should not crash when the first of two nested messages is removed', function() {
-
-    module(function($compileProvider) {
-      $compileProvider.directive('removeMe', function() {
-        return {
-          link: function(scope, element) {
-            scope.$watch('hide', function(newVal) {
-              if (newVal === true) element.remove();
-            });
-          }
-        };
-      });
-    });
-
     inject(function($rootScope, $compile) {
 
       element = $compile(
         '<div ng-messages="col">' +
           '<div class="wrapper">' +
-            '<div remove-me ng-message="required">Fill in the text field.</div>' +
-            '<div ng-message="extra">Extra error message.</div>' +
+            '<div ng-message="a">A</div>' +
+            '<div ng-message="b">B</div>' +
           '</div>' +
         '</div>'
       )($rootScope);
 
       $rootScope.$apply(function() {
         $rootScope.col = {
-          required: true,
-          extra: false
+          a: true,
+          b: false
         };
       });
 
       expect(messageChildren(element).length).toBe(1);
-      expect(trim(element.text())).toEqual('Fill in the text field.');
+      expect(trim(element.text())).toEqual('A');
 
-      $rootScope.$apply('hide = true');
+      var nodeA = element[0].querySelector('[ng-message="a"]');
+      nodeA.remove();
 
       expect(messageChildren(element).length).toBe(0);
     });
   });
 
 
-  xit('should not crash when a deeply nested messages is removed', function() {
-
-    module(function($compileProvider) {
-      $compileProvider.directive('removeMe', function() {
-        return {
-          link: function(scope, element) {
-            scope.$watch('hide', function(newVal) {
-              if (newVal === true) element.remove();
-            });
-          }
-        };
-      });
-    });
-
+  it('should show deeply nested messages correctly after a message has been removed', function() {
     inject(function($rootScope, $compile) {
 
       element = $compile(
-        '<div ng-messages="col">' +
+        '<div ng-messages="col" ng-messages-multiple>' +
           '<div class="another-wrapper">' +
+            '<div ng-message="a">A</div>' +
             '<div class="wrapper">' +
-              '<div remove-me ng-message="required">Fill in the text field.</div>' +
-              '<div ng-message="extra">Extra error message.</div>' +
+              '<div ng-message="b">B</div>' +
+              '<div ng-message="c">C</div>' +
             '</div>' +
-            '<div ng-message="different">Different error message.</div>' +
+            '<div ng-message="d">D</div>' +
           '</div>' +
         '</div>'
       )($rootScope);
 
       $rootScope.$apply(function() {
         $rootScope.col = {
-          required: true,
-          extra: false
+          a: true,
+          b: true
         };
       });
 
-      expect(messageChildren(element).length).toBe(1);
-      expect(trim(element.text())).toEqual('Fill in the text field.');
+      expect(messageChildren(element).length).toBe(2);
+      expect(trim(element.text())).toEqual('AB');
 
-      $rootScope.$apply('hide = true');
+      var nodeB = element[0].querySelector('[ng-message="b"]');
+      nodeB.remove();
 
-      expect(messageChildren(element).length).toBe(0);
+      expect(messageChildren(element).length).toBe(1);
+      expect(trim(element.text())).toEqual('A');
     });
   });
 
+
   // issue #12856
   it('should only detach the message object that is associated with the message node being removed',
     inject(function($rootScope, $compile, $animate) {