diff --git a/tests/plugins/inlinetoolbar/cssdefault.js b/tests/plugins/inlinetoolbar/cssdefault.js index 4b03a36c371..0bba47f76ed 100644 --- a/tests/plugins/inlinetoolbar/cssdefault.js +++ b/tests/plugins/inlinetoolbar/cssdefault.js @@ -34,6 +34,7 @@ // We need to set up skin at the very beginning before files start to load. CKEDITOR.skinName = 'moono'; + // Overwrite prototype to simulate missing css file. var oldFn = CKEDITOR.dom.document.prototype.appendStyleSheet; CKEDITOR.dom.document.prototype.appendStyleSheet = function( cssFileUrl ) { @@ -43,10 +44,11 @@ } }; - var tests = { - 'test check moono skin usage': function( editor ) { - + 'test check default.css file usage when skin miss adequate css': function( editor ) { + if ( CKEDITOR.env.ie && CKEDITOR.env.version < 11 ) { + assert.ignore(); + } var panel = new CKEDITOR.ui.inlineToolbar( editor ); panel.addItems( { bold: new CKEDITOR.ui.button( { @@ -55,8 +57,8 @@ } ) } ); panel.attach( editor.editable().findOne( 'p' ) ); - assert.areSame( 'rgb(248, 248, 248)', panel._view.parts.panel.getComputedStyle( 'background-color' ), - 'Default skin background color seems to be incorrect.' ); + assert.areSame( 'background-color:#f8f8f8;', CKEDITOR.tools.normalizeCssText( 'background-color:' + panel._view.parts.panel.getComputedStyle( 'background-color' ) + ';' ), + 'Default skin background color is incorrect.' ); } }; diff --git a/tests/plugins/inlinetoolbar/cssskin.js b/tests/plugins/inlinetoolbar/cssskin.js index 54ecd5f6ffa..239c93a35ac 100644 --- a/tests/plugins/inlinetoolbar/cssskin.js +++ b/tests/plugins/inlinetoolbar/cssskin.js @@ -3,7 +3,6 @@ ( function() { 'use strict'; - // Please be aware that entire test suite has to use the same skin. That's why tests are separate between 2 files. bender.editors = { classic: { @@ -37,7 +36,10 @@ CKEDITOR.skinName = 'moono'; var tests = { - 'test check default css usage': function( editor ) { + 'test check moono skin usage': function( editor ) { + if ( CKEDITOR.env.ie && CKEDITOR.env.version < 11 ) { + assert.ignore(); + } var panel = new CKEDITOR.ui.inlineToolbar( editor ); panel.addItems( { @@ -47,8 +49,10 @@ } ) } ); panel.attach( editor.editable().findOne( 'p' ) ); - assert.areSame( 'rgba(0, 0, 0, 0)', panel._view.parts.panel.getComputedStyle( 'background-color' ), - 'Background color seems to be incorrect.' ); + // IE use cke_reset styles, that' why there is transparent. + assert.areSame( CKEDITOR.env.ie ? 'background-color:transparent;' : 'background-color:#000000;', + CKEDITOR.tools.normalizeCssText( 'background-color:' + panel._view.parts.panel.getComputedStyle( 'background-color' ) + ';' ), + 'Background color is incorrect.' ); } }; diff --git a/tests/plugins/inlinetoolbar/manual/fallbackstyles.html b/tests/plugins/inlinetoolbar/manual/fallbackstyles.html index ca205c73c2c..0ff238945d6 100644 --- a/tests/plugins/inlinetoolbar/manual/fallbackstyles.html +++ b/tests/plugins/inlinetoolbar/manual/fallbackstyles.html @@ -37,6 +37,9 @@