浏览代码

Changed dataprocessor to XML and fixed writter tests.

Oskar Wrobel 9 年之前
父节点
当前提交
fcb659eb03

+ 2 - 2
packages/ckeditor5-engine/tests/_utils/view.js

@@ -5,7 +5,7 @@
 
 import Document from '/ckeditor5/engine/view/document.js';
 import ViewDocumentFragment from '/ckeditor5/engine/view/documentfragment.js';
-import HtmlDataProcessor from '/ckeditor5/engine/dataprocessor/htmldataprocessor.js';
+import XmlDataProcessor from '/ckeditor5/engine/dataprocessor/xmldataprocessor.js';
 import ViewElement from '/ckeditor5/engine/view/element.js';
 import Selection from '/ckeditor5/engine/view/selection.js';
 import Range from '/ckeditor5/engine/view/range.js';
@@ -274,7 +274,7 @@ export function stringify( node, selectionOrPositionOrRange = null, options = {}
 export function parse( data, options = {} ) {
 	options.order = options.order || [];
 	const rangeParser = new RangeParser();
-	const processor = new HtmlDataProcessor();
+	const processor = new XmlDataProcessor();
 
 	// Convert data to view.
 	let view = processor.toView( data );

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

@@ -115,7 +115,7 @@ describe( 'writer', () => {
 
 		it( 'should unwrap part of the node', () => {
 			test(
-				'<container:p>[baz<attribute:b view-priority="1">foo}bar</attribute:b>',
+				'<container:p>[baz<attribute:b view-priority="1">foo}bar</attribute:b></container:p>',
 				'<attribute:b view-priority="1"></attribute:b>',
 				'<container:p>[bazfoo]<attribute:b view-priority="1">bar</attribute:b></container:p>'
 			);
@@ -248,7 +248,7 @@ describe( 'writer', () => {
 		it( 'should not unwrap single element when attributes are different', () => {
 			test(
 				'<container:p>[<attribute:b view-priority="1" baz="qux" foo="bar">test</attribute:b>]</container:p>',
-				'<attribute:b baz="qux" test="true"></attribute:b view-priority="1">',
+				'<attribute:b view-priority="1" baz="qux" test="true"></attribute:b>',
 				'<container:p>[<attribute:b view-priority="1" baz="qux" foo="bar">test</attribute:b>]</container:p>'
 			);
 		} );

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

@@ -81,7 +81,7 @@ describe( 'wrapPosition', () => {
 
 	it( 'should merge with existing attributes #1', () => {
 		test(
-			'<container:p><attribute:b view-priority="1">foo</attribute:b:1>[]</container:p>',
+			'<container:p><attribute:b view-priority="1">foo</attribute:b>[]</container:p>',
 			'<attribute:b view-priority="1"></attribute:b>',
 			'<container:p><attribute:b view-priority="1">foo{}</attribute:b></container:p>'
 		);