diff options
| author | Igor Minar | 2012-12-04 18:24:15 +0100 | 
|---|---|---|
| committer | Igor Minar | 2013-05-09 05:23:39 -0700 | 
| commit | 9039ddbb568bdbd46cfbee2729b6f781ac413041 (patch) | |
| tree | 3e848867e6bde818e3a70c2d19563f78f80c94a9 /test | |
| parent | 8f8510fc22fe434a55d3cc3ef78bc168f1a8b606 (diff) | |
| download | angular.js-9039ddbb568bdbd46cfbee2729b6f781ac413041.tar.bz2 | |
test(sortedHtml): fix comment support in sortedHtml helper
Diffstat (limited to 'test')
| -rw-r--r-- | test/BinderSpec.js | 22 | ||||
| -rw-r--r-- | test/testabilityPatch.js | 3 | 
2 files changed, 15 insertions, 10 deletions
diff --git a/test/BinderSpec.js b/test/BinderSpec.js index 6d5dd91e..173be019 100644 --- a/test/BinderSpec.js +++ b/test/BinderSpec.js @@ -94,7 +94,7 @@ describe('Binder', function() {      $rootScope.$apply();      expect(sortedHtml(form)).toBe(          '<ul>' + -          '<#comment></#comment>' + +          '<!-- ngRepeat: item in model.items -->' +            '<li ng-bind="item.a" ng-repeat="item in model.items">A</li>' +            '<li ng-bind="item.a" ng-repeat="item in model.items">B</li>' +          '</ul>'); @@ -103,7 +103,7 @@ describe('Binder', function() {      $rootScope.$apply();      expect(sortedHtml(form)).toBe(          '<ul>' + -          '<#comment></#comment>' + +          '<!-- ngRepeat: item in model.items -->' +            '<li ng-bind="item.a" ng-repeat="item in model.items">C</li>' +            '<li ng-bind="item.a" ng-repeat="item in model.items">A</li>' +            '<li ng-bind="item.a" ng-repeat="item in model.items">B</li>' + @@ -113,7 +113,7 @@ describe('Binder', function() {      $rootScope.$apply();      expect(sortedHtml(form)).toBe(          '<ul>' + -          '<#comment></#comment>' + +          '<!-- ngRepeat: item in model.items -->' +            '<li ng-bind="item.a" ng-repeat="item in model.items">A</li>' +            '<li ng-bind="item.a" ng-repeat="item in model.items">B</li>' +          '</ul>'); @@ -132,7 +132,7 @@ describe('Binder', function() {      $rootScope.$apply();      expect(sortedHtml(element)).toBe(          '<ul>' + -          '<#comment></#comment>' + +          '<!-- ngRepeat: item in model.items -->' +            '<li ng-repeat="item in model.items"><span ng-bind="item.a">A</span></li>' +          '</ul>');    })); @@ -219,14 +219,14 @@ describe('Binder', function() {      expect(sortedHtml(element)).toBe(          '<div>'+ -          '<#comment></#comment>'+ +          '<!-- ngRepeat: m in model -->' +            '<div name="a" ng-repeat="m in model">'+ -            '<#comment></#comment>'+ +            '<!-- ngRepeat: i in m.item -->' +              '<ul name="a1" ng-repeat="i in m.item"></ul>'+              '<ul name="a2" ng-repeat="i in m.item"></ul>'+            '</div>'+            '<div name="b" ng-repeat="m in model">'+ -            '<#comment></#comment>'+ +            '<!-- ngRepeat: i in m.item -->' +              '<ul name="b1" ng-repeat="i in m.item"></ul>'+              '<ul name="b2" ng-repeat="i in m.item"></ul>'+            '</div>' + @@ -311,9 +311,11 @@ describe('Binder', function() {      expect(d1.hasClass('o')).toBeTruthy();      expect(d2.hasClass('e')).toBeTruthy();      expect(sortedHtml(element)).toBe( -        '<div><#comment></#comment>' + +       '<div>' + +        '<!-- ngRepeat: i in [0,1] -->' +          '<div class="o" ng-class-even="\'e\'" ng-class-odd="\'o\'" ng-repeat="i in [0,1]"></div>' + -        '<div class="e" ng-class-even="\'e\'" ng-class-odd="\'o\'" ng-repeat="i in [0,1]"></div></div>'); +        '<div class="e" ng-class-even="\'e\'" ng-class-odd="\'o\'" ng-repeat="i in [0,1]"></div>' + +        '</div>');    }));    it('BindStyle', inject(function($rootScope, $compile) { @@ -416,7 +418,7 @@ describe('Binder', function() {      $rootScope.$apply();      expect(sortedHtml(element)).toBe(          '<ul>' + -          '<#comment></#comment>' + +          '<!-- ngRepeat: (k,v) in {a:0,b:1} -->' +            '<li ng-bind=\"k + v\" ng-repeat="(k,v) in {a:0,b:1}">a0</li>' +            '<li ng-bind=\"k + v\" ng-repeat="(k,v) in {a:0,b:1}">b1</li>' +          '</ul>'); diff --git a/test/testabilityPatch.js b/test/testabilityPatch.js index cef00993..dd0f4f97 100644 --- a/test/testabilityPatch.js +++ b/test/testabilityPatch.js @@ -91,11 +91,14 @@ function dealoc(obj) {  function sortedHtml(element, showNgClass) {    var html = "";    forEach(jqLite(element), function toString(node) { +      if (node.nodeName == "#text") {        html += node.nodeValue.          replace(/&(\w+[&;\W])?/g, function(match, entity){return entity?match:'&';}).          replace(/</g, '<').          replace(/>/g, '>'); +    } else if (node.nodeName == "#comment") { +      html += '<!--' + node.nodeValue + '-->';      } else {        html += '<' + (node.nodeName || '?NOT_A_NODE?').toLowerCase();        var attributes = node.attributes || [];  | 
