aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorIgor Minar2012-12-04 18:24:15 +0100
committerIgor Minar2013-05-08 07:57:34 -0700
commit86b33eb3f1360a4cefb5ebf522b6649f9c55db55 (patch)
tree08c6f14278eee56439b11b1ab6c4dcb3e9e2846c /test
parent202087f03da20741b8e4b248e53994a6ff1cce3e (diff)
downloadangular.js-86b33eb3f1360a4cefb5ebf522b6649f9c55db55.tar.bz2
test(sortedHtml): fix comment support in sortedHtml helper
Diffstat (limited to 'test')
-rw-r--r--test/BinderSpec.js22
-rw-r--r--test/testabilityPatch.js3
2 files changed, 15 insertions, 10 deletions
diff --git a/test/BinderSpec.js b/test/BinderSpec.js
index ba90539f..b6a7a00d 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 679294ee..732669c5 100644
--- a/test/testabilityPatch.js
+++ b/test/testabilityPatch.js
@@ -120,11 +120,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:'&amp;';}).
replace(/</g, '&lt;').
replace(/>/g, '&gt;');
+ } else if (node.nodeName == "#comment") {
+ html += '<!--' + node.nodeValue + '-->';
} else {
html += '<' + (node.nodeName || '?NOT_A_NODE?').toLowerCase();
var attributes = node.attributes || [];