瀏覽代碼

Review writerSetSelection() API calls with single position.

Maciej Gołaszewski 7 年之前
父節點
當前提交
94feadd5d2

+ 4 - 4
packages/ckeditor5-engine/tests/conversion/downcast-selection-converters.js

@@ -196,7 +196,7 @@ describe( 'downcast-selection-converters', () => {
 				model.change( writer => {
 					const range = writer.createRange( writer.createPositionAt( modelRoot, 1 ), writer.createPositionAt( modelRoot, 5 ) );
 					marker = writer.addMarker( 'marker', { range, usingOperation: false } );
-					writer.setSelection( writer.createRange( writer.createPositionAt( modelRoot, 3 ) ) );
+					writer.setSelection( modelRoot, 3 );
 				} );
 
 				// Remove view children manually (without firing additional conversion).
@@ -221,7 +221,7 @@ describe( 'downcast-selection-converters', () => {
 				model.change( writer => {
 					const range = writer.createRange( writer.createPositionAt( modelRoot, 1 ), writer.createPositionAt( modelRoot, 5 ) );
 					marker = writer.addMarker( 'marker', { range, usingOperation: false } );
-					writer.setSelection( writer.createRange( writer.createPositionAt( modelRoot, 3 ) ) );
+					writer.setSelection( modelRoot, 3 );
 					writer.removeSelectionAttribute( 'bold' );
 				} );
 
@@ -250,7 +250,7 @@ describe( 'downcast-selection-converters', () => {
 				model.change( writer => {
 					const range = writer.createRange( writer.createPositionAt( modelRoot, 1 ), writer.createPositionAt( modelRoot, 5 ) );
 					marker = writer.addMarker( 'marker2', { range, usingOperation: false } );
-					writer.setSelection( writer.createRange( writer.createPositionAt( modelRoot, 3 ) ) );
+					writer.setSelection( modelRoot, 3 );
 				} );
 
 				// Remove view children manually (without firing additional conversion).
@@ -276,7 +276,7 @@ describe( 'downcast-selection-converters', () => {
 				model.change( writer => {
 					const range = writer.createRange( writer.createPositionAt( modelRoot, 1 ), writer.createPositionAt( modelRoot, 5 ) );
 					marker = writer.addMarker( 'marker3', { range, usingOperation: false } );
-					writer.setSelection( writer.createRange( writer.createPositionAt( modelRoot, 3 ) ) );
+					writer.setSelection( modelRoot, 3 );
 				} );
 
 				// Remove view children manually (without firing additional conversion).

+ 1 - 1
packages/ckeditor5-engine/tests/conversion/downcastdispatcher.js

@@ -409,7 +409,7 @@ describe( 'DowncastDispatcher', () => {
 			model.change( writer => {
 				const range = writer.createRange( writer.createPositionAt( root, 0 ), writer.createPositionAt( root, 1 ) );
 				writer.addMarker( 'name', { range, usingOperation: false } );
-				writer.setSelection( writer.createRange( writer.createPositionAt( caption, 1 ), writer.createPositionAt( caption, 1 ) ) );
+				writer.setSelection( caption, 1 );
 			} );
 			sinon.spy( dispatcher, 'fire' );
 

+ 2 - 2
packages/ckeditor5-engine/tests/model/document.js

@@ -323,7 +323,7 @@ describe( 'Document', () => {
 			doc.on( 'change', spy );
 
 			model.change( writer => {
-				writer.setSelection( writer.createRange( writer.createPositionAt( root, 2 ), writer.createPositionAt( root, 2 ) ) );
+				writer.setSelection( root, 2 );
 			} );
 
 			sinon.assert.calledOnce( spy );
@@ -372,7 +372,7 @@ describe( 'Document', () => {
 			doc.on( 'change:data', spy );
 
 			model.change( writer => {
-				writer.setSelection( writer.createRange( writer.createPositionAt( root, 2 ), writer.createPositionAt( root, 2 ) ) );
+				writer.setSelection( root, 2 );
 			} );
 
 			sinon.assert.notCalled( spy );

+ 1 - 1
packages/ckeditor5-engine/tests/model/position.js

@@ -129,7 +129,7 @@ describe( 'Position', () => {
 	describe( 'static creators', () => {
 		describe( '_createAt()', () => {
 			it( 'should throw if no offset is passed', () => {
-				expect( () => Position._createAt( ul ) ).to.throw( CKEditorError, /model-position-createAt-required-second-parameter/ );
+				expect( () => Position._createAt( ul ) ).to.throw( CKEditorError, /model-position-createAt-offset-required/ );
 			} );
 
 			it( 'should create positions from positions', () => {

+ 1 - 1
packages/ckeditor5-engine/tests/view/position.js

@@ -383,7 +383,7 @@ describe( 'Position', () => {
 			it( 'should throw if no offset is passed', () => {
 				const element = new Element( 'p' );
 
-				expect( () => Position._createAt( element ) ).to.throw( CKEditorError, /view-position-createAt-required-second-parameter/ );
+				expect( () => Position._createAt( element ) ).to.throw( CKEditorError, /view-position-createAt-offset-required/ );
 			} );
 
 			it( 'should create positions from positions', () => {