X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2FcoreTest.js;h=43033a7be0387a0cda298aee40fcdebfb367ff25;hb=783f589fbf005a6a3211bff20e3e8aeb1ea0ac22;hp=d1035cf6476bd165c4b23e00aa14da8471087fa9;hpb=19b21ff10ae5f4800f367306cb589c5fe201eed3;p=jquery.git diff --git a/src/jquery/coreTest.js b/src/jquery/coreTest.js index d1035cf..43033a7 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() { @@ -261,7 +281,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(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() {