X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=inline;f=test%2Funit%2Fattributes.js;h=3adb018dfb9f9f24f96a2df8ed833431c8c38712;hb=8ebb9b22df32fe5739a48087b6e33abb9f5cda49;hp=c5700adda9d19f414294be4e3d52bc47f1bf3aef;hpb=abcc1a76ee2a6733177b2cd104bc32cee5443ec4;p=jquery.git
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index c5700ad..3adb018 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -30,7 +30,8 @@ test("attr(String)", function() {
equals( jQuery('#foo').attr('nodeName').toUpperCase(), 'DIV', 'Check for nodeName attribute' );
equals( jQuery('#foo').attr('tagName').toUpperCase(), 'DIV', 'Check for tagName attribute' );
- jQuery('').attr('href', '#5').appendTo('#main'); // using innerHTML in IE causes href attribute to be serialized to the full path
+ // using innerHTML in IE causes href attribute to be serialized to the full path
+ jQuery('').attr({ 'id': 'tAnchor5', 'href': '#5' }).appendTo('#main');
equals( jQuery('#tAnchor5').attr('href'), "#5", 'Check for non-absolute href (an anchor)' );
equals( jQuery("").attr("selected"), false, "Check selected attribute on disconnected element." );
@@ -150,7 +151,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;
@@ -306,7 +307,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
@@ -328,10 +329,7 @@ test("val()", function() {
jQuery('#select3').val("");
same( jQuery('#select3').val(), [''], 'Call val() on a multiple="multiple" select' );
- var checks = jQuery("").appendTo("#form")
- .add( jQuery("").appendTo("#form") )
- .add( jQuery("").appendTo("#form") )
- .add( jQuery("").appendTo("#form") );
+ var checks = jQuery("").appendTo("#form");
same( checks.serialize(), "", "Get unchecked values." );
@@ -438,7 +436,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;
@@ -460,6 +458,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() {
@@ -478,8 +480,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;
@@ -498,7 +502,7 @@ var testRemoveClass = function(valueObj) {
ok( !$divs.is('.test'), "Remove Class" );
- reset();
+ QUnit.reset();
$divs = jQuery('div');
$divs.addClass("test").addClass("foo").addClass("bar");
@@ -506,7 +510,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
@@ -549,13 +553,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) {