X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2FcoreTest.js;h=73621cd178d6f5873c6198fd84d74ec9f9ffb730;hb=d0e8a2452ebd30abe403d402e813513cef675694;hp=c24bda05ba2e5576c7a7bf0e51a50539be1fe323;hpb=ca438a718a27eedc25572cafb3fb22780cf9fbb7;p=jquery.git

diff --git a/src/jquery/coreTest.js b/src/jquery/coreTest.js
index c24bda0..73621cd 100644
--- a/src/jquery/coreTest.js
+++ b/src/jquery/coreTest.js
@@ -67,6 +67,11 @@ test("attr(String)", function() {
 	ok( $('#form').attr('action').indexOf("formaction") >= 0, 'Check for action attribute' );
 });
 
+test("attr(String, Function)", function() {
+	expect(1);
+	ok( $('#text1').attr('value', function() { return this.id })[0].value == "text1", "Set value from id" );
+});
+
 test("attr(Hash)", function() {
 	expect(1);
 	var pass = true;
@@ -87,7 +92,7 @@ test("attr(String, Object)", function() {
 	ok( pass, "Set Attribute" );
 	
 	$("#name").attr('name', 'something');
-	ok( $("#name").name() == 'something', 'Set name attribute' );
+	ok( $("#name").attr('name') == 'something', 'Set name attribute' );
 	$("#check2").attr('checked', true);
 	ok( document.getElementById('check2').checked == true, 'Set checked attribute' );
 	$("#check2").attr('checked', false);
@@ -98,19 +103,21 @@ test("attr(String, Object)", function() {
 	ok( document.getElementById('text1').readOnly == false, 'Set readonly attribute' );
 });
 
-test("attr(String, Object)x", function() {
-	expect(2);
-	stop();
-	$.get('data/dashboard.xml', function(xml) { 
-	  var titles = [];
-	  $('tab', xml).each(function() {
-	    titles.push($(this).attr('title'));
-	  });
-	  ok( titles[0] == 'Location', 'attr() in XML context: Check first title' );
-	  ok( titles[1] == 'Users', 'attr() in XML context: Check second title' );
-	  start();
+if ( location.protocol != "file:" ) {
+	test("attr(String, Object)x", function() {
+		expect(2);
+		stop();
+		$.get('data/dashboard.xml', function(xml) { 
+	  	var titles = [];
+	  	$('tab', xml).each(function() {
+	    	titles.push($(this).attr('title'));
+	  	});
+	  	ok( titles[0] == 'Location', 'attr() in XML context: Check first title' );
+	  	ok( titles[1] == 'Users', 'attr() in XML context: Check second title' );
+	  	start();
+		});
 	});
-});
+}
 
 test("css(String|Hash)", function() {
 	expect(8);
@@ -281,7 +288,7 @@ test("clone()", function() {
 test("filter()", function() {
 	isSet( $("input").filter(":checked").get(), q("radio2", "check1"), "filter(String)" );
 	isSet( $("p").filter(["#ap", "#sndp"]).get(), q("ap", "sndp"), "filter(Array<String>)" );
-	isSet( $("p").filter(function(el) { return !$("a", el).length }).get(), q("sndp", "first"), "filter(Function)" );
+	isSet( $("p").filter(function() { return !$("a", this).length }).get(), q("sndp", "first"), "filter(Function)" );
 });
 
 test("not(String)", function() {
@@ -368,27 +375,6 @@ test("html(String)", function() {
 	ok( pass, "Set HTML" );
 });
 
-test("id()", function() {
-	expect(3);
-	ok( $(document.getElementById('main')).id() == "main", "Check for id" );
-	ok( $("#foo").id() == "foo", "Check for id" );
-	ok( !$("head").id(), "Check for id" );
-});
-
-test("title()", function() {
-	expect(2);
-	ok( $(document.getElementById('google')).title() == "Google!", "Check for title" );
-	ok( !$("#yahoo").title(), "Check for title" );
-});
-
-test("name()", function() {
-	expect(3);
-	ok( $(document.getElementById('text1')).name() == "action", "Check for name" );
-	ok( $("#hidden1").name() == "hidden", "Check for name" );
-	ok( !$("#area1").name(), "Check for name" );
-});
-
-
 test("siblings([String])", function() {
 	expect(3);
 	isSet( $("#en").siblings().get(), q("sndp", "sap"), "Check for siblings" );
@@ -447,3 +433,7 @@ test("removeAttr(String", function() {
 	ok( $('#mark').removeAttr("class")[0].className == "", "remove class" );
 });
 
+test("text(String, Boolean)", function() {
+	ok( $("#foo").text("<div><b>Hello</b> cruel world!</div>")[0].innerHTML == "&lt;div&gt;&lt;b&gt;Hello&lt;/b&gt; cruel world!&lt;/div&gt;", "Check escaped text" );
+	ok( $("#foo").text("<div><b>Hello</b> cruel world!</div>", true)[0].innerHTML == "Hello cruel world!", "Check stripped text" );
+});