X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2FcoreTest.js;h=58616dba116e44eb5a2770f8e1adc8a8409c3f3b;hb=ea283bd13130303271077a6ee8b14b7c79bd0ce4;hp=169380bd0e91b35f50f2d27d1d60de14e14c193e;hpb=4451a83407b396a3e52b83667fe51a10bfb31289;p=jquery.git

diff --git a/src/jquery/coreTest.js b/src/jquery/coreTest.js
index 169380b..58616db 100644
--- a/src/jquery/coreTest.js
+++ b/src/jquery/coreTest.js
@@ -68,8 +68,8 @@ test("attr(String)", function() {
 });
 
 test("attr(String, Function)", function() {
+	expect(1);
 	ok( $('#text1').attr('value', function() { return this.id })[0].value == "text1", "Set value from id" );
-	ok( $('#text2').attr('value', "${this.id}")[0].value == "text2", "Set value from id" );
 });
 
 test("attr(Hash)", function() {
@@ -103,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);
@@ -386,6 +388,15 @@ test("children([String])", function() {
 	isSet( $("#foo").children("[code]").get(), q("sndp", "sap"), "Check for filtered children" );
 });
 
+test("parent[s]([String])", function() {
+	ok( $("#groups").parent()[0].id == "ap", "Simple parent check" );
+	ok( $("#groups").parent("p")[0].id == "ap", "Filtered parent check" );
+	ok( $("#groups").parent("div").length == 0, "Filtered parent check, no match" );
+	
+	ok( $("#groups").parents()[0].id == "ap", "Simple parents check" );
+	ok( $("#groups").parents("p")[0].id == "ap", "Filtered parents check" );
+	ok( $("#groups").parents("div")[0].id == "main", "Filtered parents check2" );
+});
 
 test("show()", function() {
 	expect(1);
@@ -427,7 +438,21 @@ test("removeClass(String) - add three classes and remove again", function() {
 	ok( pass, "Remove multiple classes" );
 });
 
+test("toggleClass(String)", function() {
+	expect(3);
+	var e = $("#firstp");
+	ok( !e.is(".test"), "Assert class not present" );
+	e.toggleClass("test");
+	ok( e.is(".test"), "Assert class present" ); 
+	e.toggleClass("test");
+	ok( !e.is(".test"), "Assert class not present" );
+});
+
 test("removeAttr(String", function() {
 	ok( $('#mark').removeAttr("class")[0].className == "", "remove class" );
 });
 
+test("text(String)", function() {
+	expect(1);
+	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" );
+});