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

Tests: Change `VirtualTestEditor` to `ClassicTestEditor` in tests so that `DomConverter` is used properly.

Szymon Cofalik 8 лет назад
Родитель
Сommit
455e23a497
2 измененных файлов с 11 добавлено и 20 удалено
  1. 0 4
      packages/ckeditor5-typing/src/input.js
  2. 11 16
      packages/ckeditor5-typing/tests/input.js

+ 0 - 4
packages/ckeditor5-typing/src/input.js

@@ -187,10 +187,6 @@ class MutationHandler {
 		// Get common ancestor in DOM.
 		const domMutationCommonAncestor = domConverter.mapViewToDom( mutationsCommonAncestor );
 
-		if ( !domMutationCommonAncestor ) {
-			return;
-		}
-
 		// Create fresh DomConverter so it will not use existing mapping and convert current DOM to model.
 		// This wouldn't be needed if DomConverter would allow to create fresh view without checking any mappings.
 		const freshDomConverter = new DomConverter();

+ 11 - 16
packages/ckeditor5-typing/tests/input.js

@@ -3,18 +3,16 @@
  * For licensing, see LICENSE.md.
  */
 
-import VirtualTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/virtualtesteditor';
+import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';
 import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
+import List from '@ckeditor/ckeditor5-list/src/list';
 import Bold from '@ckeditor/ckeditor5-basic-styles/src/boldengine';
 import Input from '../src/input';
 
 import Writer from '@ckeditor/ckeditor5-engine/src/model/writer';
 import ModelRange from '@ckeditor/ckeditor5-engine/src/model/range';
 
-import { downcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/downcast-converters';
-import { upcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/upcast-converters';
-
 import ViewText from '@ckeditor/ckeditor5-engine/src/view/text';
 import ViewElement from '@ckeditor/ckeditor5-engine/src/view/element';
 import ViewSelection from '@ckeditor/ckeditor5-engine/src/view/selection';
@@ -25,31 +23,28 @@ import { getCode } from '@ckeditor/ckeditor5-utils/src/keyboard';
 import { getData as getModelData, setData as setModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils/view';
 
+/* global document */
+
 describe( 'Input feature', () => {
 	let editor, model, modelRoot, view, viewDocument, viewRoot, listenter;
 
 	testUtils.createSinonSandbox();
 
-	before( () => {
+	beforeEach( () => {
 		listenter = Object.create( EmitterMixin );
 
-		return VirtualTestEditor
-			.create( {
-				plugins: [ Input, Paragraph, Bold ]
-			} )
+		const domElement = document.createElement( 'div' );
+		document.body.appendChild( domElement );
+
+		return ClassicTestEditor.create( domElement, { plugins: [ Input, Paragraph, Bold, List ] } )
 			.then( newEditor => {
 				// Mock image feature.
 				newEditor.model.schema.register( 'image', { allowWhere: '$text' } );
 
-				newEditor.conversion.for( 'downcast' ).add( downcastElementToElement( {
+				newEditor.conversion.elementToElement( {
 					model: 'image',
 					view: 'img'
-				} ) );
-
-				newEditor.conversion.for( 'upcast' ).add( upcastElementToElement( {
-					view: 'img',
-					model: 'image'
-				} ) );
+				} );
 
 				editor = newEditor;
 				model = editor.model;