From bcec54ee7271e2d0e427bcb246e3d2009a8f84f9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Go=C5=82e=CC=A8biowski?= Date: Tue, 7 Mar 2017 16:13:26 +0100 Subject: [PATCH] Tests: Skip CSS custom properties tests in non-supporting browsers Ref 619bf98d5b479f9582dbc40259b666f1c5a83146 --- test/unit/css.js | 121 ++++++++++++++++++++++++++--------------------- 1 file changed, 66 insertions(+), 55 deletions(-) diff --git a/test/unit/css.js b/test/unit/css.js index 460023b62..d080a5fe0 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -1556,68 +1556,79 @@ QUnit.test( "Do not throw on frame elements from css method (#15098)", function( } )(); +( function() { + var supportsCssVars, + div = jQuery( "
" ).appendTo( "#qunit-fixture" )[ 0 ]; + + div.style.setProperty( "--prop", "value" ); + supportsCssVars = getComputedStyle( div ).getPropertyValue( "--prop" ); + + QUnit[ supportsCssVars ? "test" : "skip" ]( "css(--customProperty)", function( assert ) { + jQuery( "#qunit-fixture" ).append( + "" + ); + + var div = jQuery( "
" ).appendTo( "#qunit-fixture" ), + $elem = jQuery( "
" ).addClass( "test__customProperties" ) + .appendTo( "#qunit-fixture" ), + webkit = /\bsafari\b/i.test( navigator.userAgent ) && + !/\firefox\b/i.test( navigator.userAgent ) && + !/\edge\b/i.test( navigator.userAgent ), + oldSafari = webkit && ( /\b9\.\d(\.\d+)* safari/i.test( navigator.userAgent ) || + /\b10\.0(\.\d+)* safari/i.test( navigator.userAgent ) || + /iphone os (?:9|10)_/i.test( navigator.userAgent ) ), + expected = 10; + + if ( webkit ) { + expected -= 2; + } + if ( oldSafari ) { + expected -= 2; + } + assert.expect( expected ); -QUnit.test( "css(--customProperty)", function( assert ) { - jQuery( "#qunit-fixture" ).append( - "" - ); - - var div = jQuery( "
" ).appendTo( "#qunit-fixture" ), - $elem = jQuery( "
" ).addClass( "test__customProperties" ).appendTo( "#qunit-fixture" ), - webkit = /\bsafari\b/i.test( navigator.userAgent ) && - !/\firefox\b/i.test( navigator.userAgent ) && - !/\edge\b/i.test( navigator.userAgent ), - oldSafari = webkit && ( /\b9\.\d(\.\d+)* safari/i.test( navigator.userAgent ) || - /\b10\.0(\.\d+)* safari/i.test( navigator.userAgent ) ), - expected = 10; - - if ( webkit ) { - expected -= 2; - } - if ( oldSafari ) { - expected -= 2; - } - assert.expect( expected ); - - div.css( "--color", "blue" ); - assert.equal( div.css( "--color" ), "blue", "Modified CSS custom property using string" ); + div.css( "--color", "blue" ); + assert.equal( div.css( "--color" ), "blue", "Modified CSS custom property using string" ); - div.css( "--color", "yellow" ); - assert.equal( div.css( "--color" ), "yellow", "Overwrite CSS custom property" ); + div.css( "--color", "yellow" ); + assert.equal( div.css( "--color" ), "yellow", "Overwrite CSS custom property" ); - div.css( { "--color": "red" } ); - assert.equal( div.css( "--color" ), "red", "Modified CSS custom property using object" ); + div.css( { "--color": "red" } ); + assert.equal( div.css( "--color" ), "red", "Modified CSS custom property using object" ); - div.css( { "--mixedCase": "green" } ); - assert.equal( div.css( "--mixedCase" ), "green", "Modified CSS custom property with mixed case" ); + div.css( { "--mixedCase": "green" } ); + assert.equal( div.css( "--mixedCase" ), "green", + "Modified CSS custom property with mixed case" ); - div.css( { "--theme-dark": "purple" } ); - assert.equal( div.css( "--theme-dark" ), "purple", "Modified CSS custom property with dashed name" ); + div.css( { "--theme-dark": "purple" } ); + assert.equal( div.css( "--theme-dark" ), "purple", + "Modified CSS custom property with dashed name" ); - assert.equal( $elem.css( "--prop1" ), "val1", "Basic CSS custom property" ); + assert.equal( $elem.css( "--prop1" ), "val1", "Basic CSS custom property" ); - // Support: Safari 9.1-10.0 only - // Safari collapses whitespaces & quotes. Ignore it. - if ( !oldSafari ) { - assert.equal( $elem.css( "--prop2" ), " val2", "Preceding whitespace maintained" ); - assert.equal( $elem.css( "--prop3" ), "val3 ", "Following whitespace maintained" ); - } + // Support: Safari 9.1-10.0 only + // Safari collapses whitespaces & quotes. Ignore it. + if ( !oldSafari ) { + assert.equal( $elem.css( "--prop2" ), " val2", "Preceding whitespace maintained" ); + assert.equal( $elem.css( "--prop3" ), "val3 ", "Following whitespace maintained" ); + } - // Support: Chrome 49-55, Safari 9.1-10.0 - // Chrome treats single quotes as double ones. - // Safari treats double quotes as single ones. - if ( !webkit ) { - assert.equal( $elem.css( "--prop4" ), "\"val4\"", "Works with double quotes" ); - assert.equal( $elem.css( "--prop5" ), "'val5'", "Works with single quotes" ); - } -} ); + // Support: Chrome 49-55, Safari 9.1-10.0 + // Chrome treats single quotes as double ones. + // Safari treats double quotes as single ones. + if ( !webkit ) { + assert.equal( $elem.css( "--prop4" ), "\"val4\"", "Works with double quotes" ); + assert.equal( $elem.css( "--prop5" ), "'val5'", "Works with single quotes" ); + } + } ); +} )(); } -- 2.39.5