瀏覽代碼

Updated tests references.

Piotr Jasiun 10 年之前
父節點
當前提交
27f7f79936

+ 5 - 2
packages/ckeditor5-engine/src/treeview/element.js

@@ -8,21 +8,24 @@
 import ViewText from './text.js';
 import Node from './node.js';
 import utils from '../utils.js';
+import langUtils from '../lib/lodash/lang.js';
 
 export default class Element extends Node {
 	constructor( name, attrs, children ) {
+		super();
+
 		/**
 		 * @readolny
 		 */
 		this.name = name;
 
-		if ( utils.isPlainObject( attrs ) ) {
+		if ( langUtils.isPlainObject( attrs ) ) {
 			this._attrs = utils.objectToMap( attrs );
 		} else {
 			this._attrs = new Map( attrs );
 		}
 
-		this._children = utils.clone( children );
+		this._children = langUtils.clone( children );
 
 		this.domElement = null;
 	}

+ 2 - 0
packages/ckeditor5-engine/src/treeview/text.js

@@ -10,6 +10,8 @@ import Element from './element.js';
 
 export default class Text extends Node {
 	constructor( text ) {
+		super();
+
 		this._text = text;
 	}
 

+ 4 - 4
packages/ckeditor5-engine/tests/treeview/element.js

@@ -14,16 +14,16 @@
 const getIteratorCount = bender.tools.core.getIteratorCount;
 
 const modules = bender.amd.require(
-	'treeview/node',
-	'treeview/element'
+	'core/treeview/node',
+	'core/treeview/element'
 );
 
 describe( 'Element', () => {
 	let Element, Node;
 
 	before( () => {
-		Element = modules[ 'treemodel/element' ];
-		Node = modules[ 'treemodel/node' ];
+		Element = modules[ 'core/treeview/element' ];
+		Node = modules[ 'core/treeview/node' ];
 	} );
 
 	describe( 'constructor', () => {

+ 15 - 16
packages/ckeditor5-engine/tests/treeview/node.js

@@ -12,30 +12,29 @@
 const getIteratorCount = bender.tools.core.getIteratorCount;
 
 const modules = bender.amd.require(
-	'treeview/element',
-	'treeview/attribute',
-	'treeview/nodelist',
-	'ckeditorerror'
+	'core/treeview/element',
+	'core/treeview/node',
+	'core/treeview/text',
+	'core/ckeditorerror'
 );
 
 describe( 'Node', () => {
-	let Element, Character, Attribute, NodeList, CKEditorError;
+	let Element, Text, Node, CKEditorError;
 
 	let root;
 	let one, two, three;
 	let charB, charA, charR, img;
 
 	before( () => {
-		Element = modules[ 'treemodel/element' ];
-		Character = modules[ 'treemodel/character' ];
-		Attribute = modules[ 'treemodel/attribute' ];
-		NodeList = modules[ 'treemodel/nodelist' ];
-		CKEditorError = modules.ckeditorerror;
-
-		charB = new Character( 'b' );
-		charA = new Character( 'a' );
+		Element = modules[ 'core/treeview/element' ];
+		Node = modules[ 'core/treeview/node' ];
+		Text = modules[ 'core/treeview/text' ];
+		CKEditorError = modules[ 'ckeditorerror ' ];
+
+		charB = new Text( 'b' );
+		charA = new Text( 'a' );
 		img = new Element( 'img' );
-		charR = new Character( 'r' );
+		charR = new Text( 'r' );
 
 		one = new Element( 'one' );
 		two = new Element( 'two', null, [ charB, charA, img, charR ] );
@@ -101,8 +100,8 @@ describe( 'Node', () => {
 	describe( 'constructor', () => {
 		it( 'should copy attributes, not pass by reference', () => {
 			let attrs = [ new Attribute( 'attr', true ) ];
-			let foo = new Element( 'foo', attrs );
-			let bar = new Element( 'bar', attrs );
+			let foo = new Element( 'foo', { 'class': 'bold' } );
+			let bar = new Element( 'bar', { 'class': 'bold' } );
 
 			foo.removeAttr( 'attr' );