Requested changes during the review.

ckeditor · Feb 24, 2020 · c6a7495 · c6a7495
1 parent 0498e42
commit c6a7495
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/src/filters/parse.js b/src/filters/parse.js
@@ -62,15 +62,16 @@ export function parseHtml( htmlString ) {
 // @param {Document} htmlDocument Native `Document` object to be transformed.
 // @returns {module:engine/view/documentfragment~DocumentFragment}
 function documentToView( htmlDocument ) {
-	const domConverter = new DomConverter( { blockFillerMode: 'nbsp' } );
+	const viewDocument = new ViewDocument( new StylesProcessor() );
+	const domConverter = new DomConverter( viewDocument, { blockFillerMode: 'nbsp' } );
 	const fragment = htmlDocument.createDocumentFragment();
 	const nodes = htmlDocument.body.childNodes;
 
 	while ( nodes.length > 0 ) {
 		fragment.appendChild( nodes[ 0 ] );
 	}
 
-	return domConverter.domToView( new ViewDocument( new StylesProcessor() ), fragment );
+	return domConverter.domToView( fragment );
 }
 
 // Extracts both `CSSStyleSheet` and string representation from all `style` elements available in a provided `htmlDocument`.

diff --git a/tests/_utils/utils.js b/tests/_utils/utils.js
@@ -7,6 +7,7 @@
 
 import VirtualTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/virtualtesteditor';
 import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';
+import ViewDocument from '@ckeditor/ckeditor5-engine/src/view/document';
 
 import HtmlDataProcessor from '@ckeditor/ckeditor5-engine/src/dataprocessor/htmldataprocessor';
 import normalizeClipboardData from '@ckeditor/ckeditor5-clipboard/src/utils/normalizeclipboarddata';
@@ -18,7 +19,7 @@ import { assertEqualMarkup } from '@ckeditor/ckeditor5-utils/tests/_utils/utils'
 import { fixtures, browserFixtures } from './fixtures';
 import { StylesProcessor } from '@ckeditor/ckeditor5-engine/src/view/stylesmap';
 
-const htmlDataProcessor = new HtmlDataProcessor( new StylesProcessor() );
+const htmlDataProcessor = new HtmlDataProcessor( new ViewDocument( new StylesProcessor() ) );
 
 /**
  * Mocks dataTransfer object which can be used for simulating paste.

diff --git a/tests/filters/list.js b/tests/filters/list.js
@@ -16,7 +16,7 @@ import { StylesProcessor } from '@ckeditor/ckeditor5-engine/src/view/stylesmap';
 
 describe( 'PasteFromOffice - filters', () => {
 	describe( 'list - paste from MS Word', () => {
-		const htmlDataProcessor = new HtmlDataProcessor( new StylesProcessor() );
+		const htmlDataProcessor = new HtmlDataProcessor( new Document( new StylesProcessor() ) );
 
 		describe( 'transformListItemLikeElementsIntoLists()', () => {
 			it( 'replaces list-like elements with semantic lists', () => {
@@ -85,12 +85,12 @@ describe( 'PasteFromOffice - filters', () => {
 	} );
 
 	describe( 'list - paste from google docs', () => {
-		const htmlDataProcessor = new HtmlDataProcessor( new StylesProcessor() );
-		let writer, viewDocument;
+		let writer, viewDocument, htmlDataProcessor;
 
-		before( () => {
-			viewDocument = new Document();
+		beforeEach( () => {
+			viewDocument = new Document( new StylesProcessor() );
 			writer = new UpcastWriter( viewDocument );
+			htmlDataProcessor = new HtmlDataProcessor( viewDocument );
 		} );
 
 		describe( 'unwrapParagraphInListItem', () => {

diff --git a/tests/filters/reomoveboldwrapper.js b/tests/filters/reomoveboldwrapper.js
@@ -10,7 +10,7 @@ import Document from '@ckeditor/ckeditor5-engine/src/view/document';
 import { StylesProcessor } from '@ckeditor/ckeditor5-engine/src/view/stylesmap';
 
 describe( 'PasteFromOffice - filters', () => {
-	const htmlDataProcessor = new HtmlDataProcessor( new StylesProcessor() );
+	const htmlDataProcessor = new HtmlDataProcessor( new Document( new StylesProcessor() ) );
 	describe( 'removeBoldWrapper', () => {
 		let writer, viewDocument;
 

diff --git a/tests/pastefromoffice.js b/tests/pastefromoffice.js
@@ -11,9 +11,10 @@ import { createDataTransfer } from './_utils/utils';
 import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
 import { StylesProcessor } from '@ckeditor/ckeditor5-engine/src/view/stylesmap';
+import ViewDocument from '@ckeditor/ckeditor5-engine/src/view/document';
 
 describe( 'PasteFromOffice', () => {
-	const htmlDataProcessor = new HtmlDataProcessor( new StylesProcessor() );
+	const htmlDataProcessor = new HtmlDataProcessor( new ViewDocument( new StylesProcessor() ) );
 	let editor, pasteFromOffice, clipboard;
 
 	testUtils.createSinonSandbox();