X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=f3a3aa3dba9610c5a93865c44b06802c4325215a;hb=f576ceeea9eea5fec6b31172765df4da8b264ac8;hp=cea8c61e3966b684bc053a44f5da21419ed11861;hpb=0a755f6ab38d36ffda02f9ff5a6d606c24a94baa;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index cea8c61..f3a3aa3 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -12,14 +12,19 @@ test("Basic requirements", function() {
 });
 
 test("$()", function() {
-	expect(5);
+	expect(4);
 	
 	var main = $("#main");
 	isSet( $("div p", main).get(), q("sndp", "en", "sap"), "Basic selector with jQuery object as context" );
 	
+/*
+	// disabled since this test was doing nothing. i tried to fix it but i'm not sure
+	// what the expected behavior should even be. FF returns "\n" for the text node
 	// make sure this is handled
-	$('<p>\r\n</p>');
-	ok( true, "Check for \\r and \\n in jQuery()" );
+	var crlfContainer = $('<p>\r\n</p>');
+	var x = crlfContainer.contents().get(0).nodeValue;
+	equals( x, what???, "Check for \\r and \\n in jQuery()" );
+*/
 	
 	/* // Disabled until we add this functionality in
 	var pass = true;
@@ -148,7 +153,7 @@ var foo = false;
 
 test("$('html')", function() {
 	expect(4);
-	
+
 	reset();
 	foo = false;
 	var s = $("<script>var foo='test';</script>")[0];
@@ -163,6 +168,14 @@ test("$('html')", function() {
 	reset();
 });
 
+test("$('html', context)", function() {
+	expect(1);
+
+	var $div = $("<div/>");
+	var $span = $("<span/>", $div);
+	equals($span.length, 1, "Verify a span created with a div context works");
+});
+
 test("length", function() {
 	expect(1);
 	ok( $("p").length == 6, "Get Number of Elements Found" );
@@ -276,7 +289,7 @@ test("attr(Hash)", function() {
 });
 
 test("attr(String, Object)", function() {
-	expect(13);
+	expect(16);
 	var div = $("div");
 	div.attr("foo", "bar");
 	var pass = true;
@@ -302,6 +315,14 @@ test("attr(String, Object)", function() {
 	$("#name").attr('maxLength', '10');
 	ok( document.getElementById('name').maxLength == '10', 'Set maxlength attribute' );
 
+	// for #1070
+	$("#name").attr('someAttr', '0');
+	equals( $("#name").attr('someAttr'), '0', 'Set attribute to a string of "0"' );
+	$("#name").attr('someAttr', 0);
+	equals( $("#name").attr('someAttr'), 0, 'Set attribute to the number 0' );
+	$("#name").attr('someAttr', 1);
+	equals( $("#name").attr('someAttr'), 1, 'Set attribute to the number 1' );
+
 	reset();
 
 	var type = $("#check2").attr('type');
@@ -372,7 +393,7 @@ test("css(String|Hash)", function() {
 });
 
 test("css(String, Object)", function() {
-	expect(18);
+	expect(19);
 	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');
@@ -396,6 +417,11 @@ test("css(String, Object)", function() {
 	});
 	$('#foo').css('opacity', '');
 	ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" );
+	// for #1438, IE throws JS error when filter exists but doesn't have opacity in it
+	if (jQuery.browser.msie) {
+		$('#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" );
 });
 
 test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", function () {
@@ -829,7 +855,7 @@ test("is(String)", function() {
 });
 
 test("$.extend(Object, Object)", function() {
-	expect(14);
+	expect(17);
 
 	var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
 		options =     { xnumber2: 1, xstring2: "x", xxx: "newstring" },
@@ -865,6 +891,17 @@ test("$.extend(Object, Object)", function() {
 	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 ret = jQuery.extend(true, { foo:"bar" }, { foo:null } );
+	ok( typeof ret.foo !== 'undefined', "Make sure a null value doesn't crash with deep extend, for #1908" );
+
+	var obj = { foo:null };
+	jQuery.extend(true, obj, { foo:"notnull" } );
+	equals( obj.foo, "notnull", "Make sure a null value can be overwritten" );
+
+	function func() {}
+	jQuery.extend(func, { key: "value" } );
+	equals( func.key, "value", "Verify a function can be extended" );
+
 	var defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
 		defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
 		options1 =     { xnumber2: 1, xstring2: "x" },
@@ -881,9 +918,11 @@ test("$.extend(Object, Object)", function() {
 });
 
 test("val()", function() {
-	expect(2);
+	expect(3);
 	ok( $("#text1").val() == "Test", "Check for value of input element" );
 	ok( !$("#text1").val() == "", "Check for value of input element" );
+	// ticket #1714 this caused a JS error in IE
+	ok( $("#first").val() == "", "Check a paragraph element to see if it has a value" );
 });
 
 test("val(String)", function() {