X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2FcoreTest.js;h=c24bda05ba2e5576c7a7bf0e51a50539be1fe323;hb=bb816b9c95b3ad8c6335588b4f232599d5838bd6;hp=d7fa5c7cca85a6a2815c9c721212863ab8a97ec4;hpb=41f62e13643462a88fa7d9015346196f3d37b966;p=jquery.git
diff --git a/src/jquery/coreTest.js b/src/jquery/coreTest.js
index d7fa5c7..c24bda0 100644
--- a/src/jquery/coreTest.js
+++ b/src/jquery/coreTest.js
@@ -170,8 +170,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 +186,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 +209,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 +231,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 +253,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() {
@@ -427,16 +447,3 @@ 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();
- }
- });
-});