From 10e654218a65ec9a0ffc875137cea945389c69f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Go=C5=82e=CC=A8biowski?= Date: Mon, 10 Mar 2014 15:03:03 +0100 Subject: [PATCH] Ajax, Effects: Disable Chrome 31 workarounds --- test/unit/ajax.js | 15 ++++----------- test/unit/effects.js | 26 +++++++------------------- 2 files changed, 11 insertions(+), 30 deletions(-) diff --git a/test/unit/ajax.js b/test/unit/ajax.js index 4b4e408a3..2f4bc04e5 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -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() diff --git a/test/unit/effects.js b/test/unit/effects.js index 2c9cb13c4..ca0754083 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -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("
") - .find("td"); + .html( "
" ) + .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 ); -- 2.39.5