Ignore image related tests on edge. Improve expected edge content, as…

… fonts are now much better detected and adjust to fonts present in the editor.
ckeditor · Nov 21, 2019 · 88c0506 · 88c0506
1 parent c0b6df7
commit 88c0506
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/tests/plugins/pastefromlibreoffice/generated/images.js b/tests/plugins/pastefromlibreoffice/generated/images.js
@@ -30,7 +30,7 @@
 			'Images/Linked_image': true,
 			'Images/Transformed': true
 		},
-		ignoreAll: ( CKEDITOR.env.ie && CKEDITOR.env.version <= 11 ) || bender.tools.env.mobile,
+		ignoreAll: CKEDITOR.env.ie || bender.tools.env.mobile,
 		includeRTF: true
 	} ) );
 } )();
diff --git a/tests/plugins/pastefromlibreoffice/generated/imageswithword.js b/tests/plugins/pastefromlibreoffice/generated/imageswithword.js
@@ -30,7 +30,7 @@
 			'Images/Linked_image': true,
 			'Images/Transformed': true
 		},
-		ignoreAll: ( CKEDITOR.env.ie && CKEDITOR.env.version <= 11 ) || bender.tools.env.mobile,
+		ignoreAll: CKEDITOR.env.ie || bender.tools.env.mobile,
 		includeRTF: true
 	} ) );
 } )();
diff --git a/...astefromword/generated/_fixtures/No_heuristics/Unordered_list/word2013/expected_edge.html b/...astefromword/generated/_fixtures/No_heuristics/Unordered_list/word2013/expected_edge.html
@@ -12,7 +12,7 @@
 		</span>
 	</span>
 	<font color="#000000">
-		<font face="times new roman">
+		<font face="times new roman, times, serif">
 			<font size="3">this</font>
 		</font>
 	</font>
@@ -31,7 +31,7 @@
 		</span>
 	</span>
 	<font color="#000000">
-		<font face="times new roman">
+		<font face="times new roman, times, serif">
 			<font size="3">is</font>
 		</font>
 	</font>
@@ -50,7 +50,7 @@
 		</span>
 	</span>
 	<font color="#000000">
-		<font face="times new roman">
+		<font face="times new roman, times, serif">
 			<font size="3">a</font>
 		</font>
 	</font>
@@ -69,7 +69,7 @@
 		</span>
 	</span>
 	<font color="#000000">
-		<font face="times new roman">
+		<font face="times new roman, times, serif">
 			<font size="3">one</font>
 		</font>
 	</font>
@@ -88,7 +88,7 @@
 		</span>
 	</span>
 	<font color="#000000">
-		<font face="times new roman">
+		<font face="times new roman, times, serif">
 			<font size="3">level</font>
 		</font>
 	</font>
@@ -107,7 +107,7 @@
 		</span>
 	</span>
 	<font color="#000000">
-		<font face="times new roman">
+		<font face="times new roman, times, serif">
 			<font size="3">unordered</font>
 		</font>
 	</font>
@@ -126,7 +126,7 @@
 		</span>
 	</span>
 	<font color="#000000">
-		<font face="times new roman">
+		<font face="times new roman, times, serif">
 			<font size="3">list</font>
 		</font>
 	</font>

diff --git a/tests/plugins/pastefromword/generated/_fixtures/Unordered_list/word2016/expected_edge.html b/tests/plugins/pastefromword/generated/_fixtures/Unordered_list/word2016/expected_edge.html
@@ -1,49 +1,49 @@
 <ul>
 	<li style="margin-bottom:16px; margin-left:48px; margin-top:16px">
 		<font color="#000000">
-			<font face="times new roman">
+			<font face="times new roman, times, serif">
 				<font size="3">this</font>
 			</font>
 		</font>
 	</li>
 	<li style="margin-bottom:16px; margin-left:48px; margin-top:16px">
 		<font color="#000000">
-			<font face="times new roman">
+			<font face="times new roman, times, serif">
 				<font size="3">is</font>
 			</font>
 		</font>
 	</li>
 	<li style="margin-bottom:16px; margin-left:48px; margin-top:16px">
 		<font color="#000000">
-			<font face="times new roman">
+			<font face="times new roman, times, serif">
 				<font size="3">a</font>
 			</font>
 		</font>
 	</li>
 	<li style="margin-bottom:16px; margin-left:48px; margin-top:16px">
 		<font color="#000000">
-			<font face="times new roman">
+			<font face="times new roman, times, serif">
 				<font size="3">one</font>
 			</font>
 		</font>
 	</li>
 	<li style="margin-bottom:16px; margin-left:48px; margin-top:16px">
 		<font color="#000000">
-			<font face="times new roman">
+			<font face="times new roman, times, serif">
 				<font size="3">level</font>
 			</font>
 		</font>
 	</li>
 	<li style="margin-bottom:16px; margin-left:48px; margin-top:16px">
 		<font color="#000000">
-			<font face="times new roman">
+			<font face="times new roman, times, serif">
 				<font size="3">unordered</font>
 			</font>
 		</font>
 	</li>
 	<li style="margin-bottom:16px; margin-left:48px; margin-top:16px">
 		<font color="#000000">
-			<font face="times new roman">
+			<font face="times new roman, times, serif">
 				<font size="3">list</font>
 			</font>
 		</font>