Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-04 05:04:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

test(sortedHtml): fix comment support in sortedHtml helper

Browse source
This commit is contained in:
Igor Minar 2012-12-04 18:24:15 +01:00
parent 202087f03d
commit 86b33eb3f1
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
test/BinderSpec.js
View file

@ -94,7 +94,7 @@ describe('Binder', function() {
$rootScope.$apply(); $rootScope.$apply();
expect(sortedHtml(form)).toBe( expect(sortedHtml(form)).toBe(
'<ul>' + '<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">A</li>' +
'<li ng-bind="item.a" ng-repeat="item in model.items">B</li>' + '<li ng-bind="item.a" ng-repeat="item in model.items">B</li>' +
'</ul>'); '</ul>');
@ -103,7 +103,7 @@ describe('Binder', function() {
$rootScope.$apply(); $rootScope.$apply();
expect(sortedHtml(form)).toBe( expect(sortedHtml(form)).toBe(
'<ul>' + '<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">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">A</li>' +
'<li ng-bind="item.a" ng-repeat="item in model.items">B</li>' + '<li ng-bind="item.a" ng-repeat="item in model.items">B</li>' +
@ -113,7 +113,7 @@ describe('Binder', function() {
$rootScope.$apply(); $rootScope.$apply();
expect(sortedHtml(form)).toBe( expect(sortedHtml(form)).toBe(
'<ul>' + '<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">A</li>' +
'<li ng-bind="item.a" ng-repeat="item in model.items">B</li>' + '<li ng-bind="item.a" ng-repeat="item in model.items">B</li>' +
'</ul>'); '</ul>');
@ -132,7 +132,7 @@ describe('Binder', function() {
$rootScope.$apply(); $rootScope.$apply();
expect(sortedHtml(element)).toBe( expect(sortedHtml(element)).toBe(
'<ul>' + '<ul>' +
'<#comment></#comment>' + '<!-- ngRepeat: item in model.items -->' +
'<li ng-repeat="item in model.items"><span ng-bind="item.a">A</span></li>' + '<li ng-repeat="item in model.items"><span ng-bind="item.a">A</span></li>' +
'</ul>'); '</ul>');
})); }));
@ -219,14 +219,14 @@ describe('Binder', function() {
expect(sortedHtml(element)).toBe( expect(sortedHtml(element)).toBe(
'<div>'+ '<div>'+
'<#comment></#comment>'+ '<!-- ngRepeat: m in model -->' +
'<div name="a" ng-repeat="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="a1" ng-repeat="i in m.item"></ul>'+
'<ul name="a2" ng-repeat="i in m.item"></ul>'+ '<ul name="a2" ng-repeat="i in m.item"></ul>'+
'</div>'+ '</div>'+
'<div name="b" ng-repeat="m in model">'+ '<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="b1" ng-repeat="i in m.item"></ul>'+
'<ul name="b2" ng-repeat="i in m.item"></ul>'+ '<ul name="b2" ng-repeat="i in m.item"></ul>'+
'</div>' + '</div>' +
@ -311,9 +311,11 @@ describe('Binder', function() {
expect(d1.hasClass('o')).toBeTruthy(); expect(d1.hasClass('o')).toBeTruthy();
expect(d2.hasClass('e')).toBeTruthy(); expect(d2.hasClass('e')).toBeTruthy();
expect(sortedHtml(element)).toBe( 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="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) { it('BindStyle', inject(function($rootScope, $compile) {
@ -416,7 +418,7 @@ describe('Binder', function() {
$rootScope.$apply(); $rootScope.$apply();
expect(sortedHtml(element)).toBe( expect(sortedHtml(element)).toBe(
'<ul>' + '<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}">a0</li>' +
'<li ng-bind=\"k + v\" ng-repeat="(k,v) in {a:0,b:1}">b1</li>' + '<li ng-bind=\"k + v\" ng-repeat="(k,v) in {a:0,b:1}">b1</li>' +
'</ul>'); '</ul>');

3
test/testabilityPatch.js
View file

@ -120,11 +120,14 @@ function dealoc(obj) {
function sortedHtml(element, showNgClass) { function sortedHtml(element, showNgClass) {
var html = ""; var html = "";
forEach(jqLite(element), function toString(node) { forEach(jqLite(element), function toString(node) {
if (node.nodeName == "#text") { if (node.nodeName == "#text") {
html += node.nodeValue. html += node.nodeValue.
replace(/&(\w+[&;\W])?/g, function(match, entity){return entity?match:'&amp;';}). replace(/&(\w+[&;\W])?/g, function(match, entity){return entity?match:'&amp;';}).
replace(/</g, '&lt;'). replace(/</g, '&lt;').
replace(/>/g, '&gt;'); replace(/>/g, '&gt;');
} else if (node.nodeName == "#comment") {
html += '<!--' + node.nodeValue + '-->';
} else { } else {
html += '<' + (node.nodeName || '?NOT_A_NODE?').toLowerCase(); html += '<' + (node.nodeName || '?NOT_A_NODE?').toLowerCase();
var attributes = node.attributes || []; var attributes = node.attributes || [];