Skip to content

Commit

Permalink
Ajax, Effects: Disable Chrome 31 workarounds
Browse files Browse the repository at this point in the history
  • Loading branch information
mgol committed Mar 10, 2014
1 parent bb1db39 commit 10e6542
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 30 deletions.
15 changes: 4 additions & 11 deletions test/unit/ajax.js
Expand Up @@ -1586,17 +1586,10 @@ module( "ajax", {
}
});

// Support: Chrome 31.
// Chrome 31 doesn't fire Ajax requests in beforeunload event handler.
// There is no way for us to workaround it and it's been fixed in Chrome 32
// so let's just blacklist Chrome 31 as long as it's in TestSwarm.
// See https://code.google.com/p/chromium/issues/detail?id=321241
if ( navigator.userAgent.indexOf( " Chrome/31." ) === -1 ) {
testIframeWithCallback( "#14379 - jQuery.ajax() on unload", "ajax/onunload.html", function( status ) {
expect( 1 );
strictEqual( status, "success", "Request completed" );
});
}
testIframeWithCallback( "#14379 - jQuery.ajax() on unload", "ajax/onunload.html", function( status ) {
expect( 1 );
strictEqual( status, "success", "Request completed" );
});

//----------- jQuery.ajaxPrefilter()

Expand Down
26 changes: 7 additions & 19 deletions test/unit/effects.js
Expand Up @@ -395,32 +395,20 @@ test("animate table-row width/height", function() {
});

test("animate table-cell width/height", function() {
// Support: Chrome 31.
// Chrome 31 reports incorrect offsetWidth on a table cell with fixed width.
// This is fixed in Chrome 32 so let's just skip the failing test in Chrome 31.
// See https://code.google.com/p/chromium/issues/detail?id=290399
var displayMode, td,
chrome31 = navigator.userAgent.indexOf( " Chrome/31." ) !== -1;

if (chrome31) {
expect(2);
} else {
expect(3);
}
expect(3);

td = jQuery("#table")
var displayMode,
td = jQuery( "#table" )
.attr({ "cellspacing": 0, "cellpadding": 0, "border": 0 })
.html("<tr><td style='width:42px;height:42px;padding:0;'><div style='width:20px;height:20px;'></div></td></tr>")
.find("td");
.html( "<tr><td style='width:42px;height:42px;padding:0;'><div style='width:20px;height:20px;'></div></td></tr>" )
.find( "td" );

// IE<8 uses "block" instead of the correct display type
displayMode = td.css("display") !== "table-cell" ? "block" : "table-cell";
displayMode = td.css( "display" ) !== "table-cell" ? "block" : "table-cell";

td.animate({ width: 10, height: 10 }, 100, function() {
equal( jQuery(this).css("display"), displayMode, "display mode is correct" );
if (!chrome31) {
equal( this.offsetWidth, 20, "width animated to shrink wrap point" );
}
equal( this.offsetWidth, 20, "width animated to shrink wrap point" );
equal( this.offsetHeight, 20, "height animated to shrink wrap point" );
});
this.clock.tick( 100 );
Expand Down

0 comments on commit 10e6542

Please sign in to comment.