Merge branch i/6324 to master.

Internal: Aligned to changes in ckeditor/ckeditor5#6381.
ckeditor · Mar 12, 2020 · 2679734 · 2679734
2 parents b083d27 + 60dba59
commit 2679734
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/tests/_utils/classictesteditor.js b/tests/_utils/classictesteditor.js
@@ -34,7 +34,7 @@ export default class ClassicTestEditor extends Editor {
 		}
 
 		// Use the HTML data processor in this editor.
-		this.data.processor = new HtmlDataProcessor( this.editing.view.document );
+		this.data.processor = new HtmlDataProcessor( this.data.viewDocument );
 
 		// Create the ("main") root element of the model tree.
 		this.model.document.createRoot();

diff --git a/tests/_utils/modeltesteditor.js b/tests/_utils/modeltesteditor.js
@@ -21,7 +21,7 @@ export default class ModelTestEditor extends Editor {
 		super( config );
 
 		// Use the HTML data processor in this editor.
-		this.data.processor = new HtmlDataProcessor( this.editing.view.document );
+		this.data.processor = new HtmlDataProcessor( this.data.viewDocument );
 
 		// Disable editing pipeline.
 		this.editing.destroy();

diff --git a/tests/_utils/virtualtesteditor.js b/tests/_utils/virtualtesteditor.js
@@ -21,7 +21,7 @@ export default class VirtualTestEditor extends Editor {
 		super( config );
 
 		// Use the HTML data processor in this editor.
-		this.data.processor = new HtmlDataProcessor( this.editing.view.document );
+		this.data.processor = new HtmlDataProcessor( this.data.viewDocument );
 
 		// Create the ("main") root element of the model tree.
 		this.model.document.createRoot();

diff --git a/tests/editor/utils/attachtoform.js b/tests/editor/utils/attachtoform.js
@@ -31,7 +31,7 @@ describe( 'attachToForm()', () => {
 		mix( CustomEditor, ElementApiMixin );
 
 		editor = new CustomEditor();
-		editor.data.processor = new HtmlDataProcessor( editor.editing.view.document );
+		editor.data.processor = new HtmlDataProcessor( editor.data.viewDocument );
 		editor.model.document.createRoot();
 		editor.model.schema.extend( '$text', { allowIn: '$root' } );
 		editor.fire( 'ready' );

diff --git a/tests/editor/utils/dataapimixin.js b/tests/editor/utils/dataapimixin.js
@@ -18,7 +18,7 @@ describe( 'DataApiMixin', () => {
 		mix( CustomEditor, DataApiMixin );
 
 		editor = new CustomEditor();
-		editor.data.processor = new HtmlDataProcessor( editor.editing.view.document );
+		editor.data.processor = new HtmlDataProcessor( editor.data.viewDocument );
 		editor.model.document.createRoot( '$root', 'main' );
 		editor.model.document.createRoot( '$root', 'secondRoot' );
 		editor.model.schema.extend( '$text', { allowIn: '$root' } );

diff --git a/tests/editor/utils/elementapimixin.js b/tests/editor/utils/elementapimixin.js
@@ -21,7 +21,7 @@ describe( 'ElementApiMixin', () => {
 		mix( CustomEditor, ElementApiMixin );
 
 		editor = new CustomEditor();
-		editor.data.processor = new HtmlDataProcessor( editor.editing.view.document );
+		editor.data.processor = new HtmlDataProcessor( editor.data.viewDocument );
 		editor.model.document.createRoot();
 		editor.model.schema.extend( '$text', { allowIn: '$root' } );
 		editor.fire( 'ready' ); // (#6139)