X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2FcoreTest.js;h=479bed0f027ff0a0b458e8873e8af88c6eeaf8e3;hb=74a8e206231162b005d95b667343678f786ae272;hp=049c4cc9751754c3571568f075f35fd60f84914b;hpb=9c94ef4c411867d38f301ccbf406af21e277188c;p=jquery.git
diff --git a/src/jquery/coreTest.js b/src/jquery/coreTest.js
index 049c4cc..479bed0 100644
--- a/src/jquery/coreTest.js
+++ b/src/jquery/coreTest.js
@@ -356,14 +356,14 @@ test("wrap(String|Element)", function() {
});
test("append(String|Element|Array<Element>|jQuery)", function() {
- expect(12);
+ expect(14);
var defaultText = 'Try them out:'
var result = $('#first').append('buga ');
ok( result.text() == defaultText + 'buga', 'Check if text appending works' );
ok( $('#select3').append('Append Test ').find('option:last-child').attr('value') == 'appendTest', 'Appending html options to select element');
reset();
- expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:";
+ var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:";
$('#sap').append(document.getElementById('first'));
ok( expected == $('#sap').text(), "Check for appending of element" );
@@ -404,17 +404,25 @@ test("append(String|Element|Array<Element>|jQuery)", function() {
ok( pass, "Test for appending a DOM node to the contents of an IFrame" );
+ reset();
+ $('
').appendTo('#form').append('test ');
+ t( 'Append legend', '#legend', ['legend'] );
+
+ reset();
+ $('#select1').append('Test ');
+ ok( $('#select1 option:last').text() == "Test", "Appending <OPTION> (all caps)" );
+
});
test("appendTo(String|Element|Array<Element>|jQuery)", function() {
- expect(5);
+ expect(6);
var defaultText = 'Try them out:'
$('buga ').appendTo('#first');
ok( $("#first").text() == defaultText + 'buga', 'Check if text appending works' );
ok( $('Append Test ').appendTo('#select3').parent().find('option:last-child').attr('value') == 'appendTest', 'Appending html options to select element');
reset();
- expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:";
+ var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:";
$(document.getElementById('first')).appendTo('#sap');
ok( expected == $('#sap').text(), "Check for appending of element" );
@@ -427,6 +435,10 @@ test("appendTo(String|Element|Array<Element>|jQuery)", function() {
expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";
$("#first, #yahoo").appendTo('#sap');
ok( expected == $('#sap').text(), "Check for appending of jQuery object" );
+
+ reset();
+ $('#select1').appendTo('#foo');
+ t( 'Append select', '#foo select', ['select1'] );
});
test("prepend(String|Element|Array<Element>|jQuery)", function() {
@@ -437,7 +449,7 @@ test("prepend(String|Element|Array<Element>|jQuery)", function() {
ok( $('#select3').prepend('Prepend Test ').find('option:first-child').attr('value') == 'prependTest', 'Prepending html options to select element');
reset();
- expected = "Try them out:This link has class=\"blog\": Simon Willison's Weblog";
+ var expected = "Try them out:This link has class=\"blog\": Simon Willison's Weblog";
$('#sap').prepend(document.getElementById('first'));
ok( expected == $('#sap').text(), "Check for prepending of element" );
@@ -460,7 +472,7 @@ test("prependTo(String|Element|Array<Element>|jQuery)", function() {
ok( $('Prepend Test ').prependTo('#select3').parent().find('option:first-child').attr('value') == 'prependTest', 'Prepending html options to select element');
reset();
- expected = "Try them out:This link has class=\"blog\": Simon Willison's Weblog";
+ var expected = "Try them out:This link has class=\"blog\": Simon Willison's Weblog";
$(document.getElementById('first')).prependTo('#sap');
ok( expected == $('#sap').text(), "Check for prepending of element" );
@@ -625,8 +637,8 @@ test("$.extend(Object, Object)", function() {
optionsCopy = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
merged = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "x", xxx: "newstring" };
jQuery.extend(settings, options);
- isSet( settings, merged, "Check if extended: settings must be extended" );
- isSet ( options, optionsCopy, "Check if not modified: options must not be modified" );
+ isObj( settings, merged, "Check if extended: settings must be extended" );
+ isObj( options, optionsCopy, "Check if not modified: options must not be modified" );
});
test("$.extend(Object, Object, Object, Object)", function() {
@@ -639,10 +651,10 @@ test("$.extend(Object, Object, Object, Object)", function() {
options2Copy = { xstring2: "xx", xxx: "newstringx" },
merged = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "xx", xxx: "newstringx" };
var settings = jQuery.extend({}, defaults, options1, options2);
- isSet( settings, merged, "Check if extended: settings must be extended" );
- isSet ( defaults, defaultsCopy, "Check if not modified: options1 must not be modified" );
- isSet ( options1, options1Copy, "Check if not modified: options1 must not be modified" );
- isSet ( options2, options2Copy, "Check if not modified: options2 must not be modified" );
+ isObj( settings, merged, "Check if extended: settings must be extended" );
+ isObj( defaults, defaultsCopy, "Check if not modified: options1 must not be modified" );
+ isObj( options1, options1Copy, "Check if not modified: options1 must not be modified" );
+ isObj( options2, options2Copy, "Check if not modified: options2 must not be modified" );
});
test("val()", function() {