8
0
Просмотр исходного кода

Simplified tests in engine.view.Writer.

Szymon Kupś 9 лет назад
Родитель
Сommit
6be47f1100

+ 1 - 9
packages/ckeditor5-engine/tests/view/writer/breakAt.js

@@ -8,9 +8,6 @@
 'use strict';
 
 import { breakAt } from '/ckeditor5/engine/view/writer.js';
-import DocumentFragment from '/ckeditor5/engine/view/documentfragment.js';
-import AttributeElement from '/ckeditor5/engine/view/attributeelement.js';
-import Text from '/ckeditor5/engine/view/text.js';
 import { stringify, parse } from '/tests/engine/_utils/view.js';
 
 describe( 'writer', () => {
@@ -24,13 +21,8 @@ describe( 'writer', () => {
 	function test( input, expected ) {
 		let { view, selection } = parse( input );
 
-		// Wrap attributes and text into DocumentFragment.
-		if ( view instanceof AttributeElement || view instanceof Text ) {
-			view = new DocumentFragment( view );
-		}
-
 		const newPosition = breakAt( selection.getFirstPosition() );
-		expect( stringify( view, newPosition, { showType: true, showPriority: true } ) ).to.equal( expected );
+		expect( stringify( view.getRoot(), newPosition, { showType: true, showPriority: true } ) ).to.equal( expected );
 	}
 
 	describe( 'breakAt', () => {

+ 1 - 7
packages/ckeditor5-engine/tests/view/writer/breakrange.js

@@ -8,10 +8,8 @@
 'use strict';
 
 import { breakRange } from '/ckeditor5/engine/view/writer.js';
-import DocumentFragment from '/ckeditor5/engine/view/documentfragment.js';
 import ContainerElement from '/ckeditor5/engine/view/containerelement.js';
 import AttributeElement from '/ckeditor5/engine/view/attributeelement.js';
-import Text from '/ckeditor5/engine/view/text.js';
 import Range from '/ckeditor5/engine/view/range.js';
 import { stringify, parse } from '/tests/engine/_utils/view.js';
 import CKEditorError from '/ckeditor5/utils/ckeditorerror.js';
@@ -26,12 +24,8 @@ describe( 'writer', () => {
 	function test( input, expected ) {
 		let { view, selection } = parse( input );
 
-		if ( view instanceof AttributeElement || view instanceof Text ) {
-			view = new DocumentFragment( view );
-		}
-
 		const newRange = breakRange( selection.getFirstRange() );
-		expect( stringify( view, newRange, { showType: true } ) ).to.equal( expected );
+		expect( stringify( view.getRoot(), newRange, { showType: true } ) ).to.equal( expected );
 	}
 
 	describe( 'breakRange', () => {

+ 1 - 1
packages/ckeditor5-engine/tests/view/writer/insert.js

@@ -28,7 +28,7 @@ describe( 'writer', () => {
 		let { view, selection } = parse( input );
 
 		const newRange = insert( selection.getFirstPosition(), nodesToInsert );
-		expect( stringify( view.parent, newRange, { showType: true, showPriority: true } ) ).to.equal( expected );
+		expect( stringify( view.getRoot(), newRange, { showType: true, showPriority: true } ) ).to.equal( expected );
 	}
 
 	describe( 'insert', () => {

+ 0 - 11
packages/ckeditor5-engine/tests/view/writer/move.js

@@ -8,10 +8,7 @@
 'use strict';
 
 import { move } from '/ckeditor5/engine/view/writer.js';
-import DocumentFragment from '/ckeditor5/engine/view/documentfragment.js';
 import { stringify, parse } from '/tests/engine/_utils/view.js';
-import AttributeElement from '/ckeditor5/engine/view/attributeelement.js';
-import Text from '/ckeditor5/engine/view/text.js';
 
 describe( 'writer', () => {
 	/**
@@ -26,14 +23,6 @@ describe( 'writer', () => {
 		let { view: srcView, selection: srcSelection } = parse( source );
 		let { view: dstView, selection: dstSelection } = parse( destination );
 
-		if ( srcView instanceof AttributeElement || srcView instanceof Text ) {
-			srcView = new DocumentFragment( srcView );
-		}
-
-		if ( dstView instanceof AttributeElement || dstView instanceof Text ) {
-			dstView = new DocumentFragment( dstView );
-		}
-
 		const newRange = move( srcSelection.getFirstRange(), dstSelection.getFirstPosition() );
 
 		expect( stringify( dstView, newRange, { showType: true, showPriority: true } ) ).to.equal( destinationAfterMove );

+ 0 - 5
packages/ckeditor5-engine/tests/view/writer/remove.js

@@ -13,7 +13,6 @@ import Range from '/ckeditor5/engine/view/range.js';
 import DocumentFragment from '/ckeditor5/engine/view/documentfragment.js';
 import { stringify, parse } from '/tests/engine/_utils/view.js';
 import AttributeElement from '/ckeditor5/engine/view/attributeelement.js';
-import Text from '/ckeditor5/engine/view/text.js';
 import CKEditorError from '/ckeditor5/utils/ckeditorerror.js';
 
 describe( 'writer', () => {
@@ -28,10 +27,6 @@ describe( 'writer', () => {
 	function test( input, expectedResult, expectedRemoved ) {
 		let { view, selection } = parse( input );
 
-		if ( view instanceof AttributeElement || view instanceof Text ) {
-			view = new DocumentFragment( view );
-		}
-
 		const range = selection.getFirstRange();
 		const removed = remove( range );
 		expect( stringify( view, range, { showType: true, showPriority: true } ) ).to.equal( expectedResult );

+ 1 - 6
packages/ckeditor5-engine/tests/view/writer/unwrap.js

@@ -11,7 +11,6 @@ import { unwrap } from '/ckeditor5/engine/view/writer.js';
 import Element from '/ckeditor5/engine/view/element.js';
 import ContainerElement from '/ckeditor5/engine/view/containerelement.js';
 import AttributeElement from '/ckeditor5/engine/view/attributeelement.js';
-import DocumentFragment from '/ckeditor5/engine/view/documentfragment.js';
 import Position from '/ckeditor5/engine/view/position.js';
 import Range from '/ckeditor5/engine/view/range.js';
 import Text from '/ckeditor5/engine/view/text.js';
@@ -29,12 +28,8 @@ describe( 'writer', () => {
 	function test( input, unwrapAttribute, expected ) {
 		let { view, selection } = parse( input );
 
-		if ( view instanceof AttributeElement || view instanceof Text ) {
-			view = new DocumentFragment( view );
-		}
-
 		const newRange = unwrap( selection.getFirstRange(), parse( unwrapAttribute ) );
-		expect( stringify( view, newRange, { showType: true, showPriority: true } ) ).to.equal( expected );
+		expect( stringify( view.getRoot(), newRange, { showType: true, showPriority: true } ) ).to.equal( expected );
 	}
 
 	describe( 'unwrap', () => {

+ 4 - 9
packages/ckeditor5-engine/tests/view/writer/wrap.js

@@ -11,7 +11,6 @@ import { wrap } from '/ckeditor5/engine/view/writer.js';
 import Element from '/ckeditor5/engine/view/element.js';
 import ContainerElement from '/ckeditor5/engine/view/containerelement.js';
 import AttributeElement from '/ckeditor5/engine/view/attributeelement.js';
-import DocumentFragment from '/ckeditor5/engine/view/documentfragment.js';
 import Position from '/ckeditor5/engine/view/position.js';
 import Range from '/ckeditor5/engine/view/range.js';
 import Text from '/ckeditor5/engine/view/text.js';
@@ -23,18 +22,14 @@ describe( 'writer', () => {
 	 * Executes test using `parse` and `stringify` utils functions.
 	 *
 	 * @param {String} input
-	 * @param {String} unwrapAttribute
+	 * @param {String} wrapAttribute
 	 * @param {String} expected
 	 */
-	function test( input, unwrapAttribute, expected ) {
+	function test( input, wrapAttribute, expected ) {
 		let { view, selection } = parse( input );
+		const newRange = wrap( selection.getFirstRange(), parse( wrapAttribute ) );
 
-		if ( view instanceof AttributeElement || view instanceof Text ) {
-			view = new DocumentFragment( view );
-		}
-
-		const newRange = wrap( selection.getFirstRange(), parse( unwrapAttribute ) );
-		expect( stringify( view, newRange, { showType: true, showPriority: true } ) ).to.equal( expected );
+		expect( stringify( view.getRoot(), newRange, { showType: true, showPriority: true } ) ).to.equal( expected );
 	}
 
 	describe( 'wrap', () => {

+ 0 - 6
packages/ckeditor5-engine/tests/view/writer/wrapposition.js

@@ -11,11 +11,9 @@ import { wrapPosition } from '/ckeditor5/engine/view/writer.js';
 import Text from '/ckeditor5/engine/view/text.js';
 import Element from '/ckeditor5/engine/view/element.js';
 import ContainerElement from '/ckeditor5/engine/view/containerelement.js';
-import DocumentFragment from '/ckeditor5/engine/view/documentfragment.js';
 import Position from '/ckeditor5/engine/view/position.js';
 import CKEditorError from '/ckeditor5/utils/ckeditorerror.js';
 import { stringify, parse } from '/tests/engine/_utils/view.js';
-import AttributeElement from '/ckeditor5/engine/view/attributeelement.js';
 
 describe( 'wrapPosition', () => {
 	/**
@@ -28,10 +26,6 @@ describe( 'wrapPosition', () => {
 	function test( input, unwrapAttribute, expected ) {
 		let { view, selection } = parse( input );
 
-		if ( view instanceof AttributeElement || view instanceof Text ) {
-			view = new DocumentFragment( view );
-		}
-
 		const newPosition = wrapPosition( selection.getFirstPosition(), parse( unwrapAttribute ) );
 		expect( stringify( view, newPosition, { showType: true, showPriority: true } ) ).to.equal( expected );
 	}