Changed test count to get the green bar back

[jquery.git] / src / jquery / coreTest.js

diff --git a/src/jquery/coreTest.js b/src/jquery/coreTest.js
index 0592ae9..fcccff2 100644 (file)
--- 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(14);
+       expect(16);
        var defaultText = 'Try them out:'
        var result = $('#first').append('<b>buga</b>');
        ok( result.text() == defaultText + 'buga', 'Check if text appending works' );
        ok( $('#select3').append('<option value="appendTest">Append Test</option>').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" );
        
@@ -412,6 +412,11 @@ test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
        $('#select1').append('<OPTION>Test</OPTION>');
        ok( $('#select1 option:last').text() == "Test", "Appending &lt;OPTION&gt; (all caps)" );
        
+       $('#table').append('<colgroup></colgroup>');
+       ok( $('#table colgroup').length, "Append colgroup" );
+       
+       $('#table colgroup').append('<col>');
+       ok( $('#table colgroup col').length, "Append col" );
 });
 
 test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
@@ -422,7 +427,7 @@ test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
        ok( $('<option value="appendTest">Append Test</option>').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" );
        
@@ -449,7 +454,7 @@ test("prepend(String|Element|Array&lt;Element&gt;|jQuery)", function() {
        ok( $('#select3').prepend('<option value="prependTest">Prepend Test</option>').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" );
 
@@ -472,7 +477,7 @@ test("prependTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
        ok( $('<option value="prependTest">Prepend Test</option>').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" );
 
@@ -637,8 +642,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() {
@@ -651,10 +656,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() {
@@ -672,7 +677,7 @@ test("val(String)", function() {
 });
 
 test("html(String)", function() {
-       expect(2);
+       expect(3);
        var div = $("div");
        div.html("<b>test</b>");
        var pass = true;