Преглед изворни кода

Merge branch 'master' into t/ckeditor5-alignment/16

Piotrek Koszuliński пре 7 година
родитељ
комит
bb85eea6df

+ 4 - 2
packages/ckeditor5-undo/tests/undocommand.js

@@ -7,7 +7,6 @@ import ModelTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/modeltestedit
 import Range from '@ckeditor/ckeditor5-engine/src/model/range';
 import Position from '@ckeditor/ckeditor5-engine/src/model/position';
 import Batch from '@ckeditor/ckeditor5-engine/src/model/batch';
-import Text from '@ckeditor/ckeditor5-engine/src/model/text';
 import UndoCommand from '../src/undocommand';
 import { itemAt, getText } from '@ckeditor/ckeditor5-engine/tests/model/_utils/utils';
 
@@ -312,7 +311,10 @@ describe( 'UndoCommand', () => {
 				return text;
 			}
 
-			root.appendChildren( new Text( 'abcdef' ) );
+			model.change( writer => {
+				writer.appendText( 'abcdef', root );
+			} );
+
 			expect( getCaseText( root ) ).to.equal( 'abcdef' );
 
 			model.change( writer => {

+ 8 - 4
packages/ckeditor5-undo/tests/undoediting-integration.js

@@ -323,20 +323,22 @@ describe( 'UndoEditing integration', () => {
 				writer.setAttribute( 'bold', true, doc.selection.getFirstRange() );
 			} );
 			output( '<paragraph>fo[<$text bold="true">ob</$text>]ar</paragraph>' );
+			expect( doc.selection.getAttribute( 'bold' ) ).to.be.true;
 
 			model.change( writer => {
 				setSelection( [ 0, 3 ], [ 0, 3 ] );
 				writer.insertText( 'zzz', doc.selection.getFirstPosition() );
 			} );
-			output( '<paragraph>fo<$text bold="true">o</$text>zzz<$text bold="true">[]b</$text>ar</paragraph>' );
-			expect( doc.selection.getAttribute( 'bold' ) ).to.true;
+			output( '<paragraph>fo<$text bold="true">o</$text>zzz[]<$text bold="true">b</$text>ar</paragraph>' );
+			expect( doc.selection.getAttribute( 'bold' ) ).to.be.undefined;
 
 			editor.execute( 'undo' );
 			output( '<paragraph>fo<$text bold="true">o[]b</$text>ar</paragraph>' );
-			expect( doc.selection.getAttribute( 'bold' ) ).to.true;
+			expect( doc.selection.getAttribute( 'bold' ) ).to.be.true;
 
 			editor.execute( 'undo' );
 			output( '<paragraph>fo[ob]ar</paragraph>' );
+			expect( doc.selection.getAttribute( 'bold' ) ).to.be.undefined;
 
 			undoDisabled();
 		} );
@@ -1017,7 +1019,9 @@ describe( 'UndoEditing integration', () => {
 			input( '<paragraph>Foo</paragraph><paragraph>Bar</paragraph>' );
 
 			// Remove children from graveyard because they are inserted there after `input` call.
-			doc.graveyard.removeChildren( 0, doc.graveyard.childCount );
+			model.change( writer => {
+				writer.remove( Range.createIn( doc.graveyard ) );
+			} );
 
 			const batchWithMerge = new Batch();