X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=18f1bb54d798647cc95728f120d4d0737264707d;hb=264ffbc73be61778484a292392d1b18a8976588f;hp=96b5d4079134fff49c4e5febdded65bcd599d66d;hpb=e2ef3df86d5f54274bf2b779d882c30aa0886bfe;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index 96b5d40..18f1bb5 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -811,7 +811,7 @@ test("is(String)", function() {
 });
 
 test("$.extend(Object, Object)", function() {
-	expect(11);
+	expect(14);
 
 	var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
 		options =     { xnumber2: 1, xstring2: "x", xxx: "newstring" },
@@ -836,6 +836,17 @@ test("$.extend(Object, Object)", function() {
 	isObj( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" );
 	equals( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" );
 
+	var target = {};
+	var recursive = { foo:target, bar:5 };
+	jQuery.extend(true, target, recursive);
+	isObj( target, { bar:5 }, "Check to make sure a recursive obj doesn't go never-ending loop by not copying it over" );
+
+	var ret = jQuery.extend(true, { foo: [] }, { foo: [0] } ); // 1907
+	ok( ret.foo.length == 1, "Check to make sure a value with coersion 'false' copies over when necessary to fix #1907" );
+
+	var ret = jQuery.extend(true, { foo: "1,2,3" }, { foo: [1, 2, 3] } );
+	ok( typeof ret.foo != "string", "Check to make sure values equal with coersion (but not actually equal) overwrite correctly" );
+
 	var defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
 		defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
 		options1 =     { xnumber2: 1, xstring2: "x" },
@@ -871,15 +882,19 @@ test("val(String)", function() {
 var scriptorder = 0;
 
 test("html(String)", function() {
-	expect(9);
+	expect(10);
 	var div = $("div");
 	div.html("<b>test</b>");
 	var pass = true;
 	for ( var i = 0; i < div.size(); i++ ) {
-	  if ( div.get(i).childNodes.length == 0 ) pass = false;
+		if ( div.get(i).childNodes.length == 0 ) pass = false;
 	}
 	ok( pass, "Set HTML" );
 
+	$("#main").html("<select/>");
+	$("#main select").html("<option>O1</option><option selected='selected'>O2</option><option>O3</option>");
+	equals( $("#main select").val(), "O2", "Selected option correct" );
+
 	stop();
 
 	$("#main").html('<script type="text/javascript">ok( true, "$().html().evalScripts() Evals Scripts Twice in Firefox, see #975" );</script>');