Parcourir la source

Adjusted all tests.

Kamil Piechaczek il y a 5 ans
Parent
commit
fc4561842c

+ 11 - 11
packages/ckeditor5-engine/tests/view/domconverter/binding.js

@@ -60,7 +60,7 @@ describe( 'DomConverter', () => {
 
 		it( 'should return corresponding view document fragment', () => {
 			const domFragment = document.createDocumentFragment();
-			const viewFragment = converter.domToView( domFragment );
+			const viewFragment = converter.domToView( viewDocument, domFragment );
 
 			converter.bindElements( domFragment, viewFragment );
 
@@ -83,7 +83,7 @@ describe( 'DomConverter', () => {
 
 			converter.bindElements( domImg, viewImg );
 
-			const viewP = converter.domToView( domP );
+			const viewP = converter.domToView( viewDocument, domP );
 			const viewText = viewP.getChild( 1 );
 
 			expect( converter.findCorrespondingViewText( domText ) ).to.equal( viewText );
@@ -93,7 +93,7 @@ describe( 'DomConverter', () => {
 			const domText = document.createTextNode( 'foo' );
 			const domP = createElement( document, 'p', null, domText );
 
-			const viewP = converter.domToView( domP );
+			const viewP = converter.domToView( viewDocument, domP );
 			const viewText = viewP.getChild( 0 );
 
 			converter.bindElements( domP, viewP );
@@ -106,7 +106,7 @@ describe( 'DomConverter', () => {
 			const domText = document.createTextNode( 'foo' );
 			const domP = createElement( document, 'p', null, [ domImg, domText ] );
 
-			const viewP = converter.domToView( domP );
+			const viewP = converter.domToView( viewDocument, domP );
 
 			converter.bindElements( domP, viewP );
 
@@ -118,7 +118,7 @@ describe( 'DomConverter', () => {
 			const domTextBar = document.createTextNode( 'bar' );
 			const domP = createElement( document, 'p', null, [ domTextFoo, domTextBar ] );
 
-			const viewP = converter.domToView( domP );
+			const viewP = converter.domToView( viewDocument, domP );
 
 			converter.bindElements( domP, viewP );
 
@@ -136,7 +136,7 @@ describe( 'DomConverter', () => {
 			const domFiller = document.createTextNode( INLINE_FILLER );
 			const domP = createElement( document, 'p', null, domFiller );
 
-			const viewP = converter.domToView( domP );
+			const viewP = converter.domToView( viewDocument, domP );
 
 			converter.bindElements( domP, viewP );
 
@@ -209,7 +209,7 @@ describe( 'DomConverter', () => {
 
 			converter.bindElements( domImg, viewImg );
 
-			const viewP = converter.domToView( domP );
+			const viewP = converter.domToView( viewDocument, domP );
 			const viewText = viewP.getChild( 1 );
 
 			expect( converter.findCorrespondingDomText( viewText ) ).to.equal( domText );
@@ -221,7 +221,7 @@ describe( 'DomConverter', () => {
 
 			domP.appendChild( domText );
 
-			const viewP = converter.domToView( domP );
+			const viewP = converter.domToView( viewDocument, domP );
 			const viewText = viewP.getChild( 0 );
 
 			converter.bindElements( domP, viewP );
@@ -237,7 +237,7 @@ describe( 'DomConverter', () => {
 			domP.appendChild( domImg );
 			domP.appendChild( domText );
 
-			const viewP = converter.domToView( domP );
+			const viewP = converter.domToView( viewDocument, domP );
 			const viewText = viewP.getChild( 1 );
 
 			converter.bindElements( domP, viewP );
@@ -251,7 +251,7 @@ describe( 'DomConverter', () => {
 
 			domP.appendChild( domText );
 
-			const viewP = converter.domToView( domP );
+			const viewP = converter.domToView( viewDocument, domP );
 			const viewText = viewP.getChild( 0 );
 
 			expect( converter.findCorrespondingDomText( viewText ) ).to.be.null;
@@ -259,7 +259,7 @@ describe( 'DomConverter', () => {
 
 		it( 'should return null if there is no previous sibling and parent', () => {
 			const domText = document.createTextNode( 'foo' );
-			const viewText = converter.domToView( domText );
+			const viewText = converter.domToView( viewDocument, domText );
 
 			expect( converter.findCorrespondingDomText( viewText ) ).to.be.null;
 		} );

+ 41 - 41
packages/ckeditor5-engine/tests/view/domconverter/dom-to-view.js

@@ -35,7 +35,7 @@ describe( 'DomConverter', () => {
 
 			converter.bindElements( domImg, viewImg );
 
-			const viewP = converter.domToView( domP );
+			const viewP = converter.domToView( viewDocument, domP );
 
 			expect( viewP ).to.be.an.instanceof( ViewElement );
 			expect( viewP.name ).to.equal( 'p' );
@@ -56,7 +56,7 @@ describe( 'DomConverter', () => {
 			const domText = document.createTextNode( 'foo' );
 			const domP = createElement( document, 'p', { 'class': 'foo' }, [ domImg, domText ] );
 
-			const viewP = converter.domToView( domP, { bind: true } );
+			const viewP = converter.domToView( viewDocument, domP, { bind: true } );
 
 			expect( viewP ).to.be.an.instanceof( ViewElement );
 			expect( viewP.name ).to.equal( 'p' );
@@ -76,7 +76,7 @@ describe( 'DomConverter', () => {
 			const domText = document.createTextNode( 'நிலைக்கு' );
 			const domP = createElement( document, 'p', { 'class': 'foo' }, [ domText ] );
 
-			const viewP = converter.domToView( domP, { bind: true } );
+			const viewP = converter.domToView( viewDocument, domP, { bind: true } );
 
 			expect( viewP.childCount ).to.equal( 1 );
 
@@ -96,7 +96,7 @@ describe( 'DomConverter', () => {
 
 			converter.bindElements( domImg, viewImg );
 
-			const viewP = converter.domToView( domP, { withChildren: false } );
+			const viewP = converter.domToView( viewDocument, domP, { withChildren: false } );
 
 			expect( viewP ).to.be.an.instanceof( ViewElement );
 			expect( viewP.name ).to.equal( 'p' );
@@ -116,7 +116,7 @@ describe( 'DomConverter', () => {
 			domFragment.appendChild( domImg );
 			domFragment.appendChild( domText );
 
-			const viewFragment = converter.domToView( domFragment, { bind: true } );
+			const viewFragment = converter.domToView( viewDocument, domFragment, { bind: true } );
 
 			expect( viewFragment ).to.be.an.instanceof( ViewDocumentFragment );
 			expect( viewFragment.childCount ).to.equal( 2 );
@@ -139,7 +139,7 @@ describe( 'DomConverter', () => {
 
 			converter.bindElements( domImg, viewImg );
 
-			const viewFragment = converter.domToView( domFragment, { withChildren: false } );
+			const viewFragment = converter.domToView( viewDocument, domFragment, { withChildren: false } );
 
 			expect( viewFragment ).to.be.an.instanceof( ViewDocumentFragment );
 
@@ -153,7 +153,7 @@ describe( 'DomConverter', () => {
 
 			converter.bindDocumentFragments( domFragment, viewFragment );
 
-			const viewFragment2 = converter.domToView( domFragment );
+			const viewFragment2 = converter.domToView( viewDocument, domFragment );
 
 			expect( viewFragment2 ).to.equal( viewFragment );
 		} );
@@ -162,19 +162,19 @@ describe( 'DomConverter', () => {
 			// eslint-disable-next-line new-cap
 			const domFiller = BR_FILLER( document );
 
-			expect( converter.domToView( domFiller ) ).to.be.null;
+			expect( converter.domToView( viewDocument, domFiller ) ).to.be.null;
 		} );
 
 		it( 'should return null for empty text node', () => {
 			const textNode = document.createTextNode( '' );
 
-			expect( converter.domToView( textNode ) ).to.be.null;
+			expect( converter.domToView( viewDocument, textNode ) ).to.be.null;
 		} );
 
 		it( 'should return null for a comment', () => {
 			const comment = document.createComment( 'abc' );
 
-			expect( converter.domToView( comment ) ).to.be.null;
+			expect( converter.domToView( viewDocument, comment ) ).to.be.null;
 		} );
 
 		describe( 'it should clear whitespaces', () => {
@@ -189,7 +189,7 @@ describe( 'DomConverter', () => {
 					] )
 				] );
 
-				const viewDiv = converter.domToView( domDiv );
+				const viewDiv = converter.domToView( viewDocument, domDiv );
 
 				expect( viewDiv.childCount ).to.equal( 2 );
 				expect( viewDiv.getChild( 0 ).getChild( 0 ).data ).to.equal( 'foo' );
@@ -207,7 +207,7 @@ describe( 'DomConverter', () => {
 					document.createTextNode( ' ' )
 				] );
 
-				const viewDiv = converter.domToView( domDiv );
+				const viewDiv = converter.domToView( viewDocument, domDiv );
 
 				expect( viewDiv.childCount ).to.equal( 2 );
 				expect( viewDiv.getChild( 0 ).getChild( 0 ).data ).to.equal( 'foo' );
@@ -222,7 +222,7 @@ describe( 'DomConverter', () => {
 					document.createTextNode( ' ' )
 				] );
 
-				const viewDiv = converter.domToView( domDiv );
+				const viewDiv = converter.domToView( viewDocument, domDiv );
 
 				expect( viewDiv.childCount ).to.equal( 1 );
 				expect( viewDiv.getChild( 0 ).getChild( 0 ).data ).to.equal( 'foo' );
@@ -236,7 +236,7 @@ describe( 'DomConverter', () => {
 					document.createTextNode( '\n' )
 				] );
 
-				const viewDiv = converter.domToView( domDiv );
+				const viewDiv = converter.domToView( viewDocument, domDiv );
 
 				expect( viewDiv.childCount ).to.equal( 1 );
 				expect( viewDiv.getChild( 0 ).getChild( 0 ).data ).to.equal( 'foo' );
@@ -250,7 +250,7 @@ describe( 'DomConverter', () => {
 					document.createTextNode( '\r' )
 				] );
 
-				const viewDiv = converter.domToView( domDiv );
+				const viewDiv = converter.domToView( viewDocument, domDiv );
 
 				expect( viewDiv.childCount ).to.equal( 1 );
 				expect( viewDiv.getChild( 0 ).getChild( 0 ).data ).to.equal( 'foo' );
@@ -264,7 +264,7 @@ describe( 'DomConverter', () => {
 					document.createTextNode( '\t' )
 				] );
 
-				const viewDiv = converter.domToView( domDiv );
+				const viewDiv = converter.domToView( viewDocument, domDiv );
 
 				expect( viewDiv.childCount ).to.equal( 1 );
 				expect( viewDiv.getChild( 0 ).getChild( 0 ).data ).to.equal( 'foo' );
@@ -282,7 +282,7 @@ describe( 'DomConverter', () => {
 					] )
 				] );
 
-				const viewDiv = converter.domToView( domDiv );
+				const viewDiv = converter.domToView( viewDocument, domDiv );
 
 				expect( viewDiv.childCount ).to.equal( 2 );
 				expect( viewDiv.getChild( 0 ).getChild( 0 ).data )
@@ -299,7 +299,7 @@ describe( 'DomConverter', () => {
 					] )
 				] );
 
-				const viewDiv = converter.domToView( domDiv );
+				const viewDiv = converter.domToView( viewDocument, domDiv );
 
 				expect( viewDiv.childCount ).to.equal( 1 );
 				expect( viewDiv.getChild( 0 ).getChild( 0 ).data ).to.equal( 'foo' );
@@ -313,7 +313,7 @@ describe( 'DomConverter', () => {
 					] )
 				] );
 
-				const viewDiv = converter.domToView( domDiv );
+				const viewDiv = converter.domToView( viewDocument, domDiv );
 
 				expect( viewDiv.childCount ).to.equal( 1 );
 				expect( viewDiv.getChild( 0 ).getChild( 0 ).data ).to.equal( 'foo' );
@@ -326,7 +326,7 @@ describe( 'DomConverter', () => {
 					document.createTextNode( ' bar' )
 				] );
 
-				const viewP = converter.domToView( domP );
+				const viewP = converter.domToView( viewDocument, domP );
 
 				expect( viewP.childCount ).to.equal( 3 );
 				expect( viewP.getChild( 2 ).data ).to.equal( 'bar' );
@@ -339,7 +339,7 @@ describe( 'DomConverter', () => {
 					document.createTextNode( ' \u00a0bar' )
 				] );
 
-				const viewP = converter.domToView( domP );
+				const viewP = converter.domToView( viewDocument, domP );
 
 				expect( viewP.childCount ).to.equal( 3 );
 				expect( viewP.getChild( 2 ).data ).to.equal( ' bar' );
@@ -354,7 +354,7 @@ describe( 'DomConverter', () => {
 					document.createTextNode( ' bar' )
 				] );
 
-				const viewP = converter.domToView( domP );
+				const viewP = converter.domToView( viewDocument, domP );
 
 				expect( viewP.childCount ).to.equal( 3 );
 				expect( viewP.getChild( 2 ).data ).to.equal( 'bar' );
@@ -369,7 +369,7 @@ describe( 'DomConverter', () => {
 					] )
 				] );
 
-				const viewP = converter.domToView( domP );
+				const viewP = converter.domToView( viewDocument, domP );
 
 				expect( viewP.childCount ).to.equal( 3 );
 				expect( viewP.getChild( 2 ).getChild( 0 ).data ).to.equal( 'bar' );
@@ -384,7 +384,7 @@ describe( 'DomConverter', () => {
 					document.createTextNode( 'x' )
 				] );
 
-				const viewP = converter.domToView( domP );
+				const viewP = converter.domToView( viewDocument, domP );
 
 				expect( viewP.childCount ).to.equal( 5 );
 				expect( viewP.getChild( 2 ).data ).to.equal( 'foo ' );
@@ -400,7 +400,7 @@ describe( 'DomConverter', () => {
 					] )
 				] );
 
-				const viewDiv = converter.domToView( domDiv );
+				const viewDiv = converter.domToView( viewDocument, domDiv );
 
 				expect( viewDiv.getChild( 0 ).getChild( 0 ).data ).to.equal( 'f o o' );
 				expect( viewDiv.getChild( 1 ).getChild( 0 ).data ).to.equal( 'fo o' );
@@ -415,7 +415,7 @@ describe( 'DomConverter', () => {
 					document.createTextNode( '\n\n \t\r\n' )
 				] );
 
-				const viewDiv = converter.domToView( domDiv );
+				const viewDiv = converter.domToView( viewDocument, domDiv );
 
 				expect( viewDiv.childCount ).to.equal( 1 );
 				expect( viewDiv.getChild( 0 ).getChild( 0 ).data ).to.equal( 'f o o' );
@@ -433,7 +433,7 @@ describe( 'DomConverter', () => {
 						domElement.appendChild( document.createTextNode( text.replace( /_/g, '\u00A0' ) ) );
 					}
 
-					const viewElement = converter.domToView( domElement );
+					const viewElement = converter.domToView( viewDocument, domElement );
 
 					let data = '';
 
@@ -523,7 +523,7 @@ describe( 'DomConverter', () => {
 					] )
 				] );
 
-				const viewDiv = converter.domToView( domDiv );
+				const viewDiv = converter.domToView( viewDocument, domDiv );
 
 				expect( viewDiv.getChild( 0 ).getChild( 0 ).data ).to.equal( '   foo\n   foo  ' );
 			} );
@@ -538,7 +538,7 @@ describe( 'DomConverter', () => {
 					document.createTextNode( 'word' )
 				] );
 
-				const viewDiv = converter.domToView( domDiv );
+				const viewDiv = converter.domToView( viewDocument, domDiv );
 
 				expect( viewDiv.getChild( 1 ).name ).to.equal( 'span' );
 				expect( viewDiv.getChild( 1 ).childCount ).to.equal( 1 );
@@ -555,7 +555,7 @@ describe( 'DomConverter', () => {
 					document.createTextNode( 'word' )
 				] );
 
-				const viewDiv = converter.domToView( domDiv );
+				const viewDiv = converter.domToView( viewDocument, domDiv );
 
 				expect( viewDiv.getChild( 1 ).name ).to.equal( 'span' );
 				expect( viewDiv.getChild( 1 ).childCount ).to.equal( 1 );
@@ -579,7 +579,7 @@ describe( 'DomConverter', () => {
 					] )
 				] );
 
-				const viewDiv = converter.domToView( domDiv );
+				const viewDiv = converter.domToView( viewDocument, domDiv );
 
 				expect( viewDiv.getChild( 0 ).name ).to.equal( 'span' );
 				expect( viewDiv.getChild( 0 ).childCount ).to.equal( 2 );
@@ -597,7 +597,7 @@ describe( 'DomConverter', () => {
 					createElement( document, 'br' )
 				] );
 
-				const viewP = converter.domToView( domP );
+				const viewP = converter.domToView( viewDocument, domP );
 
 				expect( viewP.childCount ).to.equal( 2 );
 				expect( viewP.getChild( 0 ).data ).to.equal( 'foo ' );
@@ -609,7 +609,7 @@ describe( 'DomConverter', () => {
 					createElement( document, 'br' )
 				] );
 
-				const viewP = converter.domToView( domP );
+				const viewP = converter.domToView( viewDocument, domP );
 
 				expect( viewP.childCount ).to.equal( 2 );
 				expect( viewP.getChild( 0 ).data ).to.equal( 'foo  ' );
@@ -621,7 +621,7 @@ describe( 'DomConverter', () => {
 					createElement( document, 'br' )
 				] );
 
-				const viewP = converter.domToView( domP );
+				const viewP = converter.domToView( viewDocument, domP );
 
 				expect( viewP.childCount ).to.equal( 2 );
 				expect( viewP.getChild( 0 ).data ).to.equal( 'foo ' );
@@ -635,7 +635,7 @@ describe( 'DomConverter', () => {
 					createElement( document, 'br' )
 				] );
 
-				const viewP = converter.domToView( domP );
+				const viewP = converter.domToView( viewDocument, domP );
 
 				expect( viewP.childCount ).to.equal( 2 );
 				expect( viewP.getChild( 0 ).getChild( 0 ).data ).to.equal( 'foo ' );
@@ -649,7 +649,7 @@ describe( 'DomConverter', () => {
 		describe( 'clearing auto filler', () => {
 			it( 'should remove inline filler when converting dom to view', () => {
 				const text = document.createTextNode( INLINE_FILLER + 'foo' );
-				const view = converter.domToView( text );
+				const view = converter.domToView( viewDocument, text );
 
 				expect( view.data ).to.equal( 'foo' );
 			} );
@@ -657,14 +657,14 @@ describe( 'DomConverter', () => {
 			// See https://github.com/ckeditor/ckeditor5/issues/692.
 			it( 'should not remove space after inline filler if previous node nor next node does not exist', () => {
 				const text = document.createTextNode( INLINE_FILLER + ' ' );
-				const view = converter.domToView( text );
+				const view = converter.domToView( viewDocument, text );
 
 				expect( view.data ).to.equal( ' ' );
 			} );
 
 			it( 'should convert non breaking space to normal space after inline filler', () => {
 				const text = document.createTextNode( INLINE_FILLER + '\u00A0' );
-				const view = converter.domToView( text );
+				const view = converter.domToView( viewDocument, text );
 
 				expect( view.data ).to.equal( ' ' );
 			} );
@@ -677,7 +677,7 @@ describe( 'DomConverter', () => {
 			const domText = document.createTextNode( 'foo' );
 			const domP = createElement( document, 'p', null, [ domImg, domText ] );
 
-			const viewChildren = Array.from( converter.domChildrenToView( domP ) );
+			const viewChildren = Array.from( converter.domChildrenToView( viewDocument, domP ) );
 
 			expect( viewChildren.length ).to.equal( 2 );
 			expect( stringify( viewChildren[ 0 ] ) ).to.equal( '<img></img>' );
@@ -689,7 +689,7 @@ describe( 'DomConverter', () => {
 			const domFiller = BR_FILLER( document );
 			const domP = createElement( document, 'p', null, domFiller );
 
-			const viewChildren = Array.from( converter.domChildrenToView( domP ) );
+			const viewChildren = Array.from( converter.domChildrenToView( viewDocument, domP ) );
 
 			expect( viewChildren.length ).to.equal( 0 );
 		} );
@@ -699,7 +699,7 @@ describe( 'DomConverter', () => {
 			const domB = createElement( document, 'b', null, 'bar' );
 			const domP = createElement( document, 'p', null, [ domB, domText ] );
 
-			const viewChildren = Array.from( converter.domChildrenToView( domP, { withChildren: false } ) );
+			const viewChildren = Array.from( converter.domChildrenToView( viewDocument, domP, { withChildren: false } ) );
 
 			expect( viewChildren.length ).to.equal( 2 );
 			expect( stringify( viewChildren[ 0 ] ) ).to.equal( '<b></b>' );

+ 5 - 5
packages/ckeditor5-engine/tests/view/domconverter/uielement.js

@@ -63,7 +63,7 @@ describe( 'DOMConverter UIElement integration', () => {
 			const uiElement = createUIElement( 'div' );
 			const domElement = converter.viewToDom( uiElement, document, { bind: true } );
 
-			expect( converter.domToView( domElement ) ).to.equal( uiElement );
+			expect( converter.domToView( viewDocument, domElement ) ).to.equal( uiElement );
 		} );
 
 		it( 'should return UIElement for nodes inside', () => {
@@ -73,10 +73,10 @@ describe( 'DOMConverter UIElement integration', () => {
 			const domParagraph = domElement.childNodes[ 0 ];
 			const domSpan = domParagraph.childNodes[ 0 ];
 
-			expect( converter.domToView( domParagraph ) ).to.equal( uiElement );
-			expect( converter.domToView( domSpan ) ).to.be.equal( uiElement );
-			expect( converter.domToView( domParagraph.childNodes[ 0 ] ) ).equal( uiElement );
-			expect( converter.domToView( domSpan.childNodes[ 0 ] ) ).equal( uiElement );
+			expect( converter.domToView( viewDocument, domParagraph ) ).to.equal( uiElement );
+			expect( converter.domToView( viewDocument, domSpan ) ).to.be.equal( uiElement );
+			expect( converter.domToView( viewDocument, domParagraph.childNodes[ 0 ] ) ).equal( uiElement );
+			expect( converter.domToView( viewDocument, domSpan.childNodes[ 0 ] ) ).equal( uiElement );
 		} );
 	} );
 

+ 1 - 1
packages/ckeditor5-engine/tests/view/observer/domeventdata.js

@@ -19,7 +19,7 @@ describe( 'DomEventData', () => {
 		domRoot.innerHTML = '<div contenteditable="true" id="main"></div><div contenteditable="true" id="additional"></div>';
 		document.body.appendChild( domRoot );
 
-		viewBody = view.domConverter.domToView( document.body, { bind: true } );
+		viewBody = view.domConverter.domToView( viewDocument, document.body, { bind: true } );
 	} );
 
 	afterEach( () => {

+ 8 - 8
packages/ckeditor5-engine/tests/view/renderer.js

@@ -13,10 +13,7 @@ import ViewAttributeElement from '../../src/view/attributeelement';
 import ViewText from '../../src/view/text';
 import ViewRange from '../../src/view/range';
 import ViewPosition from '../../src/view/position';
-import ViewDocument from '../../src/view/document';
 import UIElement from '../../src/view/uielement';
-import DocumentSelection from '../../src/view/documentselection';
-import DomConverter from '../../src/view/domconverter';
 import Renderer from '../../src/view/renderer';
 import DocumentFragment from '../../src/view/documentfragment';
 import DowncastWriter from '../../src/view/downcastwriter';
@@ -31,15 +28,18 @@ import env from '@ckeditor/ckeditor5-utils/src/env';
 import { expectToThrowCKEditorError } from '@ckeditor/ckeditor5-utils/tests/_utils/utils';
 
 describe( 'Renderer', () => {
-	let selection, domConverter, renderer, viewDocument;
+	let view, selection, domConverter, renderer, viewDocument;
 
 	testUtils.createSinonSandbox();
 
 	beforeEach( () => {
-		selection = new DocumentSelection();
-		domConverter = new DomConverter();
-		viewDocument = new ViewDocument();
-		renderer = new Renderer( domConverter, selection );
+		view = new View();
+		viewDocument = view.document;
+
+		renderer = new Renderer( view );
+		domConverter = renderer.domConverter;
+		selection = renderer.selection;
+
 		renderer.domDocuments.add( document );
 	} );