X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=6b2c3fe33f43eb1107f75bbd8ca7f46c3c2888ab;hb=24e036c7c88e7e3a1f878292e4b59914e1f4575c;hp=7ba7eb5da712627e1d4ba74d037d793acd8261ef;hpb=ffbedf0262b3eea906f39c0115b818d7456a3994;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index 7ba7eb5..6b2c3fe 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -152,7 +152,7 @@ test("isFunction", function() {
 var foo = false;
 
 test("$('html')", function() {
-	expect(5);
+	expect(6);
 
 	reset();
 	foo = false;
@@ -169,6 +169,8 @@ test("$('html')", function() {
 
 	var j = $("<span>hi</span> there <!-- mon ami -->");
 	ok( j.length >= 2, "Check node,textnode,comment creation (some browsers delete comments)" );
+
+	ok( !$("<option>test</option>")[0].selected, "Make sure that options are auto-selected #2050" );
 });
 
 test("$('html', context)", function() {
@@ -418,7 +420,7 @@ test("css(String|Hash)", function() {
 });
 
 test("css(String, Object)", function() {
-	expect(20);
+	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');
@@ -452,6 +454,10 @@ test("css(String, Object)", function() {
 	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 () {
@@ -864,7 +870,7 @@ test("find(String)", function() {
 });
 
 test("clone()", function() {
-	expect(4);
+	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' );
@@ -872,6 +878,16 @@ test("clone()", function() {
 	// 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() {
@@ -1022,7 +1038,8 @@ test("html(String)", function() {
 
 	$("#main").html('foo <form><script type="text/javascript">ok( true, "$().html().evalScripts() Evals Scripts Twice in Firefox, see #975" );</script></form>');
 
-	$("#main").html("<script>ok(scriptorder++ == 0, 'Script is executed in order');ok($('#scriptorder').length == 0,'Execute before html')<\/script><span id='scriptorder'><script>ok(scriptorder++ == 1, 'Script is executed in order');ok($('#scriptorder').length == 1,'Execute after html')<\/script></span><script>ok(scriptorder++ == 2, 'Script is executed in order');ok($('#scriptorder').length == 1,'Execute after html')<\/script>");
+	// it was decided that waiting to execute ALL scripts makes sense since nested ones have to wait anyway so this test case is changed, see #1959
+	$("#main").html("<script>ok(scriptorder++ == 0, 'Script is executed in order');ok($('#scriptorder').length == 1,'Execute after html (even though appears before)')<\/script><span id='scriptorder'><script>ok(scriptorder++ == 1, 'Script (nested) is executed in order');ok($('#scriptorder').length == 1,'Execute after html')<\/script></span><script>ok(scriptorder++ == 2, 'Script (unnested) is executed in order');ok($('#scriptorder').length == 1,'Execute after html')<\/script>");
 
 	setTimeout( start, 100 );
 });
@@ -1041,10 +1058,17 @@ test("filter()", function() {
 });
 
 test("not()", function() {
-	expect(3);
+	expect(8);
 	ok( $("#main > p#ap > a").not("#google").length == 2, "not('selector')" );
+	ok( $("#main > p#ap > a").not(document.getElementById("google")).length == 2, "not(DOMElement)" );
+	isSet( $("p").not(".result").get(), q("firstp", "ap", "sndp", "en", "sap", "first"), "not('.class')" );
 	isSet( $("p").not("#ap, #sndp, .result").get(), q("firstp", "en", "sap", "first"), "not('selector, selector')" );
 	isSet( $("p").not($("#ap, #sndp, .result")).get(), q("firstp", "en", "sap", "first"), "not(jQuery)" );
+	ok( $("p").not(document.getElementsByTagName("p")).length == 0, "not(Array-like DOM collection)" );
+	isSet( $("#form option").not("option.emptyopt:contains('Nothing'),[selected],[value='1']").get(), q("option1c", "option1d", "option2c", "option3d" ), "not('complex selector')");
+	
+	var selects = $("#form select");
+	isSet( selects.not( selects[1] ), q("select1", "select3"), "filter out DOM element");
 });
 
 test("andSelf()", function() {
@@ -1106,12 +1130,35 @@ test("prev([String])", function() {
 });
 
 test("show()", function() {
-	expect(1);
+	expect(15);
 	var pass = true, div = $("div");
 	div.show().each(function(){
 		if ( this.style.display == "none" ) pass = false;
 	});
 	ok( pass, "Show" );
+	
+	$("#main").append('<div id="show-tests"><div><p><a href="#"></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div>');
+	var test = {
+		"div"      : "block",
+		"p"        : "block",
+		"a"        : "inline",
+		"code"     : "inline",
+		"pre"      : "block",
+		"span"     : "inline",
+		"table"    : $.browser.msie ? "block" : "table",
+		"thead"    : $.browser.msie ? "block" : "table-header-group",
+		"tbody"    : $.browser.msie ? "block" : "table-row-group",
+		"tr"       : $.browser.msie ? "block" : "table-row",
+		"th"       : $.browser.msie ? "block" : "table-cell",
+		"td"       : $.browser.msie ? "block" : "table-cell",
+		"ul"       : "block",
+		"li"       : $.browser.msie ? "block" : "list-item"
+	};
+	
+	$.each(test, function(selector, expected) {
+		var elem = $(selector, "#show-tests").show();
+		equals( elem.css("display"), expected, "Show using correct display type for " + selector );
+	});
 });
 
 test("addClass(String)", function() {
@@ -1224,6 +1271,24 @@ test("$.className", function() {
 	ok( c.has(x, "bar"), "Check has2" );
 });
 
+test("$.data", function() {
+	expect(3);
+	var div = $("#foo")[0];
+	ok( jQuery.data(div, "test") == undefined, "Check for no data exists" );
+	jQuery.data(div, "test", "success");
+	ok( jQuery.data(div, "test") == "success", "Check for added data" );
+	jQuery.data(div, "test", "overwritten");
+	ok( jQuery.data(div, "test") == "overwritten", "Check for overwritten data" );
+});
+
+test("$.removeData", function() {
+	expect(1);
+	var div = $("#foo")[0];
+	jQuery.data(div, "test", "testing");
+	jQuery.removeData(div, "test");
+	ok( jQuery.data(div, "test") == undefined, "Check removal of data" );
+});
+
 test("remove()", function() {
 	expect(6);
 	$("#ap").children().remove();