Replace usage of the removed global reset() method with QUnit.reset().

[jquery.git] / test / unit / attributes.js

diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 234d586..c125ec7 100644 (file)
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -4,7 +4,7 @@ var bareObj = function(value) { return value; };
 var functionReturningObj = function(value) { return (function() { return value; }); };
 
 test("attr(String)", function() {
-       expect(28);
+       expect(30);
 
        // This one sometimes fails randomly ?!
        equals( jQuery('#text1').attr('value'), "Test", 'Check for value attribute' );
@@ -61,6 +61,9 @@ test("attr(String)", function() {
        select.appendChild( optgroup );
 
        equals( jQuery(option).attr("selected"), true, "Make sure that a single option is selected, even when in an optgroup." );
+
+       ok( jQuery("<div/>").attr("doesntexist") === undefined, "Make sure undefined is returned when no attribute is found." );
+       ok( jQuery().attr("doesntexist") === undefined, "Make sure undefined is returned when no element is there." );
 });
 
 if ( !isLocal ) {
@@ -147,7 +150,7 @@ test("attr(String, Object)", function() {
        equals( j.attr("name"), "attrvalue", "Check node,textnode,comment for attr" );
        j.removeAttr("name");
 
-       reset();
+       QUnit.reset();
 
        var type = jQuery("#check2").attr('type');
        var thrown = false;
@@ -303,7 +306,7 @@ test("val()", function() {
        document.getElementById('text1').value = "bla";
        equals( jQuery("#text1").val(), "bla", "Check for modified value of input element" );
 
-       reset();
+       QUnit.reset();
 
        equals( jQuery("#text1").val(), "Test", "Check for value of input element" );
        // ticket #1714 this caused a JS error in IE
@@ -435,7 +438,7 @@ test("val(Function) with incoming value", function() {
 });
 
 var testAddClass = function(valueObj) {
-       expect(4);
+       expect(5);
        var div = jQuery("div");
        div.addClass( valueObj("test") );
        var pass = true;
@@ -457,6 +460,10 @@ var testAddClass = function(valueObj) {
        div.attr("class", " foo");
        div.addClass( valueObj("test") );
        equals( div.attr("class"), "foo test", "Make sure there's no extra whitespace." );
+
+       div.attr("class", "foo");
+       div.addClass( valueObj("bar baz") );
+       equals( div.attr("class"), "foo bar baz", "Make sure there isn't too much trimming." );
 };
 
 test("addClass(String)", function() {
@@ -475,8 +482,10 @@ test("addClass(Function) with incoming value", function() {
        });
 
        div.addClass(function(i, val) {
-               equals( val, old[i], "Make sure the incoming value is correct." );
-               return "test";
+               if ( this.id !== "_firebugConsole" ) {
+                       equals( val, old[i], "Make sure the incoming value is correct." );
+                       return "test";
+               }
        });
 
        var pass = true;
@@ -495,7 +504,7 @@ var testRemoveClass = function(valueObj) {
 
        ok( !$divs.is('.test'), "Remove Class" );
 
-       reset();
+       QUnit.reset();
        $divs = jQuery('div');
 
        $divs.addClass("test").addClass("foo").addClass("bar");
@@ -503,7 +512,7 @@ var testRemoveClass = function(valueObj) {
 
        ok( !$divs.is('.test,.bar,.foo'), "Remove multiple classes" );
 
-       reset();
+       QUnit.reset();
        $divs = jQuery('div');
 
        // Make sure that a null value doesn't cause problems
@@ -546,13 +555,15 @@ test("removeClass(Function) with incoming value", function() {
        });
 
        $divs.removeClass(function(i, val) {
-               equals( val, old[i], "Make sure the incoming value is correct." );
-               return "test";
+               if ( this.id !== "_firebugConsole" ) {
+                       equals( val, old[i], "Make sure the incoming value is correct." );
+                       return "test";
+               }
        });
 
        ok( !$divs.is('.test'), "Remove Class" );
 
-       reset();        
+       QUnit.reset();  
 });
 
 var testToggleClass = function(valueObj) {