Skip to content

Commit

Permalink
Merge pull request #3844 from ckeditor/t/3835
Browse files Browse the repository at this point in the history
Enable PfLO unit tests in IE11
  • Loading branch information
jacekbogdanski authored Feb 10, 2020
2 parents e6c0015 + edeab33 commit 6565b99
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 4 deletions.
29 changes: 27 additions & 2 deletions tests/plugins/pastefromlibreoffice/generated/generic.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,20 @@
};

var isSafari = CKEDITOR.env.webkit && !CKEDITOR.env.chrome,
isIE = CKEDITOR.env.ie && CKEDITOR.env.version <= 11;
isOldIE = CKEDITOR.env.ie && CKEDITOR.env.version < 11,
isIE11 = CKEDITOR.env.ie && CKEDITOR.env.version === 11,
// IE 11 does not support logical CSS properties.
customFilters = isIE11 ? [
new CKEDITOR.htmlParser.filter( {
attributes: {
style: function( attribute ) {
if ( attribute.indexOf( 'text-align:start' ) !== -1 ) {
return false;
}
}
}
} )
] : [];

bender.test( createTestSuite( {
browsers: [
Expand All @@ -42,6 +55,18 @@
Paragraph_format: true,
Page_break: true
},
ignoreAll: isSafari || isIE || bender.tools.env.mobile
testData: {
_should: {
// IE 11 generates borders differently than everyone else.
ignore: {
'test Table_background libreoffice6 chrome': isIE11,
'test Table_background libreoffice6 edge': isIE11,
'test Table_background libreoffice6 firefox': isIE11,
'test Table_background libreoffice6 safari': isIE11
}
}
},
ignoreAll: isSafari || isOldIE || bender.tools.env.mobile,
customFilters: customFilters
} ) );
} )();
29 changes: 27 additions & 2 deletions tests/plugins/pastefromlibreoffice/generated/genericwithword.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,20 @@
};

var isSafari = CKEDITOR.env.webkit && !CKEDITOR.env.chrome,
isIE = CKEDITOR.env.ie && CKEDITOR.env.version <= 11;
isOldIE = CKEDITOR.env.ie && CKEDITOR.env.version < 11,
isIE11 = CKEDITOR.env.ie && CKEDITOR.env.version === 11,
// IE 11 does not support logical CSS properties.
customFilters = isIE11 ? [
new CKEDITOR.htmlParser.filter( {
attributes: {
style: function( attribute ) {
if ( attribute.indexOf( 'text-align:start' ) !== -1 ) {
return false;
}
}
}
} )
] : [];

bender.test( createTestSuite( {
browsers: [
Expand All @@ -42,6 +55,18 @@
Paragraph_format: true,
Page_break: true
},
ignoreAll: isSafari || isIE || bender.tools.env.mobile
testData: {
_should: {
// IE 11 generates borders differently than everyone else.
ignore: {
'test Table_background libreoffice6 chrome': isIE11,
'test Table_background libreoffice6 edge': isIE11,
'test Table_background libreoffice6 firefox': isIE11,
'test Table_background libreoffice6 safari': isIE11
}
}
},
ignoreAll: isSafari || isOldIE || bender.tools.env.mobile,
customFilters: customFilters
} ) );
} )();

0 comments on commit 6565b99

Please sign in to comment.