Oskar Wróbel пре 9 година
родитељ
комит
f24b86bd2a

+ 11 - 0
packages/ckeditor5-engine/tests/conversion/buildmodelconverter.js

@@ -528,6 +528,17 @@ describe( 'Model converter builder', () => {
 				expect( viewToString( viewRoot ) ).to.equal( '<div><p>foobar</p></div>' );
 				expect( viewToString( viewRoot ) ).to.equal( '<div><p>foobar</p></div>' );
 			} );
 			} );
 		} );
 		} );
+
+		it( 'should overwrite default priority', () => {
+			range = ModelRange.createFromParentsAndOffsets( modelElement, 2, modelElement, 2 );
+
+			buildModelConverter().for( dispatcher ).fromMarker( 'search' ).toStamp( 'normal' );
+			buildModelConverter().for( dispatcher ).fromMarker( 'search' ).withPriority( 'high' ).toStamp( 'high' );
+
+			dispatcher.convertMarker( 'addMarker', 'search', range );
+
+			expect( viewToString( viewRoot ) ).to.equal( '<div><p>fo<high></high>obar</p></div>' );
+		} );
 	} );
 	} );
 
 
 	describe( 'withPriority', () => {
 	describe( 'withPriority', () => {

+ 9 - 5
packages/ckeditor5-engine/tests/conversion/buildviewconverter.js

@@ -218,20 +218,24 @@ describe( 'View converter builder', () => {
 		buildViewConverter().for( dispatcher ).fromElement( 'p' ).toElement( 'paragraph' );
 		buildViewConverter().for( dispatcher ).fromElement( 'p' ).toElement( 'paragraph' );
 
 
 		buildViewConverter().for( dispatcher )
 		buildViewConverter().for( dispatcher )
-			.fromElement( 'marker' )
-			.from( { attribute: { 'data-name': 'search' } } )
+			.from( { attribute: { 'foo': 'marker' } } )
+			.from( { attribute: { 'bar': 'marker' } } )
+			.from( { attribute: { 'foo': 'marker', 'bar': 'marker' } } )
 			.toMarker();
 			.toMarker();
 
 
 		const viewElement = new ViewContainerElement( 'p', null, [
 		const viewElement = new ViewContainerElement( 'p', null, [
-			new ViewAttributeElement( 'marker', { 'data-name': 'comment' } ),
-			new ViewAttributeElement( 'span', { 'data-name': 'search' } )
+			new ViewAttributeElement( 'span', { 'foo': 'marker', 'data-name': 'marker1' } ),
+			new ViewAttributeElement( 'span', { 'bar': 'marker', 'data-name': 'marker2' } ),
+			new ViewAttributeElement( 'span', { 'foo': 'marker', 'bar': 'marker', 'data-name': 'marker3' } )
 		] );
 		] );
 
 
 		const result = dispatcher.convert( viewElement, objWithContext );
 		const result = dispatcher.convert( viewElement, objWithContext );
 		modelRoot.appendChildren( result );
 		modelRoot.appendChildren( result );
 
 
 		expect( modelToString( result ) ).to.equal(
 		expect( modelToString( result ) ).to.equal(
-			'<paragraph><$marker data-name="comment"></$marker><$marker data-name="search"></$marker></paragraph>'
+			'<paragraph>' +
+				'<$marker data-name="marker1"></$marker><$marker data-name="marker2"></$marker><$marker data-name="marker3"></$marker>' +
+			'</paragraph>'
 		);
 		);
 	} );
 	} );