From 60b4261ae08dd887deab5fa77b4555f42ede7150 Mon Sep 17 00:00:00 2001
From: Marek Lewandowski <m.lewandowski@cksource.com>
Date: Tue, 14 Mar 2017 17:15:17 +0100
Subject: [PATCH] Fixed tests.

---
 tests/core/selection/editor.js    |  5 +++++
 tests/core/selection/selection.js | 28 ++++++----------------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/tests/core/selection/editor.js b/tests/core/selection/editor.js
index 836a5eb03ed..dba17d55f64 100644
--- a/tests/core/selection/editor.js
+++ b/tests/core/selection/editor.js
@@ -422,6 +422,8 @@ bender.test( {
 				editor.setData( '<p id="p">foo<em>bar</em></p>' );
 				editor.setMode( 'wysiwyg', function() {
 					resume( function() {
+						// Editor needs to have focus to remove FC on keydown. (#14714)
+						editor.focus();
 						// TC1 - on keydown
 						// <p>foo^<em>...
 						var range = editor.createRange();
@@ -541,6 +543,9 @@ bender.test( {
 
 		this.assertFillingChar( editable, uEl, 'abc', 'after typing' );
 
+		// Editor needs to have focus to remove FC on keydown. (#14714)
+		editor.focus();
+
 		// Mock LEFT arrow.
 		editor.document.fire( 'keydown', new CKEDITOR.dom.event( { keyCode: 37 } ) );
 
diff --git a/tests/core/selection/selection.js b/tests/core/selection/selection.js
index c1f53f0573c..764f88d71bb 100644
--- a/tests/core/selection/selection.js
+++ b/tests/core/selection/selection.js
@@ -697,29 +697,13 @@ bender.test( {
 		assert.isFalse( preventSpy.called, 'preventDefault() on keydown was called' );
 	},
 
-	'test remove filling char sequence on keydown': function() {
-		var editable = this.editor.editable();
-		var fillingCharSequence = CKEDITOR.tools.repeat( '\u200b', 7 );
-
-		var par = this.editor.document.$.createElement( 'p' );
-		var span = this.editor.document.$.createElement( 'span' );
-		var text = editable.getDocument().createText( fillingCharSequence );
-
-		par.appendChild( span );
-		span.appendChild( text.$ );
-
-		editable.setCustomData( 'cke-fillingChar', text );
-		editable.focus();
-		editable.$.innerHTML = '';
-		editable.$.appendChild( par );
-
-		assert.areEqual( 7, editable.$.innerText.length, 'before' );
-		this.editor.document.fire( 'keydown', new CKEDITOR.dom.event( { keyCode: 46 } ) );
-
-		assert.areEqual( 0, editable.$.innerText.length );
-	},
-
+	// (#14714)
 	'test remove filling char sequence on keydown blur': function() {
+		if ( !CKEDITOR.env.webkit ) {
+			assert.ignore();
+		}
+
+		// If editor has no focus, filling character should not be removed in WebKits. (#14714)
 		var editable = this.editor.editable();
 		var fillingCharSequence = CKEDITOR.tools.repeat( '\u200b', 7 );