Commit e680f36c authored by Rick Waldron's avatar Rick Waldron

Fix busted tests that relied on width in 2nd param to jQuery(), dimensions...

Fix busted tests that relied on width in 2nd param to jQuery(), dimensions stays modular. (core, attributes, offset)
Signed-off-by: 's avatarRick Waldron <waldron.rick@gmail.com>
parent 3225d614
...@@ -383,17 +383,27 @@ test("attr(jquery_method)", function(){ ...@@ -383,17 +383,27 @@ test("attr(jquery_method)", function(){
$elem.attr({css: {color: "red"}}, true); $elem.attr({css: {color: "red"}}, true);
ok( /^(#ff0000|red)$/i.test(elem.style.color), "attr(css)"); ok( /^(#ff0000|red)$/i.test(elem.style.color), "attr(css)");
if ( jQuery.fn.width ) {
$elem.attr({height: 10}, true); $elem.attr({height: 10}, true);
equal( elem.style.height, "10px", "attr(height)"); equal( elem.style.height, "10px", "attr(height)");
// Multiple attributes // Multiple attributes
$elem.attr({ $elem.attr({
width:10, width:10,
css:{ paddingLeft:1, paddingRight:1 } css:{ paddingLeft:1, paddingRight:1 }
}, true); }, true);
equal( elem.style.width, "10px", "attr({...})"); equal( elem.style.width, "10px", "attr({...})");
} else {
$elem.attr({
css:{ paddingLeft:1, paddingRight:1 }
}, true);
ok( true, "DUMMY: attr(height)" );
ok( true, "DUMMY: attr({...})" );
}
equal( elem.style.paddingLeft, "1px", "attr({...})"); equal( elem.style.paddingLeft, "1px", "attr({...})");
equal( elem.style.paddingRight, "1px", "attr({...})"); equal( elem.style.paddingRight, "1px", "attr({...})");
}); });
......
...@@ -70,9 +70,11 @@ test("jQuery()", function() { ...@@ -70,9 +70,11 @@ test("jQuery()", function() {
equal( jQuery(document.body).get(0), jQuery("body").get(0), "Test passing an html node to the factory" ); equal( jQuery(document.body).get(0), jQuery("body").get(0), "Test passing an html node to the factory" );
var exec = false; var exec = false,
elem;
var elem = jQuery("<div/>", { if ( jQuery.fn.width ) {
elem = jQuery("<div/>", {
width: 10, width: 10,
css: { paddingLeft:1, paddingRight:1 }, css: { paddingLeft:1, paddingRight:1 },
click: function(){ ok(exec, "Click executed."); }, click: function(){ ok(exec, "Click executed."); },
...@@ -82,6 +84,18 @@ test("jQuery()", function() { ...@@ -82,6 +84,18 @@ test("jQuery()", function() {
}); });
equal( elem[0].style.width, "10px", "jQuery() quick setter width"); equal( elem[0].style.width, "10px", "jQuery() quick setter width");
} else {
elem = jQuery("<div/>", {
css: { paddingLeft:1, paddingRight:1 },
click: function(){ ok(exec, "Click executed."); },
text: "test",
"class": "test2",
id: "test3"
});
ok( true, "DUMMY: jQuery() quick setter width");
}
equal( elem[0].style.paddingLeft, "1px", "jQuery quick setter css"); equal( elem[0].style.paddingLeft, "1px", "jQuery quick setter css");
equal( elem[0].style.paddingRight, "1px", "jQuery quick setter css"); equal( elem[0].style.paddingRight, "1px", "jQuery quick setter css");
equal( elem[0].childNodes.length, 1, "jQuery quick setter text"); equal( elem[0].childNodes.length, 1, "jQuery quick setter text");
......
...@@ -14,13 +14,16 @@ var supportsScroll = false; ...@@ -14,13 +14,16 @@ var supportsScroll = false;
testIframe("offset/absolute", "absolute", function($, iframe) { testIframe("offset/absolute", "absolute", function($, iframe) {
expect(4); expect(4);
var doc = iframe.document, tests; var doc = iframe.document,
tests, forceScroll;
// force a scroll value on the main window // force a scroll value on the main window
// this insures that the results will be wrong // this insures that the results will be wrong
// if the offset method is using the scroll offset // if the offset method is using the scroll offset
// of the parent window // of the parent window
var forceScroll = jQuery("<div>", { width: 2000, height: 2000 }).appendTo("body"); forceScroll = jQuery("<div>").css({ width: 2000, height: 2000 });
forceScroll.appendTo("body");
window.scrollTo(200, 200); window.scrollTo(200, 200);
if ( document.documentElement.scrollTop || document.body.scrollTop ) { if ( document.documentElement.scrollTop || document.body.scrollTop ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment