Merge pull request #1199 from ckeditor/t/1177

Tests: Fixed failed tests on other browsers than Chrome when using BrowserStack. Closes #1177.
ckeditor · Dec 5, 2017 · 7755349 · 7755349
2 parents 53ad06c + f11d08f
commit 7755349
Show file tree

Hide file tree

Showing 7 changed files with 408 additions and 97 deletions.
diff --git a/src/view/domconverter.js b/src/view/domconverter.js
@@ -1061,7 +1061,9 @@ export default class DomConverter {
 
 		const direction = getNext ? 'nextNode' : 'previousNode';
 		const document = node.ownerDocument;
-		const treeWalker = document.createTreeWalker( document.childNodes[ 0 ], NodeFilter.SHOW_TEXT );
+		const topmostParent = getAncestors( node )[ 0 ];
+
+		const treeWalker = document.createTreeWalker( topmostParent, NodeFilter.SHOW_TEXT );
 
 		treeWalker.currentNode = node;
 

diff --git a/tests/controller/editingcontroller.js b/tests/controller/editingcontroller.js
@@ -137,6 +137,8 @@ describe( 'EditingController', () => {
 			editing = new EditingController( model );
 
 			domRoot = document.createElement( 'div' );
+			domRoot.contentEditable = true;
+
 			document.body.appendChild( domRoot );
 			viewRoot = editing.createRoot( domRoot );
 
@@ -218,12 +220,15 @@ describe( 'EditingController', () => {
 					expect( getModelData( model ) ).to.equal(
 						'<paragraph>foo</paragraph>' +
 						'<paragraph></paragraph>' +
-						'<paragraph>b[a]r</paragraph>' );
+						'<paragraph>b[a]r</paragraph>'
+					);
+
 					done();
 				} );
 			} );
 
 			editing.view.isFocused = true;
+			editing.view.render();
 
 			const domSelection = document.getSelection();
 			domSelection.removeAllRanges();