Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 86b33eb

Browse files
committed
test(sortedHtml): fix comment support in sortedHtml helper
1 parent 202087f commit 86b33eb

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

test/BinderSpec.js

+12-10
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ describe('Binder', function() {
9494
$rootScope.$apply();
9595
expect(sortedHtml(form)).toBe(
9696
'<ul>' +
97-
'<#comment></#comment>' +
97+
'<!-- ngRepeat: item in model.items -->' +
9898
'<li ng-bind="item.a" ng-repeat="item in model.items">A</li>' +
9999
'<li ng-bind="item.a" ng-repeat="item in model.items">B</li>' +
100100
'</ul>');
@@ -103,7 +103,7 @@ describe('Binder', function() {
103103
$rootScope.$apply();
104104
expect(sortedHtml(form)).toBe(
105105
'<ul>' +
106-
'<#comment></#comment>' +
106+
'<!-- ngRepeat: item in model.items -->' +
107107
'<li ng-bind="item.a" ng-repeat="item in model.items">C</li>' +
108108
'<li ng-bind="item.a" ng-repeat="item in model.items">A</li>' +
109109
'<li ng-bind="item.a" ng-repeat="item in model.items">B</li>' +
@@ -113,7 +113,7 @@ describe('Binder', function() {
113113
$rootScope.$apply();
114114
expect(sortedHtml(form)).toBe(
115115
'<ul>' +
116-
'<#comment></#comment>' +
116+
'<!-- ngRepeat: item in model.items -->' +
117117
'<li ng-bind="item.a" ng-repeat="item in model.items">A</li>' +
118118
'<li ng-bind="item.a" ng-repeat="item in model.items">B</li>' +
119119
'</ul>');
@@ -132,7 +132,7 @@ describe('Binder', function() {
132132
$rootScope.$apply();
133133
expect(sortedHtml(element)).toBe(
134134
'<ul>' +
135-
'<#comment></#comment>' +
135+
'<!-- ngRepeat: item in model.items -->' +
136136
'<li ng-repeat="item in model.items"><span ng-bind="item.a">A</span></li>' +
137137
'</ul>');
138138
}));
@@ -219,14 +219,14 @@ describe('Binder', function() {
219219

220220
expect(sortedHtml(element)).toBe(
221221
'<div>'+
222-
'<#comment></#comment>'+
222+
'<!-- ngRepeat: m in model -->' +
223223
'<div name="a" ng-repeat="m in model">'+
224-
'<#comment></#comment>'+
224+
'<!-- ngRepeat: i in m.item -->' +
225225
'<ul name="a1" ng-repeat="i in m.item"></ul>'+
226226
'<ul name="a2" ng-repeat="i in m.item"></ul>'+
227227
'</div>'+
228228
'<div name="b" ng-repeat="m in model">'+
229-
'<#comment></#comment>'+
229+
'<!-- ngRepeat: i in m.item -->' +
230230
'<ul name="b1" ng-repeat="i in m.item"></ul>'+
231231
'<ul name="b2" ng-repeat="i in m.item"></ul>'+
232232
'</div>' +
@@ -311,9 +311,11 @@ describe('Binder', function() {
311311
expect(d1.hasClass('o')).toBeTruthy();
312312
expect(d2.hasClass('e')).toBeTruthy();
313313
expect(sortedHtml(element)).toBe(
314-
'<div><#comment></#comment>' +
314+
'<div>' +
315+
'<!-- ngRepeat: i in [0,1] -->' +
315316
'<div class="o" ng-class-even="\'e\'" ng-class-odd="\'o\'" ng-repeat="i in [0,1]"></div>' +
316-
'<div class="e" ng-class-even="\'e\'" ng-class-odd="\'o\'" ng-repeat="i in [0,1]"></div></div>');
317+
'<div class="e" ng-class-even="\'e\'" ng-class-odd="\'o\'" ng-repeat="i in [0,1]"></div>' +
318+
'</div>');
317319
}));
318320

319321
it('BindStyle', inject(function($rootScope, $compile) {
@@ -416,7 +418,7 @@ describe('Binder', function() {
416418
$rootScope.$apply();
417419
expect(sortedHtml(element)).toBe(
418420
'<ul>' +
419-
'<#comment></#comment>' +
421+
'<!-- ngRepeat: (k,v) in {a:0,b:1} -->' +
420422
'<li ng-bind=\"k + v\" ng-repeat="(k,v) in {a:0,b:1}">a0</li>' +
421423
'<li ng-bind=\"k + v\" ng-repeat="(k,v) in {a:0,b:1}">b1</li>' +
422424
'</ul>');

test/testabilityPatch.js

+3
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,14 @@ function dealoc(obj) {
120120
function sortedHtml(element, showNgClass) {
121121
var html = "";
122122
forEach(jqLite(element), function toString(node) {
123+
123124
if (node.nodeName == "#text") {
124125
html += node.nodeValue.
125126
replace(/&(\w+[&;\W])?/g, function(match, entity){return entity?match:'&amp;';}).
126127
replace(/</g, '&lt;').
127128
replace(/>/g, '&gt;');
129+
} else if (node.nodeName == "#comment") {
130+
html += '<!--' + node.nodeValue + '-->';
128131
} else {
129132
html += '<' + (node.nodeName || '?NOT_A_NODE?').toLowerCase();
130133
var attributes = node.attributes || [];

0 commit comments

Comments
 (0)