From ba249efb6bee192d978a2f66eee4c717041f15fd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Go=C5=82e=CC=A8biowski-Owczarek?= Date: Wed, 10 May 2023 14:46:30 +0200 Subject: [PATCH] Tests: Workaround IE issues in qunit-assert-domequal In IE, `option` elements may have different initial `option` colors. They may initially all be transparent, but later the selected option gets a blue background with white text; we now ignore it. The logic of `qunit-assert-domequal` was also fixed to use the same method of fetching styles in all browsers; IE used to get a legacy one meant for IE <9 due to a mistake in the performed check. --- tests/lib/qunit-assert-domequal.js | 35 ++++++++++++++++-------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/tests/lib/qunit-assert-domequal.js b/tests/lib/qunit-assert-domequal.js index 066eb203b..bcce60702 100644 --- a/tests/lib/qunit-assert-domequal.js +++ b/tests/lib/qunit-assert-domequal.js @@ -38,6 +38,7 @@ var domEqual = QUnit.assert.domEqual = function( selector, modifier, message ) { domEqual.properties = [ "disabled", + "nodeName", "readOnly" ]; @@ -59,7 +60,6 @@ domEqual.attributes = [ "class", "href", "id", - "nodeName", "role", "tabIndex", "title" @@ -76,23 +76,26 @@ function getElementStyles( elem ) { var style = elem.ownerDocument.defaultView ? elem.ownerDocument.defaultView.getComputedStyle( elem, null ) : elem.currentStyle; - var key, len; - - if ( style && style.length && style[ 0 ] && style[ style[ 0 ] ] ) { - len = style.length; - while ( len-- ) { - key = style[ len ]; - if ( typeof style[ key ] === "string" ) { - styles[ camelCase( key ) ] = style[ key ]; - } + var key, camelKey; + var len = style.length; + + while ( len-- ) { + key = style[ len ]; + camelKey = camelCase( key ); + + // Support: IE <=11+ + // In IE, `option` elements may have different initial `option` colors. + // They may initially all be transparent, but later the selected + // option gets a blue background with white text; ignore it. + if ( document.documentMode && elem.nodeName.toLowerCase() === "option" && ( + camelKey === "color" || + camelKey.indexOf( "Color" ) === camelKey.length - "Color".length + ) ) { + continue; } - // Support: Opera, IE <9 - } else { - for ( key in style ) { - if ( typeof style[ key ] === "string" ) { - styles[ key ] = style[ key ]; - } + if ( typeof style[ key ] === "string" ) { + styles[ camelKey ] = style[ key ]; } } -- 2.39.5