X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2FcoreTest.js;h=ab47c463cb181dc6899076dd61352b16b4f90bb7;hb=6d03f9290eb7b3f51b18413acdbd61d856749174;hp=c8dada498742aa5f5efa5dab3d48f43018fac0f4;hpb=8613d9a93ac424ee5c60ba6f69751e93a2d179c6;p=jquery.git

diff --git a/src/jquery/coreTest.js b/src/jquery/coreTest.js
index c8dada4..ab47c46 100644
--- a/src/jquery/coreTest.js
+++ b/src/jquery/coreTest.js
@@ -159,7 +159,7 @@ test("index(Object)", function() {
 });
 
 test("attr(String)", function() {
-	expect(15);
+	expect(13);
 	ok( $('#text1').attr('value') == "Test", 'Check for value attribute' );
 	ok( $('#text1').attr('type') == "text", 'Check for type attribute' );
 	ok( $('#radio1').attr('type') == "radio", 'Check for type attribute' );
@@ -175,15 +175,20 @@ test("attr(String)", function() {
 	
 	$('<a id="tAnchor5"></a>').attr('href', '#5').appendTo('#main'); // using innerHTML in IE causes href attribute to be serialized to the full path
 	ok( $('#tAnchor5').attr('href') == "#5", 'Check for non-absolute href (an anchor)' );
-	
-	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();
-	});
 });
 
+if ( location.protocol != "file:" ) {
+	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() {
 	expect(2);
 	ok( $('#text1').attr('value', function() { return this.id })[0].value == "text1", "Set value from id" );
@@ -240,7 +245,7 @@ if ( location.protocol != "file:" ) {
 }
 
 test("css(String|Hash)", function() {
-	expect(8);
+	expect(19);
 	
 	ok( $('#main').css("display") == 'none', 'Check for css property "display"');
 	
@@ -258,10 +263,19 @@ test("css(String|Hash)", function() {
 	ok( $('#floatTest').css('float') == 'right', 'Modified CSS float using "float": Assert float is right');
 	$('#floatTest').css({'font-size': '30px'});
 	ok( $('#floatTest').css('font-size') == '30px', 'Modified CSS font-size: Assert font-size is 30px');
+	
+	$.each("0,0.25,0.5,0.75,1".split(','), function(i, n) {
+		$('#foo').css({opacity: n});
+		ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" );
+		$('#foo').css({opacity: parseFloat(n)});
+		ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" );
+	});	
+	$('#foo').css({opacity: ''});
+	ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" );
 });
 
 test("css(String, Object)", function() {
-	expect(7);
+	expect(18);
 	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');
@@ -276,6 +290,15 @@ test("css(String, Object)", function() {
 	ok( $('#floatTest').css('float') == 'left', 'Modified CSS float using "float": Assert float is left');
 	$('#floatTest').css('font-size', '20px');
 	ok( $('#floatTest').css('font-size') == '20px', 'Modified CSS font-size: Assert font-size is 20px');
+	
+	$.each("0,0.25,0.5,0.75,1".split(','), function(i, n) {
+		$('#foo').css('opacity', n);
+		ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" );
+		$('#foo').css('opacity', parseFloat(n));
+		ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" );
+	});
+	$('#foo').css('opacity', '');
+	ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" );
 });
 
 test("text()", function() {
@@ -298,7 +321,7 @@ test("wrap(String|Element)", function() {
 });
 
 test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
-	expect(11);
+	expect(12);
 	var defaultText = 'Try them out:'
 	var result = $('#first').append('<b>buga</b>');
 	ok( result.text() == defaultText + 'buga', 'Check if text appending works' );
@@ -335,6 +358,16 @@ test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 	reset();
 	$("#sap").append(document.getElementById('form'));
 	ok( $("#sap>form").size() == 1, "Check for appending a form" );  // Bug #910
+
+	reset();
+	var pass = true;
+	try {
+		$( $("iframe")[0].contentWindow.document.body ).append("<div>test</div>");
+	} catch(e) {
+		pass = false;
+	}
+
+	ok( pass, "Test for appending a DOM node to the contents of an IFrame" );
 	
 });