aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMichał Gołębiowski <m.goleb@gmail.com>2014-03-10 14:56:42 +0100
committerMichał Gołębiowski <m.goleb@gmail.com>2014-03-10 14:57:40 +0100
commitb19d4d3450c385b7074035b17f3ba8d0b86cf0b0 (patch)
tree13e7a105ae9aa604d909841399555728b40624df /test
parenta96d5bed58f2b30f97d6dd2f5691cd890f62b75f (diff)
downloadjquery-b19d4d3450c385b7074035b17f3ba8d0b86cf0b0.tar.gz
jquery-b19d4d3450c385b7074035b17f3ba8d0b86cf0b0.zip
Ajax, Effects: Disable Chrome 31 workarounds
Diffstat (limited to 'test')
-rw-r--r--test/unit/ajax.js15
-rw-r--r--test/unit/effects.js19
2 files changed, 7 insertions, 27 deletions
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index a07749fc6..c099e12b1 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -1532,17 +1532,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" );
+ });
ajaxTest( "#14683 - jQuery.ajax() - Exceptions thrown synchronously by xhr.send should be caught", 4, [
{
diff --git a/test/unit/effects.js b/test/unit/effects.js
index 0762361cb..3016bdbf3 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -362,29 +362,16 @@ 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 td,
- chrome31 = navigator.userAgent.indexOf( " Chrome/31." ) !== -1;
-
- if (chrome31) {
- expect(2);
- } else {
- expect(3);
- }
+ expect(3);
- td = jQuery( "#table" )
+ var 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" );
td.animate({ width: 10, height: 10 }, 100, function() {
equal( jQuery( this ).css( "display" ), "table-cell", "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 );