8
0
Piotrek Koszuliński 6 лет назад
Родитель
Сommit
21dd8bfdd9

+ 2 - 1
packages/ckeditor5-engine/src/conversion/mapper.js

@@ -333,7 +333,8 @@ export default class Mapper {
 	}
 
 	/**
-	 * For given `viewPosition`, finds and returns the closest ancestor that is mapped to an element in model.
+	 * For given `viewPosition`, finds and returns the closest ancestor of this position that has a mapping to
+	 * the model.
 	 *
 	 * @param {module:engine/model/view/position~Position} viewPosition Position for which mapped ancestor should be found.
 	 * @returns {module:engine/model/view/element~Element}

+ 16 - 14
packages/ckeditor5-engine/tests/conversion/mapper.js

@@ -722,26 +722,28 @@ describe( 'Mapper', () => {
 		} );
 	} );
 
-	it( 'findMappedViewAncestor should return for given view position the closest ancestor which is mapped to a model element', () => {
-		const mapper = new Mapper();
+	describe( 'findMappedViewAncestor()', () => {
+		it( 'should return for given view position the closest ancestor which is mapped to a model element', () => {
+			const mapper = new Mapper();
 
-		const modelP = new ModelElement( 'p' );
-		const modelDiv = new ModelElement( 'div' );
+			const modelP = new ModelElement( 'p' );
+			const modelDiv = new ModelElement( 'div' );
 
-		const viewText = new ViewText( 'foo' );
-		const viewSpan = new ViewElement( 'span', null, viewText );
-		const viewP = new ViewElement( 'p', null, viewSpan );
-		const viewDiv = new ViewElement( 'div', null, viewP );
+			const viewText = new ViewText( 'foo' );
+			const viewSpan = new ViewElement( 'span', null, viewText );
+			const viewP = new ViewElement( 'p', null, viewSpan );
+			const viewDiv = new ViewElement( 'div', null, viewP );
 
-		mapper.bindElements( modelP, viewP );
-		mapper.bindElements( modelDiv, viewDiv );
+			mapper.bindElements( modelP, viewP );
+			mapper.bindElements( modelDiv, viewDiv );
 
-		// <div><p><span>f{}oo</span></p></div>.
+			// <div><p><span>f{}oo</span></p></div>
 
-		const viewPosition = new ViewPosition( viewText, 1 );
+			const viewPosition = new ViewPosition( viewText, 1 );
 
-		const viewMappedAncestor = mapper.findMappedViewAncestor( viewPosition );
+			const viewMappedAncestor = mapper.findMappedViewAncestor( viewPosition );
 
-		expect( viewMappedAncestor ).to.equal( viewP );
+			expect( viewMappedAncestor ).to.equal( viewP );
+		} );
 	} );
 } );

+ 5 - 5
packages/ckeditor5-engine/tests/model/schema.js

@@ -2793,35 +2793,35 @@ describe( 'Schema', () => {
 			expect( schema.isLimit( 'paragraph' ) ).to.be.false;
 			expect( schema.isBlock( 'paragraph' ) ).to.be.true;
 			expect( schema.isObject( 'paragraph' ) ).to.be.false;
-			expect( schema.isInline( '$root' ) ).to.be.false;
+			expect( schema.isInline( 'paragraph' ) ).to.be.false;
 		} );
 
 		it( 'heading1 is block', () => {
 			expect( schema.isLimit( 'heading1' ) ).to.be.false;
 			expect( schema.isBlock( 'heading1' ) ).to.be.true;
 			expect( schema.isObject( 'heading1' ) ).to.be.false;
-			expect( schema.isInline( '$root' ) ).to.be.false;
+			expect( schema.isInline( 'heading1' ) ).to.be.false;
 		} );
 
 		it( 'listItem is block', () => {
 			expect( schema.isLimit( 'listItem' ) ).to.be.false;
 			expect( schema.isBlock( 'listItem' ) ).to.be.true;
 			expect( schema.isObject( 'listItem' ) ).to.be.false;
-			expect( schema.isInline( '$root' ) ).to.be.false;
+			expect( schema.isInline( 'lisItem' ) ).to.be.false;
 		} );
 
 		it( 'image is block object', () => {
 			expect( schema.isLimit( 'image' ) ).to.be.true;
 			expect( schema.isBlock( 'image' ) ).to.be.true;
 			expect( schema.isObject( 'image' ) ).to.be.true;
-			expect( schema.isInline( '$root' ) ).to.be.false;
+			expect( schema.isInline( 'image' ) ).to.be.false;
 		} );
 
 		it( 'caption is limit', () => {
 			expect( schema.isLimit( 'caption' ) ).to.be.true;
 			expect( schema.isBlock( 'caption' ) ).to.be.false;
 			expect( schema.isObject( 'caption' ) ).to.be.false;
-			expect( schema.isInline( '$root' ) ).to.be.false;
+			expect( schema.isInline( 'caption' ) ).to.be.false;
 		} );
 	} );