X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2FcoreTest.js;h=6efaa84347f581c0b015f03f078cac41938e37c8;hb=694becea3898f060ed815cf864ea1d4e87a800fb;hp=d7fa5c7cca85a6a2815c9c721212863ab8a97ec4;hpb=41f62e13643462a88fa7d9015346196f3d37b966;p=jquery.git

diff --git a/src/jquery/coreTest.js b/src/jquery/coreTest.js
index d7fa5c7..6efaa84 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);
@@ -170,8 +177,8 @@ test("wrap(String|Element)", function() {
 	ok( result.text() == defaultText, 'Check for element wrapping' );
 });
 
-test("append(String|Element|Array<Element>)", function() {
-	expect(4);
+test("append(String|Element|Array<Element>|jQuery)", function() {
+	expect(5);
 	var defaultText = 'Try them out:'
 	var result = $('#first').append('<b>buga</b>');
 	ok( result.text() == defaultText + 'buga', 'Check if text appending works' );
@@ -186,10 +193,15 @@ test("append(String|Element|Array&lt;Element&gt;)", function() {
 	expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";
 	$('#sap').append([document.getElementById('first'), document.getElementById('yahoo')]);
 	ok( expected == $('#sap').text(), "Check for appending of array of elements" );
+	
+	reset();
+	expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";
+	$('#sap').append($("#first, #yahoo"));
+	ok( expected == $('#sap').text(), "Check for appending of jQuery object" );
 });
 
-test("prepend(String|Element|Array&lt;Element&gt;)", function() {
-	expect(4);
+test("prepend(String|Element|Array&lt;Element&gt;|jQuery)", function() {
+	expect(5);
 	var defaultText = 'Try them out:'
 	var result = $('#first').prepend('<b>buga</b>');
 	ok( result.text() == 'buga' + defaultText, 'Check if text prepending works' );
@@ -204,10 +216,15 @@ test("prepend(String|Element|Array&lt;Element&gt;)", function() {
 	expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
 	$('#sap').prepend([document.getElementById('first'), document.getElementById('yahoo')]);
 	ok( expected == $('#sap').text(), "Check for prepending of array of elements" );
+	
+	reset();
+	expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
+	$('#sap').prepend($("#first, #yahoo"));
+	ok( expected == $('#sap').text(), "Check for prepending of jQuery object" );
 });
 
-test("before(String|Element|Array&lt;Element&gt;)", function() {
-	expect(3);
+test("before(String|Element|Array&lt;Element&gt;|jQuery)", function() {
+	expect(4);
 	var expected = 'This is a normal link: bugaYahoo';
 	$('#yahoo').before('<b>buga</b>');
 	ok( expected == $('#en').text(), 'Insert String before' );
@@ -221,10 +238,15 @@ test("before(String|Element|Array&lt;Element&gt;)", function() {
 	expected = "This is a normal link: Try them out:diveintomarkYahoo";
 	$('#yahoo').before([document.getElementById('first'), document.getElementById('mark')]);
 	ok( expected == $('#en').text(), "Insert array of elements before" );
+	
+	reset();
+	expected = "This is a normal link: Try them out:diveintomarkYahoo";
+	$('#yahoo').before($("#first, #mark"));
+	ok( expected == $('#en').text(), "Insert jQuery before" );
 });
 
-test("after(String|Element|Array&lt;Element&gt;)", function() {
-	expect(3);
+test("after(String|Element|Array&lt;Element&gt;|jQuery)", function() {
+	expect(4);
 	var expected = 'This is a normal link: Yahoobuga';
 	$('#yahoo').after('<b>buga</b>');
 	ok( expected == $('#en').text(), 'Insert String after' );
@@ -238,6 +260,11 @@ test("after(String|Element|Array&lt;Element&gt;)", function() {
 	expected = "This is a normal link: YahooTry them out:diveintomark";
 	$('#yahoo').after([document.getElementById('first'), document.getElementById('mark')]);
 	ok( expected == $('#en').text(), "Insert array of elements after" );
+	
+	reset();
+	expected = "This is a normal link: YahooTry them out:diveintomark";
+	$('#yahoo').after($("#first, #mark"));
+	ok( expected == $('#en').text(), "Insert jQuery after" );
 });
 
 test("end()", function() {
@@ -261,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&lt;String&gt;)" );
-	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() {
@@ -348,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" );
@@ -382,6 +388,25 @@ 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("next/prev([String])", function() {
+	ok( $("#ap").next()[0].id == "foo", "Simple next check" );
+	ok( $("#ap").next("div")[0].id == "foo", "Filtered next check" );
+	ok( $("#ap").next("p").length == 0, "Filtered next check, no match" );
+	
+	ok( $("#foo").prev()[0].id == "ap", "Simple prev check" );
+	ok( $("#foo").prev("p")[0].id == "ap", "Filtered prev check" );
+	ok( $("#foo").prev("div").length == 0, "Filtered prev check, no match" );
+});
 
 test("show()", function() {
 	expect(1);
@@ -423,20 +448,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("evalScripts() with no script elements", function() {
-    expect(2);
-    stop();
-    $.ajax({
-        url: 'data/text.php?' + new Date().getTime(),
-        success: function(data, status) {
-            ok ( true, 'before evalScripts()');
-            jQuery('#output').html(data).evalScripts();
-            ok ( true, 'after evalScripts()');
-            start();
-        }
-    });
+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" );
 });