Browse Source

Minor test improvements.

Oskar Wróbel 6 năm trước cách đây
mục cha
commit
bb484187cb

+ 59 - 61
packages/ckeditor5-list/tests/todolistediting.js

@@ -412,7 +412,7 @@ describe( 'TodoListEditing', () => {
 			expect( getViewData( view ) ).to.equal( '<test class="checked">{}Foo</test>' );
 			expect( getViewData( view ) ).to.equal( '<test class="checked">{}Foo</test>' );
 		} );
 		} );
 
 
-		it( 'should move selection after checkmark element to the first text node', () => {
+		it( 'should render selection after checkmark element in the first text node', () => {
 			setModelData( model, '<listItem listType="todo" listIndent="0">Foo</listItem>' );
 			setModelData( model, '<listItem listType="todo" listIndent="0">Foo</listItem>' );
 
 
 			expect( getViewData( view ) ).to.equal(
 			expect( getViewData( view ) ).to.equal(
@@ -422,7 +422,7 @@ describe( 'TodoListEditing', () => {
 			);
 			);
 		} );
 		} );
 
 
-		it( 'should move selection after checkmark element when list item does not contain any text node', () => {
+		it( 'should render selection after checkmark element when list item does not contain any text nodes', () => {
 			setModelData( model, '<listItem listType="todo" listIndent="0">[]</listItem>' );
 			setModelData( model, '<listItem listType="todo" listIndent="0">[]</listItem>' );
 
 
 			expect( getViewData( view ) ).to.equal(
 			expect( getViewData( view ) ).to.equal(
@@ -432,6 +432,63 @@ describe( 'TodoListEditing', () => {
 			);
 			);
 		} );
 		} );
 
 
+		it( 'should render marker UIElements after the checkmark element', () => {
+			setModelData( model,
+				'<listItem listType="todo" listIndent="0">[]foo</listItem>' +
+				'<listItem listType="todo" listIndent="0">bar</listItem>'
+			);
+
+			editor.conversion.for( 'downcast' ).markerToElement( {
+				model: 'element1',
+				view: ( data, writer ) => writer.createUIElement( 'element1' )
+			} );
+
+			editor.conversion.for( 'downcast' ).markerToElement( {
+				model: 'element2',
+				view: ( data, writer ) => writer.createUIElement( 'element2' )
+			} );
+
+			editor.conversion.for( 'downcast' ).markerToHighlight( {
+				model: 'highlight',
+				view: { classes: 'highlight' }
+			} );
+			model.change( writer => {
+				writer.addMarker( 'element1', {
+					range: writer.createRangeIn( writer.createPositionAt( modelRoot.getChild( 0 ), 0 ) ),
+					usingOperation: false
+				} );
+
+				writer.addMarker( 'element2', {
+					range: writer.createRangeIn( writer.createPositionAt( modelRoot.getChild( 0 ), 0 ) ),
+					usingOperation: false
+				} );
+
+				writer.addMarker( 'highlight', {
+					range: writer.createRangeIn( modelRoot.getChild( 0 ) ),
+					usingOperation: false
+				} );
+			} );
+
+			expect( getViewData( view ) ).to.equal(
+				'<ul class="todo-list">' +
+					'<li>' +
+						'<span class="highlight">' +
+							'<label class="todo-list__checkmark" contenteditable="false"></label>' +
+							'<element1></element1>' +
+							'<element2></element2>' +
+							'{}foo' +
+						'</span>' +
+					'</li>' +
+					'<li>' +
+						'<label class="todo-list__checkmark" contenteditable="false"></label>bar' +
+					'</li>' +
+				'</ul>'
+			);
+
+			// CC.
+			editor.execute( 'todoListCheck' );
+		} );
+
 		it( 'should properly handle typing inside text node with attribute', () => {
 		it( 'should properly handle typing inside text node with attribute', () => {
 			setModelData( model, '<listItem listType="todo" listIndent="0"><$text bold="true">[]foo</$text></listItem>' );
 			setModelData( model, '<listItem listType="todo" listIndent="0"><$text bold="true">[]foo</$text></listItem>' );
 
 
@@ -795,65 +852,6 @@ describe( 'TodoListEditing', () => {
 		} );
 		} );
 	} );
 	} );
 
 
-	describe( 'uiElements view post-fixer', () => {
-		it( 'should move all UIElements from before a checkmark after the checkmark element', () => {
-			setModelData( model,
-				'<listItem listType="todo" listIndent="0">[]foo</listItem>' +
-				'<listItem listType="todo" listIndent="0">bar</listItem>'
-			);
-
-			editor.conversion.for( 'downcast' ).markerToElement( {
-				model: 'element1',
-				view: ( data, writer ) => writer.createUIElement( 'element1' )
-			} );
-
-			editor.conversion.for( 'downcast' ).markerToElement( {
-				model: 'element2',
-				view: ( data, writer ) => writer.createUIElement( 'element2' )
-			} );
-
-			editor.conversion.for( 'downcast' ).markerToHighlight( {
-				model: 'highlight',
-				view: { classes: 'highlight' }
-			} );
-			model.change( writer => {
-				writer.addMarker( 'element1', {
-					range: writer.createRangeIn( writer.createPositionAt( modelRoot.getChild( 0 ), 0 ) ),
-					usingOperation: false
-				} );
-
-				writer.addMarker( 'element2', {
-					range: writer.createRangeIn( writer.createPositionAt( modelRoot.getChild( 0 ), 0 ) ),
-					usingOperation: false
-				} );
-
-				writer.addMarker( 'highlight', {
-					range: writer.createRangeIn( modelRoot.getChild( 0 ) ),
-					usingOperation: false
-				} );
-			} );
-
-			expect( getViewData( view ) ).to.equal(
-				'<ul class="todo-list">' +
-					'<li>' +
-						'<span class="highlight">' +
-							'<label class="todo-list__checkmark" contenteditable="false"></label>' +
-							'<element1></element1>' +
-							'<element2></element2>' +
-							'{}foo' +
-						'</span>' +
-					'</li>' +
-					'<li>' +
-						'<label class="todo-list__checkmark" contenteditable="false"></label>bar' +
-					'</li>' +
-				'</ul>'
-			);
-
-			// CC.
-			editor.execute( 'todoListCheck' );
-		} );
-	} );
-
 	describe( 'todoListChecked attribute model post-fixer', () => {
 	describe( 'todoListChecked attribute model post-fixer', () => {
 		it( 'should remove todoListChecked attribute when checked todoListItem is renamed', () => {
 		it( 'should remove todoListChecked attribute when checked todoListItem is renamed', () => {
 			setModelData( model, '<listItem listType="todo" listIndent="0" todoListChecked="true">fo[]o</listItem>' );
 			setModelData( model, '<listItem listType="todo" listIndent="0" todoListChecked="true">fo[]o</listItem>' );