X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2FcoreTest.js;h=436dcc5cbe579c9f95f63e1dd32205bfa953b6bb;hb=cb0250f1fa5af5c84e858ea978fcaa1194f4694f;hp=287d709858f0f2f69c47d0be57466bccd6078145;hpb=61504d516abcc7bae036056853f21601ad310826;p=jquery.git
diff --git a/src/jquery/coreTest.js b/src/jquery/coreTest.js
index 287d709..436dcc5 100644
--- a/src/jquery/coreTest.js
+++ b/src/jquery/coreTest.js
@@ -67,6 +67,15 @@ test("attr(String)", function() {
ok( $('#form').attr('action').indexOf("formaction") >= 0, 'Check for action attribute' );
});
+test("attr(String, Function|String)", function() {
+ 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" );
+ reset();
+ $('#text1, #text2').attr({value: "${this.id + 'foobar'}"});
+ ok( $('#text1')[0].value == "text1foobar", "Set value from id" );
+ ok( $('#text2')[0].value == "text2foobar", "Set value from id" );
+});
+
test("attr(Hash)", function() {
expect(1);
var pass = true;
@@ -87,7 +96,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);
@@ -170,8 +179,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('buga');
ok( result.text() == defaultText + 'buga', 'Check if text appending works' );
@@ -186,10 +195,15 @@ test("append(String|Element|Array<Element>)", 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<Element>)", function() {
- expect(4);
+test("prepend(String|Element|Array<Element>|jQuery)", function() {
+ expect(5);
var defaultText = 'Try them out:'
var result = $('#first').prepend('buga');
ok( result.text() == 'buga' + defaultText, 'Check if text prepending works' );
@@ -204,10 +218,15 @@ test("prepend(String|Element|Array<Element>)", 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<Element>)", function() {
- expect(3);
+test("before(String|Element|Array<Element>|jQuery)", function() {
+ expect(4);
var expected = 'This is a normal link: bugaYahoo';
$('#yahoo').before('buga');
ok( expected == $('#en').text(), 'Insert String before' );
@@ -221,10 +240,15 @@ test("before(String|Element|Array<Element>)", 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<Element>)", function() {
- expect(3);
+test("after(String|Element|Array<Element>|jQuery)", function() {
+ expect(4);
var expected = 'This is a normal link: Yahoobuga';
$('#yahoo').after('buga');
ok( expected == $('#en').text(), 'Insert String after' );
@@ -238,6 +262,11 @@ test("after(String|Element|Array<Element>)", 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,6 +290,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() { return !$("a", this).length }).get(), q("sndp", "first"), "filter(Function)" );
});
test("not(String)", function() {
@@ -347,27 +377,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" );
@@ -425,3 +434,4 @@ test("removeClass(String) - add three classes and remove again", function() {
test("removeAttr(String", function() {
ok( $('#mark').removeAttr("class")[0].className == "", "remove class" );
});
+