Kaynağa Gözat

Aligned Deltas with engine changes.

Oskar Wróbel 8 yıl önce
ebeveyn
işleme
7397860c64

+ 5 - 4
packages/ckeditor5-engine/tests/model/delta/attributedelta.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-import Document from '../../../src/model/document';
+import Model from '../../../src/model/model';
 import Range from '../../../src/model/range';
 import Position from '../../../src/model/position';
 import AttributeDelta from '../../../src/model/delta/attributedelta';
@@ -12,11 +12,12 @@ import NoOperation from '../../../src/model/operation/nooperation';
 import { jsonParseStringify } from '../../../tests/model/_utils/utils';
 
 describe( 'AttributeDelta', () => {
-	let doc, root, delta;
+	let root, delta;
 
 	beforeEach( () => {
-		doc = new Document();
-		root = doc.createRoot();
+		const model = new Model();
+
+		root = model.document.createRoot();
 		delta = new AttributeDelta();
 	} );
 

+ 4 - 3
packages/ckeditor5-engine/tests/model/delta/delta.js

@@ -14,7 +14,7 @@ import ReinsertOperation from '../../../src/model/operation/reinsertoperation';
 import RemoveOperation from '../../../src/model/operation/removeoperation';
 import RootAttributeOperation from '../../../src/model/operation/rootattributeoperation';
 import DeltaFactory from '../../../src/model/delta/deltafactory';
-import Document from '../../../src/model/document';
+import Model from '../../../src/model/model';
 import Position from '../../../src/model/position';
 import Range from '../../../src/model/range';
 import { jsonParseStringify } from '../../../tests/model/_utils/utils';
@@ -148,9 +148,10 @@ describe( 'Delta', () => {
 		} );
 
 		beforeEach( () => {
-			delta = new FooDelta();
+			const model = new Model();
 
-			doc = new Document();
+			delta = new FooDelta();
+			doc = model.document;
 			root = doc.createRoot();
 		} );
 

+ 5 - 4
packages/ckeditor5-engine/tests/model/delta/deltafactory.js

@@ -18,7 +18,7 @@ import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 import DeltaFactory from '../../../src/model/delta/deltafactory';
 
-import Document from '../../../src/model/document';
+import Model from '../../../src/model/model';
 import Position from '../../../src/model/position';
 import Range from '../../../src/model/range';
 import { jsonParseStringify } from '../../../tests/model/_utils/utils';
@@ -44,15 +44,16 @@ describe( 'DeltaFactory', () => {
 		} );
 
 		beforeEach( () => {
-			delta = new FooDelta();
+			const model = new Model();
 
-			doc = new Document();
+			delta = new FooDelta();
+			doc = model.document;
 			root = doc.createRoot();
 		} );
 
 		it( 'should throw error for unregistered delta', () => {
 			expect( () => {
-				DeltaFactory.fromJSON( jsonParseStringify( new BarDelta() ), {} );
+				DeltaFactory.fromJSON( jsonParseStringify( new BarDelta() ), doc );
 			} ).to.throw( CKEditorError, /^delta-fromjson-no-deserializer/ );
 		} );
 

+ 4 - 2
packages/ckeditor5-engine/tests/model/delta/insertdelta.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-import Document from '../../../src/model/document';
+import Model from '../../../src/model/model';
 import Element from '../../../src/model/element';
 import Position from '../../../src/model/position';
 
@@ -17,7 +17,9 @@ describe( 'InsertDelta', () => {
 	let insertDelta, doc, root;
 
 	beforeEach( () => {
-		doc = new Document();
+		const model = new Model();
+
+		doc = model.document;
 		root = doc.createRoot();
 		insertDelta = new InsertDelta();
 	} );

+ 4 - 2
packages/ckeditor5-engine/tests/model/delta/markerdelta.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-import Document from '../../../src/model/document';
+import Model from '../../../src/model/model';
 import Range from '../../../src/model/range';
 
 import MarkerDelta from '../../../src/model/delta/markerdelta';
@@ -13,7 +13,9 @@ describe( 'MarkerDelta', () => {
 	let markerDelta, doc, root, range;
 
 	beforeEach( () => {
-		doc = new Document();
+		const model = new Model();
+
+		doc = model.document;
 		root = doc.createRoot();
 		range = Range.createIn( root );
 		markerDelta = new MarkerDelta();

+ 4 - 2
packages/ckeditor5-engine/tests/model/delta/mergedelta.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-import Document from '../../../src/model/document';
+import Model from '../../../src/model/model';
 import Position from '../../../src/model/position';
 
 import MergeDelta from '../../../src/model/delta/mergedelta';
@@ -17,7 +17,9 @@ describe( 'MergeDelta', () => {
 	let mergeDelta, doc, root;
 
 	beforeEach( () => {
-		doc = new Document();
+		const model = new Model();
+
+		doc = model.document;
 		root = doc.createRoot();
 		mergeDelta = new MergeDelta();
 	} );

+ 4 - 2
packages/ckeditor5-engine/tests/model/delta/movedelta.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-import Document from '../../../src/model/document';
+import Model from '../../../src/model/model';
 import Position from '../../../src/model/position';
 
 import MoveDelta from '../../../src/model/delta/movedelta';
@@ -13,7 +13,9 @@ describe( 'MoveDelta', () => {
 	let moveDelta, doc, root;
 
 	beforeEach( () => {
-		doc = new Document();
+		const model = new Model();
+
+		doc = model.document;
 		root = doc.createRoot();
 		moveDelta = new MoveDelta();
 	} );

+ 12 - 11
packages/ckeditor5-engine/tests/model/delta/renamedelta.js

@@ -3,17 +3,18 @@
  * For licensing, see LICENSE.md.
  */
 
-import Document from '../../../src/model/document';
+import Model from '../../../src/model/model';
 import Element from '../../../src/model/element';
 import Text from '../../../src/model/text';
 
 import RenameDelta from '../../../src/model/delta/renamedelta';
 
 describe( 'RenameDelta', () => {
-	let renameDelta, doc, root;
+	let renameDelta, model, doc, root;
 
 	beforeEach( () => {
-		doc = new Document();
+		model = new Model();
+		doc = model.document;
 		root = doc.createRoot();
 		renameDelta = new RenameDelta();
 	} );
@@ -40,18 +41,18 @@ describe( 'RenameDelta', () => {
 		it( 'should return correct RenameDelta', () => {
 			root.appendChildren( new Element( 'p', null, new Text( 'abc' ) ) );
 
-			const batch = doc.batch();
+			model.change( writer => {
+				writer.rename( root.getChild( 0 ), 'h' );
 
-			batch.rename( root.getChild( 0 ), 'h' );
+				const reversed = writer.batch.deltas[ 0 ].getReversed();
 
-			const reversed = batch.deltas[ 0 ].getReversed();
+				reversed.operations.forEach( operation => {
+					model.applyOperation( operation );
+				} );
 
-			reversed.operations.forEach( operation => {
-				doc.applyOperation( operation );
+				expect( root.maxOffset ).to.equal( 1 );
+				expect( root.getChild( 0 ) ).to.have.property( 'name', 'p' );
 			} );
-
-			expect( root.maxOffset ).to.equal( 1 );
-			expect( root.getChild( 0 ) ).to.have.property( 'name', 'p' );
 		} );
 	} );
 

+ 4 - 2
packages/ckeditor5-engine/tests/model/delta/splitdelta.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-import Document from '../../../src/model/document';
+import Model from '../../../src/model/model';
 import Position from '../../../src/model/position';
 import Element from '../../../src/model/element';
 
@@ -19,7 +19,9 @@ describe( 'SplitDelta', () => {
 	let splitDelta, doc, root;
 
 	beforeEach( () => {
-		doc = new Document();
+		const model = new Model();
+
+		doc = model.document;
 		root = doc.createRoot();
 		splitDelta = new SplitDelta();
 	} );

+ 4 - 3
packages/ckeditor5-engine/tests/model/delta/transform/_utils/utils.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-import Document from '../../../../../src/model/document';
+import Model from '../../../../../src/model/model';
 import Element from '../../../../../src/model/element';
 import Text from '../../../../../src/model/text';
 
@@ -216,12 +216,13 @@ export function expectOperation( op, params ) {
 
 export function applyDelta( delta, document ) {
 	for ( const op of delta.operations ) {
-		document.applyOperation( op );
+		document.model.applyOperation( op );
 	}
 }
 
 export function getFilledDocument() {
-	const doc = new Document();
+	const model = new Model();
+	const doc = model.document;
 	const root = doc.createRoot();
 
 	root.insertChildren( 0, [

+ 4 - 2
packages/ckeditor5-engine/tests/model/delta/transform/transform.js

@@ -7,7 +7,7 @@ import transformations from '../../../../src/model/delta/basic-transformations';
 import deltaTransform from '../../../../src/model/delta/transform';
 const transformDeltaSets = deltaTransform.transformDeltaSets;
 
-import Document from '../../../../src/model/document';
+import Model from '../../../../src/model/model';
 import Element from '../../../../src/model/element';
 import Text from '../../../../src/model/text';
 import Position from '../../../../src/model/position';
@@ -39,7 +39,9 @@ describe( 'transform', () => {
 	let doc, root, baseVersion;
 
 	beforeEach( () => {
-		doc = new Document();
+		const model = new Model();
+
+		doc = model.document;
 		root = doc.createRoot();
 
 		root.appendChildren( new Element( 'p', null, new Text( 'foobar' ) ) );

+ 4 - 2
packages/ckeditor5-engine/tests/model/delta/unwrapdelta.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-import Document from '../../../src/model/document';
+import Model from '../../../src/model/model';
 import Position from '../../../src/model/position';
 
 import UnwrapDelta from '../../../src/model/delta/unwrapdelta';
@@ -17,7 +17,9 @@ describe( 'UnwrapDelta', () => {
 	let unwrapDelta, doc, root;
 
 	beforeEach( () => {
-		doc = new Document();
+		const model = new Model();
+
+		doc = model.document;
 		root = doc.createRoot();
 		unwrapDelta = new UnwrapDelta();
 	} );

+ 4 - 2
packages/ckeditor5-engine/tests/model/delta/wrapdelta.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-import Document from '../../../src/model/document';
+import Model from '../../../src/model/model';
 import Position from '../../../src/model/position';
 import Element from '../../../src/model/element';
 
@@ -18,7 +18,9 @@ describe( 'WrapDelta', () => {
 	let wrapDelta, doc, root;
 
 	beforeEach( () => {
-		doc = new Document();
+		const model = new Model();
+
+		doc = model.document;
 		root = doc.createRoot();
 		wrapDelta = new WrapDelta();
 	} );