Przeglądaj źródła

Merge branch 'master' into t/799

Szymon Kupś 8 lat temu
rodzic
commit
89f1488c17

+ 4 - 4
packages/ckeditor5-engine/src/controller/datacontroller.js

@@ -248,7 +248,7 @@ export default class DataController {
 	destroy() {}
 
 	/**
-	 * See {@link module:engine/controller/insertcontent~insertContent}.
+	 * See {@link module:engine/controller/insertcontent.insertContent}.
 	 *
 	 * @fires insertContent
 	 * @param {module:engine/model/documentfragment~DocumentFragment|module:engine/model/item~Item} content The content to insert.
@@ -261,7 +261,7 @@ export default class DataController {
 	}
 
 	/**
-	 * See {@link module:engine/controller/deletecontent~deleteContent}.
+	 * See {@link module:engine/controller/deletecontent.deleteContent}.
 	 *
 	 * Note: For the sake of predictability, the resulting selection should always be collapsed.
 	 * In cases where a feature wants to modify deleting behavior so selection isn't collapsed
@@ -281,7 +281,7 @@ export default class DataController {
 	}
 
 	/**
-	 * See {@link module:engine/controller/modifyselection~modifySelection}.
+	 * See {@link module:engine/controller/modifyselection.modifySelection}.
 	 *
 	 * @fires modifySelection
 	 * @param {module:engine/model/selection~Selection} selection The selection to modify.
@@ -292,7 +292,7 @@ export default class DataController {
 	}
 
 	/**
-	 * See {@link module:engine/controller/getselectedcontent~getSelectedContent}.
+	 * See {@link module:engine/controller/getselectedcontent.getSelectedContent}.
 	 *
 	 * @fires module:engine/controller/datacontroller~DataController#getSelectedContent
 	 * @param {module:engine/model/selection~Selection} selection The selection of which content will be retrieved.

+ 33 - 13
packages/ckeditor5-engine/tests/dev-utils/enableenginedebug.js

@@ -932,22 +932,42 @@ describe( 'debug tools', () => {
 			expect( JSON.stringify( recreated ) ).to.equal( JSON.stringify( original ) );
 		} );
 
-		it( 'provide additional logging when transformation crashes', () => {
-			const deltaA = new MoveDelta();
-			const opA = new MoveOperation( ModelPosition.createAt( root, 4 ), 4, ModelPosition.createAt( otherRoot, 4 ), 0 );
-			deltaA.addOperation( opA );
+		describe( 'provide additional logging when transformation crashes', () => {
+			it( 'with more important delta A', () => {
+				const deltaA = new MoveDelta();
+				const opA = new MoveOperation( ModelPosition.createAt( root, 4 ), 4, ModelPosition.createAt( otherRoot, 4 ), 0 );
+				deltaA.addOperation( opA );
+
+				const deltaB = new InsertDelta();
+				const opB = new InsertOperation( ModelPosition.createAt( root, 0 ), new ModelText( 'a' ), 0 );
+				deltaB.addOperation( opB );
+
+				deltaTransform.defaultTransform = () => {
+					throw new Error();
+				};
+
+				expect( () => deltaTransform.transform( deltaA, deltaB, true ) ).to.throw( Error );
+				expect( error.calledWith( deltaA.toString() + ' (important)' ) ).to.be.true;
+				expect( error.calledWith( deltaB.toString() ) ).to.be.true;
+			} );
 
-			const deltaB = new InsertDelta();
-			const opB = new InsertOperation( ModelPosition.createAt( root, 0 ), new ModelText( 'a' ), 0 );
-			deltaB.addOperation( opB );
+			it( 'with more important delta B', () => {
+				const deltaA = new MoveDelta();
+				const opA = new MoveOperation( ModelPosition.createAt( root, 4 ), 4, ModelPosition.createAt( otherRoot, 4 ), 0 );
+				deltaA.addOperation( opA );
 
-			deltaTransform.defaultTransform = () => {
-				throw new Error();
-			};
+				const deltaB = new InsertDelta();
+				const opB = new InsertOperation( ModelPosition.createAt( root, 0 ), new ModelText( 'a' ), 0 );
+				deltaB.addOperation( opB );
 
-			expect( () => deltaTransform.transform( deltaA, deltaB, true ) ).to.throw( Error );
-			expect( error.calledWith( deltaA.toString() + ' (important)' ) ).to.be.true;
-			expect( error.calledWith( deltaB.toString() ) ).to.be.true;
+				deltaTransform.defaultTransform = () => {
+					throw new Error();
+				};
+
+				expect( () => deltaTransform.transform( deltaA, deltaB, false ) ).to.throw( Error );
+				expect( error.calledWith( deltaA.toString() ) ).to.be.true;
+				expect( error.calledWith( deltaB.toString() + ' (important)' ) ).to.be.true;
+			} );
 		} );
 	} );