ソースを参照

Tests: port to ES6 modules.

Piotr Jasiun 10 年 前
コミット
d911883f5f

+ 5 - 15
packages/ckeditor5-engine/tests/treeview/converter.js

@@ -5,29 +5,19 @@
 
 /* bender-tags: treeview */
 
-/* bender-include: ../_tools/tools.js */
-
 'use strict';
 
-const getIteratorCount = bender.tools.core.getIteratorCount;
+import coreTestUtils from '/tests/core/_utils/utils.js';
+import ViewElement from '/ckeditor5/core/treeview/element.js';
+import ViewText from '/ckeditor5/core/treeview/text.js';
+import Converter from '/ckeditor5/core/treeview/converter.js';
 
-const modules = bender.amd.require(
-	'core/treeview/node',
-	'core/treeview/element',
-	'core/treeview/text',
-	'core/treeview/converter'
-);
+const getIteratorCount = coreTestUtils.getIteratorCount;
 
 describe( 'converter', () => {
-	let Converter, ViewText, ViewElement, ViewNode;
 	let converter;
 
 	before( () => {
-		ViewText = modules[ 'core/treeview/text' ];
-		ViewElement = modules[ 'core/treeview/element' ];
-		ViewNode = modules[ 'core/treeview/node' ];
-		Converter = modules[ 'core/treeview/converter' ];
-
 		converter = new Converter();
 	} );
 

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

@@ -5,25 +5,15 @@
 
 /* bender-tags: treeview */
 
-/* bender-include: ../_tools/tools.js */
-
 'use strict';
 
-const getIteratorCount = bender.tools.core.getIteratorCount;
+import coreTestUtils from '/tests/core/_utils/utils.js';
+import Node from '/ckeditor5/core/treeview/node.js';
+import ViewElement from '/ckeditor5/core/treeview/element.js';
 
-const modules = bender.amd.require(
-	'core/treeview/node',
-	'core/treeview/element'
-);
+const getIteratorCount = coreTestUtils.getIteratorCount;
 
 describe( 'Element', () => {
-	let ViewElement, Node;
-
-	before( () => {
-		ViewElement = modules[ 'core/treeview/element' ];
-		Node = modules[ 'core/treeview/node' ];
-	} );
-
 	describe( 'constructor', () => {
 		it( 'should create element without attributes', () => {
 			const elem = new ViewElement( 'p' );

+ 3 - 13
packages/ckeditor5-engine/tests/treeview/marktosync.js

@@ -5,27 +5,17 @@
 
 /* bender-tags: treeview */
 
-/* bender-include: ../_tools/tools.js */
-
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treeview/element',
-	'core/treeview/rootelement',
-	'core/treeview/text'
-);
+import ViewText from '/ckeditor5/core/treeview/text.js';
+import ViewElement from '/ckeditor5/core/treeview/element.js';
+import RootElement from '/ckeditor5/core/treeview/rootelement.js';
 
 describe( 'Node.markToSync', () => {
-	let ViewElement, ViewText, RootElement;
-
 	let root, text, img;
 	let markToSyncSpy;
 
 	before( () => {
-		ViewElement = modules[ 'core/treeview/element' ];
-		ViewText = modules[ 'core/treeview/text' ];
-		RootElement = modules[ 'core/treeview/rootelement' ];
-
 		markToSyncSpy = sinon.spy();
 	} );
 

+ 4 - 17
packages/ckeditor5-engine/tests/treeview/node.js

@@ -5,32 +5,19 @@
 
 /* bender-tags: treeview */
 
-/* bender-include: ../_tools/tools.js */
-
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treeview/element',
-	'core/treeview/rootelement',
-	'core/treeview/node',
-	'core/treeview/text',
-	'core/ckeditorerror'
-);
+import Element from '/ckeditor5/core/treeview/element.js';
+import RootElement from '/ckeditor5/core/treeview/rootelement.js';
+import Text from '/ckeditor5/core/treeview/text.js';
+import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
 
 describe( 'Node', () => {
-	let Element, Text, Node, RootElement, CKEditorError;
-
 	let root;
 	let one, two, three;
 	let charB, charA, charR, img;
 
 	before( () => {
-		Element = modules[ 'core/treeview/element' ];
-		Node = modules[ 'core/treeview/node' ];
-		Text = modules[ 'core/treeview/text' ];
-		CKEditorError = modules[ 'ckeditorerror ' ];
-		RootElement = modules[ 'core/treeview/rootelement' ];
-
 		charB = new Text( 'b' );
 		charA = new Text( 'a' );
 		img = new Element( 'img' );

+ 1 - 9
packages/ckeditor5-engine/tests/treeview/position.js

@@ -7,17 +7,9 @@
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treeview/position'
-);
+import Position from '/ckeditor5/core/treeview/position.js';
 
 describe( 'Position', () => {
-	let Position;
-
-	before( () => {
-		Position = modules[ 'core/treeview/position' ];
-	} );
-
 	describe( 'constructor', () => {
 		it( 'should create element without attributes', () => {
 			const parentMock = {};

+ 5 - 14
packages/ckeditor5-engine/tests/treeview/renderer.js

@@ -7,25 +7,16 @@
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treeview/renderer',
-	'core/treeview/element',
-	'core/treeview/text',
-	'core/treeview/converter',
-	'core/ckeditorerror'
-);
+import Renderer from '/ckeditor5/core/treeview/renderer.js';
+import ViewElement from '/ckeditor5/core/treeview/element.js';
+import ViewText from '/ckeditor5/core/treeview/text.js';
+import Converter from '/ckeditor5/core/treeview/converter.js';
+import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
 
 describe( 'Renderer', () => {
-	let Renderer, ViewElement, ViewText, CKEditorError, Converter;
 	let converter, renderer;
 
 	before( () => {
-		Renderer = modules[ 'core/treeview/renderer' ];
-		ViewElement = modules[ 'core/treeview/element' ];
-		ViewText = modules[ 'core/treeview/text' ];
-		CKEditorError = modules[ 'core/ckeditorerror' ];
-		Converter = modules[ 'core/treeview/converter' ];
-
 		converter = new Converter();
 		renderer = new Renderer( converter );
 	} );

+ 2 - 13
packages/ckeditor5-engine/tests/treeview/text.js

@@ -7,21 +7,10 @@
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treeview/node',
-	'core/treeview/element',
-	'core/treeview/text'
-);
+import ViewNode from '/ckeditor5/core/treeview/node.js';
+import ViewText from '/ckeditor5/core/treeview/text.js';
 
 describe( 'Element', () => {
-	let ViewText, ViewElement, ViewNode;
-
-	before( () => {
-		ViewText = modules[ 'core/treeview/text' ];
-		ViewElement = modules[ 'core/treeview/element' ];
-		ViewNode = modules[ 'core/treeview/node' ];
-	} );
-
 	describe( 'constructor', () => {
 		it( 'should create element without attributes', () => {
 			const text = new ViewText( 'foo' );

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

@@ -7,23 +7,12 @@
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treeview/treeview',
-	'core/treeview/observer/observer',
-	'core/treeview/renderer',
-	'core/treeview/converter'
-);
+import TreeView from '/ckeditor5/core/treeview/treeview.js';
+import Observer from '/ckeditor5/core/treeview/observer/observer.js';
+import Renderer from '/ckeditor5/core/treeview/renderer.js';
+import Converter from '/ckeditor5/core/treeview/converter.js';
 
 describe( 'TreeView', () => {
-	let TreeView, Observer, Renderer, Converter;
-
-	before( () => {
-		TreeView = modules[ 'core/treeview/treeview' ];
-		Observer = modules[ 'core/treeview/observer/observer' ];
-		Renderer = modules[ 'core/treeview/renderer' ];
-		Converter = modules[ 'core/treeview/converter' ];
-	} );
-
 	describe( 'constructor', () => {
 		it( 'should create TreeView with all properties', () => {
 			const domP = document.createElement( 'p' );