X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=6b2c3fe33f43eb1107f75bbd8ca7f46c3c2888ab;hb=24e036c7c88e7e3a1f878292e4b59914e1f4575c;hp=bc1def38928c2509a109e9d1a218245db0f19e7f;hpb=d44e9451f789db40e7cb370717258c00dff10edd;p=jquery.git
diff --git a/test/unit/core.js b/test/unit/core.js
index bc1def3..6b2c3fe 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -141,18 +141,18 @@ test("isFunction", function() {
ok( jQuery.isFunction(fn), "Recursive Function Call" );
- fn({ some: "data" });
+ fn({ some: "data" });
};
callme(function(){
- callme(function(){});
+ callme(function(){});
});
});
var foo = false;
test("$('html')", function() {
- expect(4);
+ expect(6);
reset();
foo = false;
@@ -166,6 +166,11 @@ test("$('html')", function() {
ok( $("")[0], "Creating a link" );
reset();
+
+ var j = $("hi there ");
+ ok( j.length >= 2, "Check node,textnode,comment creation (some browsers delete comments)" );
+
+ ok( !$("")[0].selected, "Make sure that options are auto-selected #2050" );
});
test("$('html', context)", function() {
@@ -232,7 +237,7 @@ test("each(Function)", function() {
div.each(function(){this.foo = 'zoo';});
var pass = true;
for ( var i = 0; i < div.size(); i++ ) {
- if ( div.get(i).foo != "zoo" ) pass = false;
+ if ( div.get(i).foo != "zoo" ) pass = false;
}
ok( pass, "Execute a function, Relative" );
});
@@ -277,15 +282,15 @@ test("attr(String)", function() {
});
if ( !isLocal ) {
- test("attr(String) in XML Files", function() {
- expect(2);
- stop();
- $.get("data/dashboard.xml", function(xml) {
- ok( $("locations", xml).attr("class") == "foo", "Check class attribute in XML document" );
- ok( $("location", xml).attr("for") == "bar", "Check for attribute in XML document" );
- start();
- });
- });
+ test("attr(String) in XML Files", function() {
+ expect(2);
+ stop();
+ $.get("data/dashboard.xml", function(xml) {
+ ok( $("locations", xml).attr("class") == "foo", "Check class attribute in XML document" );
+ ok( $("location", xml).attr("for") == "bar", "Check for attribute in XML document" );
+ start();
+ });
+ });
}
test("attr(String, Function)", function() {
@@ -298,18 +303,18 @@ test("attr(Hash)", function() {
expect(1);
var pass = true;
$("div").attr({foo: 'baz', zoo: 'ping'}).each(function(){
- if ( this.getAttribute('foo') != "baz" && this.getAttribute('zoo') != "ping" ) pass = false;
+ if ( this.getAttribute('foo') != "baz" && this.getAttribute('zoo') != "ping" ) pass = false;
});
ok( pass, "Set Multiple Attributes" );
});
test("attr(String, Object)", function() {
- expect(16);
+ expect(17);
var div = $("div");
div.attr("foo", "bar");
var pass = true;
for ( var i = 0; i < div.size(); i++ ) {
- if ( div.get(i).getAttribute('foo') != "bar" ) pass = false;
+ if ( div.get(i).getAttribute('foo') != "bar" ) pass = false;
}
ok( pass, "Set Attribute" );
@@ -338,6 +343,13 @@ test("attr(String, Object)", function() {
$("#name").attr('someAttr', 1);
equals( $("#name").attr('someAttr'), 1, 'Set attribute to the number 1' );
+ // using contents will get comments regular, text, and comment nodes
+ var j = $("#nonnodes").contents();
+
+ j.attr("name", "attrvalue");
+ equals( j.attr("name"), "attrvalue", "Check node,textnode,comment for attr" );
+ j.removeAttr("name")
+
reset();
var type = $("#check2").attr('type');
@@ -362,19 +374,19 @@ test("attr(String, Object)", function() {
});
if ( !isLocal ) {
- test("attr(String, Object) - Loaded via XML document", function() {
- expect(2);
- stop();
- $.get('data/dashboard.xml', function(xml) {
- var titles = [];
- $('tab', xml).each(function() {
- titles.push($(this).attr('title'));
- });
- equals( titles[0], 'Location', 'attr() in XML context: Check first title' );
- equals( titles[1], 'Users', 'attr() in XML context: Check second title' );
- start();
- });
- });
+ test("attr(String, Object) - Loaded via XML document", function() {
+ expect(2);
+ stop();
+ $.get('data/dashboard.xml', function(xml) {
+ var titles = [];
+ $('tab', xml).each(function() {
+ titles.push($(this).attr('title'));
+ });
+ equals( titles[0], 'Location', 'attr() in XML context: Check first title' );
+ equals( titles[1], 'Users', 'attr() in XML context: Check second title' );
+ start();
+ });
+ });
}
test("css(String|Hash)", function() {
@@ -408,7 +420,7 @@ test("css(String|Hash)", function() {
});
test("css(String, Object)", function() {
- expect(19);
+ expect(21);
ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');
$('#foo').css('display', 'none');
ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
@@ -437,6 +449,15 @@ test("css(String, Object)", function() {
$('#foo').css("filter", "progid:DXImageTransform.Microsoft.Chroma(color='red');");
}
equals( $('#foo').css('opacity'), '1', "Assert opacity is 1 when a different filter is set in IE, #1438" );
+
+ // using contents will get comments regular, text, and comment nodes
+ var j = $("#nonnodes").contents();
+ j.css("padding-left", "1px");
+ equals( j.css("padding-left"), "1px", "Check node,textnode,comment css works" );
+
+ // opera sometimes doesn't update 'display' correctly, see #2037
+ $("#t2037")[0].innerHTML = $("#t2037")[0].innerHTML
+ equals( $("#t2037 .hidden").css("display"), "none", "Make sure browser thinks it is hidden" );
});
test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", function () {
@@ -467,7 +488,7 @@ test("text()", function() {
});
test("wrap(String|Element)", function() {
- expect(6);
+ expect(8);
var defaultText = 'Try them out:'
var result = $('#first').wrap('
').text();
ok( defaultText == result, 'Check for wrapping of on-the-fly html' );
@@ -486,6 +507,12 @@ test("wrap(String|Element)", function() {
$(checkbox).wrap( '' );
ok( checkbox.checked, "Checkbox's state is erased after wrap() action, see #769" );
}).click();
+
+ // using contents will get comments regular, text, and comment nodes
+ var j = $("#nonnodes").contents();
+ j.wrap("");
+ equals( $("#nonnodes > i").length, 3, "Check node,textnode,comment wraps ok" );
+ equals( $("#nonnodes > i").text(), j.text() + j[1].nodeValue, "Check node,textnode,comment wraps doesn't hurt text" );
});
test("wrapAll(String|Element)", function() {
@@ -525,7 +552,7 @@ test("wrapInner(String|Element)", function() {
});
test("append(String|Element|Array<Element>|jQuery)", function() {
- expect(18);
+ expect(21);
var defaultText = 'Try them out:'
var result = $('#first').append('buga');
ok( result.text() == defaultText + 'buga', 'Check if text appending works' );
@@ -561,7 +588,7 @@ test("append(String|Element|Array<Element>|jQuery)", function() {
reset();
$("#sap").append(document.getElementById('form'));
- ok( $("#sap>form").size() == 1, "Check for appending a form" ); // Bug #910
+ ok( $("#sap>form").size() == 1, "Check for appending a form" ); // Bug #910
reset();
var pass = true;
@@ -597,6 +624,15 @@ test("append(String|Element|Array<Element>|jQuery)", function() {
.append('');
t( "Append Select", "#appendSelect1, #appendSelect2", ["appendSelect1", "appendSelect2"] );
+
+ // using contents will get comments regular, text, and comment nodes
+ var j = $("#nonnodes").contents();
+ var d = $("").appendTo("#nonnodes").append(j);
+ equals( $("#nonnodes").length, 1, "Check node,textnode,comment append moved leaving just the div" );
+ ok( d.contents().length >= 2, "Check node,textnode,comment append works" );
+ d.contents().appendTo("#nonnodes");
+ d.remove();
+ ok( $("#nonnodes").contents().length >= 2, "Check node,textnode,comment append cleanup worked" );
});
test("appendTo(String|Element|Array<Element>|jQuery)", function() {
@@ -825,16 +861,33 @@ test("end()", function() {
});
test("find(String)", function() {
- expect(1);
+ expect(2);
ok( 'Yahoo' == $('#foo').find('.blogTest').text(), 'Check for find' );
+
+ // using contents will get comments regular, text, and comment nodes
+ var j = $("#nonnodes").contents();
+ equals( j.find("div").length, 0, "Check node,textnode,comment to find zero divs" );
});
test("clone()", function() {
- expect(3);
+ expect(6);
ok( 'This is a normal link: Yahoo' == $('#en').text(), 'Assert text for #en' );
var clone = $('#yahoo').clone();
ok( 'Try them out:Yahoo' == $('#first').append(clone).text(), 'Check for clone' );
ok( 'This is a normal link: Yahoo' == $('#en').text(), 'Reassert text for #en' );
+ // using contents will get comments regular, text, and comment nodes
+ var cl = $("#nonnodes").contents().clone();
+ ok( cl.length >= 2, "Check node,textnode,comment clone works (some browsers delete comments on clone)" );
+
+ stop();
+ $.get("data/dashboard.xml", function (xml) {
+ var root = $(xml.documentElement).clone();
+ $("tab:first", xml).text("origval");
+ $("tab:first", root).text("cloneval");
+ equals($("tab:first", xml).text(), "origval", "Check original XML node was correctly set");
+ equals($("tab:first", root).text(), "cloneval", "Check cloned XML node was correctly set");
+ start();
+ });
});
test("is(String)", function() {
@@ -873,7 +926,7 @@ test("$.extend(Object, Object)", function() {
expect(17);
var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
- options = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
+ options = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
optionsCopy = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
merged = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "x", xxx: "newstring" },
deep1 = { foo: { bar: true } },
@@ -919,9 +972,9 @@ test("$.extend(Object, Object)", function() {
var defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
- options1 = { xnumber2: 1, xstring2: "x" },
+ options1 = { xnumber2: 1, xstring2: "x" },
options1Copy = { xnumber2: 1, xstring2: "x" },
- options2 = { xstring2: "xx", xxx: "newstringx" },
+ options2 = { xstring2: "xx", xxx: "newstringx" },
options2Copy = { xstring2: "xx", xxx: "newstringx" },
merged2 = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "xx", xxx: "newstringx" };
@@ -941,7 +994,7 @@ test("val()", function() {
});
test("val(String)", function() {
- expect(3);
+ expect(4);
document.getElementById('text1').value = "bla";
ok( $("#text1").val() == "bla", "Check for modified value of input element" );
$("#text1").val('test');
@@ -949,12 +1002,18 @@ test("val(String)", function() {
$("#select1").val("3");
ok( $("#select1").val() == "3", "Check for modified (via val(String)) value of select element" );
+
+ // using contents will get comments regular, text, and comment nodes
+ var j = $("#nonnodes").contents();
+ j.val("asdf");
+ equals( j.val(), "asdf", "Check node,textnode,comment with val()" );
+ j.removeAttr("value");
});
var scriptorder = 0;
test("html(String)", function() {
- expect(10);
+ expect(11);
var div = $("#main > div");
div.html("test");
var pass = true;
@@ -963,6 +1022,12 @@ test("html(String)", function() {
}
ok( pass, "Set HTML" );
+ reset();
+ // using contents will get comments regular, text, and comment nodes
+ var j = $("#nonnodes").contents();
+ j.html("bold");
+ equals( j.html().toLowerCase(), "bold", "Check node,textnode,comment with html()" );
+
$("#main").html("");
$("#main select").html("");
equals( $("#main select").val(), "O2", "Selected option correct" );
@@ -973,24 +1038,37 @@ test("html(String)", function() {
$("#main").html('foo ');
- $("#main").html("