Jelajahi Sumber

Merge pull request #144 from ckeditor/t/140

T/140: Introduced ES6 modules in the tests.
Piotrek Koszuliński 10 tahun lalu
induk
melakukan
245b161927
63 mengubah file dengan 577 tambahan dan 1033 penghapusan
  1. 1 1
      packages/ckeditor5-engine/src/editorconfig.js
  2. 24 3
      packages/ckeditor5-engine/src/plugincollection.js
  3. 4 5
      packages/ckeditor5-engine/tests/.jshintrc
  4. 0 94
      packages/ckeditor5-engine/tests/_tools/tools.js
  5. 68 0
      packages/ckeditor5-engine/tests/_utils/utils.js
  6. 9 19
      packages/ckeditor5-engine/tests/ckeditor/ckeditor.js
  7. 1 7
      packages/ckeditor5-engine/tests/ckeditorerror.js
  8. 9 14
      packages/ckeditor5-engine/tests/collection.js
  9. 2 6
      packages/ckeditor5-engine/tests/config.js
  10. 15 19
      packages/ckeditor5-engine/tests/editor/creator.js
  11. 8 11
      packages/ckeditor5-engine/tests/editor/editor.js
  12. 2 5
      packages/ckeditor5-engine/tests/editorconfig.js
  13. 4 8
      packages/ckeditor5-engine/tests/emittermixin.js
  14. 1 7
      packages/ckeditor5-engine/tests/eventinfo.js
  15. 1 7
      packages/ckeditor5-engine/tests/lodash.js
  16. 2 4
      packages/ckeditor5-engine/tests/log.js
  17. 5 10
      packages/ckeditor5-engine/tests/model.js
  18. 3 5
      packages/ckeditor5-engine/tests/plugin.js
  19. 38 30
      packages/ckeditor5-engine/tests/plugincollection.js
  20. 36 0
      packages/ckeditor5-engine/tests/treemodel/_utils/utils.js
  21. 1 7
      packages/ckeditor5-engine/tests/treemodel/attribute.js
  22. 4 13
      packages/ckeditor5-engine/tests/treemodel/attributelist.js
  23. 3 13
      packages/ckeditor5-engine/tests/treemodel/batch.js
  24. 6 17
      packages/ckeditor5-engine/tests/treemodel/character.js
  25. 9 25
      packages/ckeditor5-engine/tests/treemodel/delta/attributedelta.js
  26. 3 12
      packages/ckeditor5-engine/tests/treemodel/delta/delta.js
  27. 3 15
      packages/ckeditor5-engine/tests/treemodel/delta/insertdelta.js
  28. 7 19
      packages/ckeditor5-engine/tests/treemodel/delta/mergedelta.js
  29. 7 19
      packages/ckeditor5-engine/tests/treemodel/delta/movedelta.js
  30. 6 17
      packages/ckeditor5-engine/tests/treemodel/delta/removedelta.js
  31. 7 19
      packages/ckeditor5-engine/tests/treemodel/delta/splitdelta.js
  32. 3 17
      packages/ckeditor5-engine/tests/treemodel/delta/unwrapdelta.js
  33. 3 13
      packages/ckeditor5-engine/tests/treemodel/delta/weakinsertdelta.js
  34. 5 19
      packages/ckeditor5-engine/tests/treemodel/delta/wrapdelta.js
  35. 9 31
      packages/ckeditor5-engine/tests/treemodel/document/change-event.js
  36. 4 15
      packages/ckeditor5-engine/tests/treemodel/document/document.js
  37. 6 17
      packages/ckeditor5-engine/tests/treemodel/element.js
  38. 5 16
      packages/ckeditor5-engine/tests/treemodel/liveposition.js
  39. 5 16
      packages/ckeditor5-engine/tests/treemodel/liverange.js
  40. 6 19
      packages/ckeditor5-engine/tests/treemodel/node.js
  41. 4 15
      packages/ckeditor5-engine/tests/treemodel/nodelist.js
  42. 11 29
      packages/ckeditor5-engine/tests/treemodel/operation/attributeoperation.js
  43. 7 23
      packages/ckeditor5-engine/tests/treemodel/operation/insertoperation.js
  44. 6 20
      packages/ckeditor5-engine/tests/treemodel/operation/moveoperation.js
  45. 2 11
      packages/ckeditor5-engine/tests/treemodel/operation/nooperation.js
  46. 5 17
      packages/ckeditor5-engine/tests/treemodel/operation/reinsertoperation.js
  47. 5 17
      packages/ckeditor5-engine/tests/treemodel/operation/removeoperation.js
  48. 10 32
      packages/ckeditor5-engine/tests/treemodel/operation/transform.js
  49. 5 17
      packages/ckeditor5-engine/tests/treemodel/position.js
  50. 6 16
      packages/ckeditor5-engine/tests/treemodel/positioniterator.js
  51. 5 17
      packages/ckeditor5-engine/tests/treemodel/range.js
  52. 5 15
      packages/ckeditor5-engine/tests/treemodel/rootelement.js
  53. 13 28
      packages/ckeditor5-engine/tests/treemodel/selection.js
  54. 2 7
      packages/ckeditor5-engine/tests/treemodel/text.js
  55. 31 0
      packages/ckeditor5-engine/tests/treemodel/utils-tests/utils.js
  56. 15 31
      packages/ckeditor5-engine/tests/ui/controller.js
  57. 7 16
      packages/ckeditor5-engine/tests/ui/controllercollection.js
  58. 40 36
      packages/ckeditor5-engine/tests/ui/domemittermixin.js
  59. 2 7
      packages/ckeditor5-engine/tests/ui/region.js
  60. 15 21
      packages/ckeditor5-engine/tests/ui/template.js
  61. 22 33
      packages/ckeditor5-engine/tests/ui/view.js
  62. 23 24
      packages/ckeditor5-engine/tests/utils-tests/utils.js
  63. 1 7
      packages/ckeditor5-engine/tests/utils.js

+ 1 - 1
packages/ckeditor5-engine/src/editorconfig.js

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import CKEDITOR from '../ckeditor.js';
+import CKEDITOR from '../../ckeditor.js';
 import Config from './config.js';
 
 /**

+ 24 - 3
packages/ckeditor5-engine/src/plugincollection.js

@@ -5,11 +5,10 @@
 
 'use strict';
 
-import pathUtils from '../ckeditor5/path.js';
 import Plugin from './plugin.js';
 import CKEditorError from './ckeditorerror.js';
 import log from './log.js';
-import load from '../ckeditor5/load.js';
+import load from '../load.js';
 
 /**
  * Manages a list of CKEditor plugins, including loading, resolving dependencies and initialization.
@@ -98,7 +97,7 @@ export default class PluginCollection {
 		}
 
 		function loadPluginByName( pluginName ) {
-			return load( pathUtils.getModulePath( pluginName ) )
+			return load( PluginCollection.getPluginPath( pluginName ) )
 				.then( ( PluginModule ) => {
 					return loadPluginByClass( PluginModule.default, pluginName );
 				} );
@@ -143,6 +142,28 @@ export default class PluginCollection {
 		}
 	}
 
+	/**
+	 * Resolves a simplified plugin name to a real path. The returned
+	 * paths are relative to the main `ckeditor.js` file, but they do not start with `./`.
+	 *
+	 * For instance:
+	 *
+	 * * `foo` will be transformed to `ckeditor5/foo/foo.js`,
+	 * * `core/editor` to `ckeditor5/core/editor.js` and
+	 * * `foo/bar/bom` to `ckeditor5/foo/bar/bom.js`.
+	 *
+	 * @param {String} name
+	 * @returns {String} Path to the module.
+	 */
+	static getPluginPath( name ) {
+		// Resolve shortened feature names to `featureName/featureName`.
+		if ( name.indexOf( '/' ) < 0 ) {
+			name = name + '/' + name;
+		}
+
+		return 'ckeditor5/' + name + '.js';
+	}
+
 	/**
 	 * Adds the plugin to the collection. Exposed mainly for testing purposes.
 	 *

+ 4 - 5
packages/ckeditor5-engine/tests/.jshintrc

@@ -15,14 +15,13 @@
 	"globalstrict": true,
 
 	"globals": {
-		"bender": false,
-		"describe": false,
-		"it": false,
-		"before": false,
-		"beforeEach": false,
 		"after": false,
 		"afterEach": false,
+		"before": false,
+		"beforeEach": false,
+		"describe": false,
 		"expect": false,
+		"it": false,
 		"sinon": false
 	}
 }

+ 0 - 94
packages/ckeditor5-engine/tests/_tools/tools.js

@@ -1,94 +0,0 @@
-/**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
- */
-
-'use strict';
-
-( () => {
-	bender.tools.core = {
-		/**
-		 * Defines CKEditor plugin which is a mock of an editor creator.
-		 *
-		 * If `proto` is not set or it does not define `create()` and `destroy()` methods,
-		 * then they will be set to Sinon spies. Therefore the shortest usage is:
-		 *
-		 *		bender.tools.defineEditorCreatorMock( 'test1' );
-		 *
-		 * The mocked creator is available under:
-		 *
-		 *		editor.plugins.get( 'creator-thename' );
-		 *
-		 * @param {String} creatorName Name of the creator.
-		 * @param {Object} [proto] Prototype of the creator. Properties from the proto param will
-		 * be copied to the prototype of the creator.
-		 */
-		defineEditorCreatorMock( creatorName, proto ) {
-			bender.amd.define( 'creator-' + creatorName, [ 'core/creator' ], ( Creator ) => {
-				class TestCreator extends Creator {}
-
-				if ( proto ) {
-					for ( let propName in proto ) {
-						TestCreator.prototype[ propName ] = proto[ propName ];
-					}
-				}
-
-				if ( !TestCreator.prototype.create ) {
-					TestCreator.prototype.create = sinon.spy().named( creatorName + '-create' );
-				}
-
-				if ( !TestCreator.prototype.destroy ) {
-					TestCreator.prototype.destroy = sinon.spy().named( creatorName + '-destroy' );
-				}
-
-				return TestCreator;
-			} );
-		},
-
-		/**
-		 * Returns the number of elements return by the iterator.
-		 *
-		 *		bender.tools.core.getIteratorCount( [ 1, 2, 3, 4, 5 ] ); // 5;
-		 *
-		 * @param {Iterable.<*>} iterator Any iterator.
-		 * @returns {Number} Number of elements returned by that iterator.
-		 */
-		getIteratorCount( iterator ) {
-			let count = 0;
-
-			for ( let _ of iterator ) { // jshint ignore:line
-				count++;
-			}
-
-			return count;
-		}
-	};
-
-	bender.tools.treemodel = {
-		/**
-		 * Returns tree structure as a simplified string. Elements are uppercase and characters are lowercase.
-		 * Start and end of an element is marked the same way, by the element's name (in uppercase).
-		 *
-		 *		let element = new Element( 'div', [], [ 'abc', new Element( 'p', [], 'foo' ), 'xyz' ] );
-		 *		bender.tools.treemodel.getNodesAndText( element ); // abcPfooPxyz
-		 *
-		 * @param {treeModel.Range} range Range to stringify.
-		 * @returns {String} String representing element inner structure.
-		 */
-		getNodesAndText: ( range ) => {
-			let txt = '';
-
-			for ( let step of range ) {
-				let node = step.node;
-
-				if ( node.character ) {
-					txt += node.character.toLowerCase();
-				} else if ( node.name ) {
-					txt += node.name.toUpperCase();
-				}
-			}
-
-			return txt;
-		}
-	};
-} )();

+ 68 - 0
packages/ckeditor5-engine/tests/_utils/utils.js

@@ -0,0 +1,68 @@
+/**
+ * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md.
+ */
+
+'use strict';
+
+import amdUtils from '/tests/_utils/amd.js';
+
+const utils = {
+	/**
+	 * Defines CKEditor plugin which is a mock of an editor creator.
+	 *
+	 * If `proto` is not set or it does not define `create()` and `destroy()` methods,
+	 * then they will be set to Sinon spies. Therefore the shortest usage is:
+	 *
+	 *		testUtils.defineEditorCreatorMock( 'test1' );
+	 *
+	 * The mocked creator is available under:
+	 *
+	 *		editor.plugins.get( 'creator-thename' );
+	 *
+	 * @param {String} creatorName Name of the creator.
+	 * @param {Object} [proto] Prototype of the creator. Properties from the proto param will
+	 * be copied to the prototype of the creator.
+	 */
+	defineEditorCreatorMock( creatorName, proto ) {
+		amdUtils.define( 'creator-' + creatorName, [ 'core/creator' ], ( Creator ) => {
+			class TestCreator extends Creator {}
+
+			if ( proto ) {
+				for ( let propName in proto ) {
+					TestCreator.prototype[ propName ] = proto[ propName ];
+				}
+			}
+
+			if ( !TestCreator.prototype.create ) {
+				TestCreator.prototype.create = sinon.spy().named( creatorName + '-create' );
+			}
+
+			if ( !TestCreator.prototype.destroy ) {
+				TestCreator.prototype.destroy = sinon.spy().named( creatorName + '-destroy' );
+			}
+
+			return TestCreator;
+		} );
+	},
+
+	/**
+	 * Returns the number of elements return by the iterator.
+	 *
+	 *		testUtils.getIteratorCount( [ 1, 2, 3, 4, 5 ] ); // 5;
+	 *
+	 * @param {Iterable.<*>} iterator Any iterator.
+	 * @returns {Number} Number of elements returned by that iterator.
+	 */
+	getIteratorCount( iterator ) {
+		let count = 0;
+
+		for ( let _ of iterator ) { // jshint ignore:line
+			count++;
+		}
+
+		return count;
+	}
+};
+
+export default utils;

+ 9 - 19
packages/ckeditor5-engine/tests/ckeditor/ckeditor.js

@@ -3,21 +3,22 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-include: ../_tools/tools.js */
-
 'use strict';
 
-const modules = bender.amd.require( 'ckeditor', 'core/editor', 'core/config' );
+import testUtils from '/tests/_utils/utils.js';
+import coreTestUtils from '/tests/core/_utils/utils.js';
+
+import CKEDITOR from '/ckeditor.js';
+import Editor from '/ckeditor5/core/editor.js';
+import Config from '/ckeditor5/core/config.js';
 
 let content = document.getElementById( 'content' );
 let editorConfig = { creator: 'creator-test' };
 
-bender.tools.createSinonSandbox();
-bender.tools.core.defineEditorCreatorMock( 'test' );
+testUtils.createSinonSandbox();
+coreTestUtils.defineEditorCreatorMock( 'test' );
 
 beforeEach( () => {
-	const CKEDITOR = modules.ckeditor;
-
 	// Destroy all editor instances.
 	while ( CKEDITOR.instances.length ) {
 		CKEDITOR.instances.get( 0 ).destroy();
@@ -25,14 +26,6 @@ beforeEach( () => {
 } );
 
 describe( 'create', () => {
-	let CKEDITOR, Editor, Config;
-
-	before( () => {
-		CKEDITOR = modules.ckeditor;
-		Editor = modules[ 'core/editor' ];
-		Config = modules[ 'core/config' ];
-	} );
-
 	it( 'should return a promise', () => {
 		expect( CKEDITOR.create( content, editorConfig ) ).to.be.instanceof( Promise );
 	} );
@@ -91,7 +84,7 @@ describe( 'create', () => {
 	} );
 
 	it( 'should be rejected on element not found', () => {
-		let addSpy = bender.sinon.spy( CKEDITOR.instances, 'add' );
+		let addSpy = testUtils.sinon.spy( CKEDITOR.instances, 'add' );
 
 		return CKEDITOR.create( '.undefined' ).then( () => {
 			throw new Error( 'It should not enter this function' );
@@ -107,9 +100,6 @@ describe( 'create', () => {
 
 describe( 'config', () => {
 	it( 'should be an instance of Config', () => {
-		const CKEDITOR = modules.ckeditor;
-		const Config = modules[ 'core/config' ];
-
 		expect( CKEDITOR.config ).to.be.an.instanceof( Config );
 	} );
 } );

+ 1 - 7
packages/ckeditor5-engine/tests/ckeditorerror.js

@@ -5,15 +5,9 @@
 
 'use strict';
 
-const modules = bender.amd.require( 'core/ckeditorerror' );
+import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
 
 describe( 'CKEditorError', () => {
-	let CKEditorError;
-
-	before( () => {
-		CKEditorError = modules[ 'core/ckeditorerror' ];
-	} );
-
 	it( 'inherits from Error', () => {
 		let error = new CKEditorError( 'foo' );
 

+ 9 - 14
packages/ckeditor5-engine/tests/collection.js

@@ -5,9 +5,12 @@
 
 'use strict';
 
-const modules = bender.amd.require( 'core/collection', 'core/ckeditorerror', 'core/utils' );
+import testUtils from '/tests/_utils/utils.js';
+import Collection from '/ckeditor5/core/collection.js';
+import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
+import utils from '/ckeditor5/core/utils.js';
 
-bender.tools.createSinonSandbox();
+testUtils.createSinonSandbox();
 
 function getItem( id, idProperty ) {
 	idProperty = idProperty || 'id';
@@ -18,14 +21,6 @@ function getItem( id, idProperty ) {
 }
 
 describe( 'Collection', () => {
-	let Collection, CKEditorError, utils;
-
-	before( () => {
-		Collection = modules[ 'core/collection' ];
-		CKEditorError = modules[ 'core/ckeditorerror' ];
-		utils = modules[ 'core/utils' ];
-	} );
-
 	let collection;
 
 	beforeEach( () => {
@@ -150,7 +145,7 @@ describe( 'Collection', () => {
 			() => {
 				let nextUid = 0;
 
-				bender.sinon.stub( utils, 'uid', () => {
+				testUtils.sinon.stub( utils, 'uid', () => {
 					return nextUid++;
 				} );
 
@@ -440,7 +435,7 @@ describe( 'Collection', () => {
 
 	describe( 'map', () => {
 		it( 'uses native map', () => {
-			let spy = bender.sinon.stub( Array.prototype, 'map', () => {
+			let spy = testUtils.sinon.stub( Array.prototype, 'map', () => {
 				return [ 'foo' ];
 			} );
 			let ctx = {};
@@ -458,7 +453,7 @@ describe( 'Collection', () => {
 		it( 'uses native find', () => {
 			let needl = getItem( 'foo' );
 
-			let spy = bender.sinon.stub( Array.prototype, 'find', () => {
+			let spy = testUtils.sinon.stub( Array.prototype, 'find', () => {
 				return needl;
 			} );
 			let ctx = {};
@@ -476,7 +471,7 @@ describe( 'Collection', () => {
 		it( 'uses native filter', () => {
 			let needl = getItem( 'foo' );
 
-			let spy = bender.sinon.stub( Array.prototype, 'filter', () => {
+			let spy = testUtils.sinon.stub( Array.prototype, 'filter', () => {
 				return [ needl ];
 			} );
 			let ctx = {};

+ 2 - 6
packages/ckeditor5-engine/tests/config.js

@@ -5,13 +5,9 @@
 
 'use strict';
 
-const modules = bender.amd.require( 'core/config' );
+import Config from '/ckeditor5/core/config.js';
 
-let Config, config;
-
-before( () => {
-	Config = modules[ 'core/config' ];
-} );
+let config;
 
 beforeEach( () => {
 	config = new Config( {

+ 15 - 19
packages/ckeditor5-engine/tests/editor/creator.js

@@ -5,11 +5,14 @@
 
 'use strict';
 
-/* bender-include: ../_tools/tools.js */
+import amdUtils from '/tests/_utils/amd.js';
+import testUtils from '/tests/_utils/utils.js';
+import coreTestUtils from '/tests/core/_utils/utils.js';
+import Editor from '/ckeditor5/core/editor.js';
+import Creator from '/ckeditor5/core/creator.js';
+import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
 
-const modules = bender.amd.require( 'core/editor', 'core/plugin', 'core/creator', 'core/ckeditorerror' );
 let editor, element;
-let Editor, Plugin, Creator, CKEditorError;
 
 function initEditor( config ) {
 	element = document.createElement( 'div' );
@@ -20,29 +23,22 @@ function initEditor( config ) {
 	return editor.init();
 }
 
-bender.tools.createSinonSandbox();
+testUtils.createSinonSandbox();
 
 before( () => {
-	Editor = modules[ 'core/editor' ];
-	Plugin = modules[ 'core/plugin' ];
-	Creator = modules[ 'core/creator' ];
-	CKEditorError = modules[ 'core/ckeditorerror' ];
+	coreTestUtils.defineEditorCreatorMock( 'test1' );
 
-	const coreTools = bender.tools.core;
+	coreTestUtils.defineEditorCreatorMock( 'test-throw-on-many1' );
+	coreTestUtils.defineEditorCreatorMock( 'test-throw-on-many2' );
 
-	coreTools.defineEditorCreatorMock( 'test1' );
+	coreTestUtils.defineEditorCreatorMock( 'test-config1' );
+	coreTestUtils.defineEditorCreatorMock( 'test-config2' );
 
-	coreTools.defineEditorCreatorMock( 'test-throw-on-many1' );
-	coreTools.defineEditorCreatorMock( 'test-throw-on-many2' );
-
-	coreTools.defineEditorCreatorMock( 'test-config1' );
-	coreTools.defineEditorCreatorMock( 'test-config2' );
-
-	bender.amd.define( 'test3', [ 'core/plugin' ], ( Plugin ) => {
+	amdUtils.define( 'test3', [ 'core/plugin' ], ( Plugin ) => {
 		return class extends Plugin {};
 	} );
 
-	bender.amd.define( 'creator-async-create', [ 'core/creator' ], ( Creator ) => {
+	amdUtils.define( 'creator-async-create', [ 'core/creator' ], ( Creator ) => {
 		return class extends Creator {
 			create() {
 				return new Promise( ( resolve, reject ) => {
@@ -54,7 +50,7 @@ before( () => {
 		};
 	} );
 
-	bender.amd.define( 'creator-async-destroy', [ 'core/creator' ], ( Creator ) => {
+	amdUtils.define( 'creator-async-destroy', [ 'core/creator' ], ( Creator ) => {
 		return class extends Creator {
 			create() {}
 

+ 8 - 11
packages/ckeditor5-engine/tests/editor/editor.js

@@ -3,23 +3,20 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-include: ../_tools/tools.js */
-
 'use strict';
 
-const modules = bender.amd.require( 'core/editor', 'core/editorconfig', 'core/plugin' );
-let Editor, EditorConfig, Plugin;
+import amdUtils from '/tests/_utils/amd.js';
+import coreTestUtils from '/tests/core/_utils/utils.js';
+import Editor from '/ckeditor5/core/editor.js';
+import EditorConfig from '/ckeditor5/core/editorconfig.js';
+import Plugin from '/ckeditor5/core/plugin.js';
 
 const pluginClasses = {};
 let element;
 
 before( () => {
-	Editor = modules[ 'core/editor' ];
-	EditorConfig = modules[ 'core/editorconfig' ];
-	Plugin = modules[ 'core/plugin' ];
-
 	// Define fake plugins to be used in tests.
-	bender.tools.core.defineEditorCreatorMock( 'test', {
+	coreTestUtils.defineEditorCreatorMock( 'test', {
 		init: sinon.spy().named( 'creator-test' )
 	} );
 
@@ -122,7 +119,7 @@ describe( 'init', () => {
 		// Synchronous plugin that depends on an asynchronous one.
 		pluginDefinition( 'sync', [ 'async' ] );
 
-		bender.amd.define( 'async', () => {
+		amdUtils.define( 'async', () => {
 			PluginAsync.prototype.init = sinon.spy( () => {
 				return new Promise( ( resolve ) => {
 					setTimeout( () => {
@@ -187,7 +184,7 @@ describe( 'destroy', () => {
  * @param {String[]} deps Dependencies of the plugin (only other plugins).
  */
 function pluginDefinition( name, deps ) {
-	bender.amd.define( name, deps || [], function() {
+	amdUtils.define( name, deps || [], function() {
 		class NewPlugin extends Plugin {}
 
 		NewPlugin.prototype.init = sinon.spy().named( name );

+ 2 - 5
packages/ckeditor5-engine/tests/editorconfig.js

@@ -5,13 +5,12 @@
 
 'use strict';
 
-const modules = bender.amd.require( 'core/editorconfig', 'ckeditor' );
+import EditorConfig from '/ckeditor5/core/editorconfig.js';
+import CKEDITOR from '/ckeditor.js';
 
 let config;
 
 beforeEach( () => {
-	const EditorConfig = modules[ 'core/editorconfig' ];
-
 	config = new EditorConfig( {
 		test: 1
 	} );
@@ -29,8 +28,6 @@ describe( 'get', () => {
 	} );
 
 	it( 'should fallback to CKEDITOR.config', () => {
-		const CKEDITOR = modules.ckeditor;
-
 		CKEDITOR.config.set( {
 			globalConfig: 2
 		} );

+ 4 - 8
packages/ckeditor5-engine/tests/emittermixin.js

@@ -5,15 +5,11 @@
 
 'use strict';
 
-const modules = bender.amd.require( 'core/emittermixin', 'core/eventinfo', 'core/lib/lodash/object' );
-let EmitterMixin, EventInfo, utilsObject;
-let emitter, listener;
+import EmitterMixin from '/ckeditor5/core/emittermixin.js';
+import EventInfo from '/ckeditor5/core/eventinfo.js';
+import utilsObject from '/ckeditor5/core/lib/lodash/object.js';
 
-before( () => {
-	EmitterMixin = modules[ 'core/emittermixin' ];
-	EventInfo = modules[ 'core/eventinfo' ];
-	utilsObject = modules[ 'core/lib/lodash/object' ];
-} );
+let emitter, listener;
 
 beforeEach( refreshEmitter );
 

+ 1 - 7
packages/ckeditor5-engine/tests/eventinfo.js

@@ -5,15 +5,9 @@
 
 'use strict';
 
-const modules = bender.amd.require( 'core/eventinfo' );
+import EventInfo from '/ckeditor5/core/eventinfo.js';
 
 describe( 'EventInfo', () => {
-	let EventInfo;
-
-	before( () => {
-		EventInfo = modules[ 'core/eventinfo' ];
-	} );
-
 	it( 'should be created properly', () => {
 		let event = new EventInfo( this, 'test' );
 

+ 1 - 7
packages/ckeditor5-engine/tests/lodash.js

@@ -5,15 +5,9 @@
 
 'use strict';
 
-const modules = bender.amd.require( 'core/lib/lodash/object' );
+import objectUtils from '/ckeditor5/core/lib/lodash/object.js';
 
 describe( 'utils', () => {
-	let objectUtils;
-
-	before( () => {
-		objectUtils = modules[ 'core/lib/lodash/object' ];
-	} );
-
 	describe( 'extend()', () => {
 		// Properties of the subsequent objects should override properties of the preceding objects. This is critical for
 		// CKEditor so we keep this test to ensure that Lo-Dash (or whatever) implements it in the way we need it.

+ 2 - 4
packages/ckeditor5-engine/tests/log.js

@@ -7,13 +7,11 @@
 
 'use strict';
 
-const modules = bender.amd.require( 'core/log' );
-let log;
+import log from '/ckeditor5/core/log.js';
+
 let spy;
 
 beforeEach( () => {
-	log = modules[ 'core/log' ];
-
 	if ( spy ) {
 		spy.restore();
 	}

+ 5 - 10
packages/ckeditor5-engine/tests/model.js

@@ -5,21 +5,16 @@
 
 'use strict';
 
-const modules = bender.amd.require( 'core/model', 'core/eventinfo', 'core/ckeditorerror' );
+import testUtils from '/tests/_utils/utils.js';
+import Model from '/ckeditor5/core/model.js';
+import EventInfo from '/ckeditor5/core/eventinfo.js';
+import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
 
 let Car, car;
 
-bender.tools.createSinonSandbox();
+testUtils.createSinonSandbox();
 
 describe( 'Model', () => {
-	let Model, EventInfo, CKEditorError;
-
-	before( () => {
-		Model = modules[ 'core/model' ];
-		EventInfo = modules[ 'core/eventinfo' ];
-		CKEditorError = modules[ 'core/ckeditorerror' ];
-	} );
-
 	beforeEach( 'Create a test model instance', () => {
 		Car = class extends Model {};
 

+ 3 - 5
packages/ckeditor5-engine/tests/plugin.js

@@ -5,19 +5,17 @@
 
 'use strict';
 
-const modules = bender.amd.require( 'core/plugin', 'core/editor' );
+import Plugin from '/ckeditor5/core/plugin.js';
+import Editor from '/ckeditor5/core/editor.js';
+
 let editor;
 
 before( () => {
-	const Editor = modules[ 'core/editor' ];
-
 	editor = new Editor( document.body.appendChild( document.createElement( 'div' ) ) );
 } );
 
 describe( 'constructor', () => {
 	it( 'should set the `editor` property', () => {
-		const Plugin = modules[ 'core/plugin' ];
-
 		let plugin = new Plugin( editor );
 
 		expect( plugin ).to.have.property( 'editor' ).to.equal( editor );

+ 38 - 30
packages/ckeditor5-engine/tests/plugincollection.js

@@ -5,30 +5,22 @@
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/editor',
-	'core/plugincollection',
-	'core/plugin',
-	'core/creator',
-	'core/ckeditorerror',
-	'core/log'
-);
-let PluginCollection, Plugin, Editor, Creator, CKEditorError, log;
+import amdUtils from '/tests/_utils/amd.js';
+import testUtils from '/tests/_utils/utils.js';
+import Editor from '/ckeditor5/core/editor.js';
+import PluginCollection from '/ckeditor5/core/plugincollection.js';
+import Plugin from '/ckeditor5/core/plugin.js';
+import Creator from '/ckeditor5/core/creator.js';
+import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
+import log from '/ckeditor5/core/log.js';
 
 let editor;
 let PluginA, PluginB, PluginC, PluginD, PluginE, PluginF, PluginG;
 class TestError extends Error {}
 
-bender.tools.createSinonSandbox();
+testUtils.createSinonSandbox();
 
 before( () => {
-	PluginCollection = modules[ 'core/plugincollection' ];
-	Editor = modules[ 'core/editor' ];
-	Plugin = modules[ 'core/plugin' ];
-	Creator = modules[ 'core/creator' ];
-	CKEditorError = modules[ 'core/ckeditorerror' ];
-	log = modules[ 'core/log' ];
-
 	PluginA = createPlugin( 'A' );
 	PluginB = createPlugin( 'B' );
 	PluginC = createPlugin( 'C' );
@@ -47,41 +39,41 @@ before( () => {
 
 // Create fake plugins that will be used on tests.
 
-bender.amd.define( 'A', () => {
+amdUtils.define( 'A', () => {
 	return PluginA;
 } );
 
-bender.amd.define( 'B', () => {
+amdUtils.define( 'B', () => {
 	return PluginB;
 } );
 
-bender.amd.define( 'C', [ 'core/plugin', 'B' ], () => {
+amdUtils.define( 'C', [ 'core/editor', 'B' ], () => {
 	return PluginC;
 } );
 
-bender.amd.define( 'D', [ 'core/plugin', 'A', 'C' ], () => {
+amdUtils.define( 'D', [ 'core/editor', 'A', 'C' ], () => {
 	return PluginD;
 } );
 
-bender.amd.define( 'E', [ 'core/plugin', 'F' ], () => {
+amdUtils.define( 'E', [ 'core/editor', 'F' ], () => {
 	return PluginE;
 } );
 
-bender.amd.define( 'F', [ 'core/plugin', 'E' ], () => {
+amdUtils.define( 'F', [ 'core/editor', 'E' ], () => {
 	return PluginF;
 } );
 
-bender.amd.define( 'G', () => {
+amdUtils.define( 'G', () => {
 	return PluginG;
 } );
 
 // Erroneous cases.
 
-bender.amd.define( 'X', () => {
+amdUtils.define( 'X', () => {
 	throw new TestError( 'Some error inside a plugin' );
 } );
 
-bender.amd.define( 'Y', () => {
+amdUtils.define( 'Y', () => {
 	return class {};
 } );
 
@@ -194,7 +186,7 @@ describe( 'load', () => {
 	} );
 
 	it( 'should reject on invalid plugin names (forward require.js loading error)', () => {
-		let logSpy = bender.sinon.stub( log, 'error' );
+		let logSpy = testUtils.sinon.stub( log, 'error' );
 
 		let plugins = new PluginCollection( editor );
 
@@ -214,7 +206,7 @@ describe( 'load', () => {
 	} );
 
 	it( 'should reject on broken plugins (forward the error thrown in a plugin)', () => {
-		let logSpy = bender.sinon.stub( log, 'error' );
+		let logSpy = testUtils.sinon.stub( log, 'error' );
 
 		let plugins = new PluginCollection( editor );
 
@@ -233,7 +225,7 @@ describe( 'load', () => {
 	} );
 
 	it( 'should reject when loading a module which is not a plugin', () => {
-		let logSpy = bender.sinon.stub( log, 'error' );
+		let logSpy = testUtils.sinon.stub( log, 'error' );
 
 		let plugins = new PluginCollection( editor );
 
@@ -252,8 +244,24 @@ describe( 'load', () => {
 	} );
 } );
 
+describe( 'getPluginPath()', () => {
+	it( 'generates path for modules within some package', () => {
+		const p = PluginCollection.getPluginPath( 'some/ba' );
+
+		expect( p ).to.equal( 'ckeditor5/some/ba.js' );
+	} );
+
+	it( 'generates path from simplified feature name', () => {
+		const p = PluginCollection.getPluginPath( 'foo' );
+
+		expect( p ).to.equal( 'ckeditor5/foo/foo.js' );
+	} );
+} );
+
 function createPlugin( name, baseClass ) {
-	const P = class extends ( baseClass || Plugin ) {
+	baseClass = baseClass || Plugin;
+
+	const P = class extends baseClass {
 		constructor( editor ) {
 			super( editor );
 			this._pluginName = name;

+ 36 - 0
packages/ckeditor5-engine/tests/treemodel/_utils/utils.js

@@ -0,0 +1,36 @@
+/**
+ * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md.
+ */
+
+'use strict';
+
+const utils = {
+	/**
+	 * Returns tree structure as a simplified string. Elements are uppercase and characters are lowercase.
+	 * Start and end of an element is marked the same way, by the element's name (in uppercase).
+	 *
+	 *		let element = new Element( 'div', [], [ 'abc', new Element( 'p', [], 'foo' ), 'xyz' ] );
+	 *		treemodelUtils.getNodesAndText( element ); // abcPfooPxyz
+	 *
+	 * @param {treeModel.Range} range Range to stringify.
+	 * @returns {String} String representing element inner structure.
+	 */
+	getNodesAndText( range ) {
+		let txt = '';
+
+		for ( let step of range ) {
+			let node = step.node;
+
+			if ( node.character ) {
+				txt += node.character.toLowerCase();
+			} else if ( node.name ) {
+				txt += node.name.toUpperCase();
+			}
+		}
+
+		return txt;
+	}
+};
+
+export default utils;

+ 1 - 7
packages/ckeditor5-engine/tests/treemodel/attribute.js

@@ -7,15 +7,9 @@
 
 'use strict';
 
-const modules = bender.amd.require( 'core/treemodel/attribute' );
+import Attribute from '/ckeditor5/core/treemodel/attribute.js';
 
 describe( 'Attribute', () => {
-	let Attribute;
-
-	before( () => {
-		Attribute = modules[ 'core/treemodel/attribute' ];
-	} );
-
 	beforeEach( () => {
 		Attribute._register = {};
 	} );

+ 4 - 13
packages/ckeditor5-engine/tests/treemodel/attributelist.js

@@ -4,25 +4,16 @@
  */
 
 /* bender-tags: treemodel */
-/* bender-include: ../_tools/tools.js */
 
 'use strict';
 
-const getIteratorCount = bender.tools.core.getIteratorCount;
+import coreTestUtils from '/tests/core/_utils/utils.js';
+import AttributeList from '/ckeditor5/core/treemodel/attributelist.js';
+import Attribute from '/ckeditor5/core/treemodel/attribute.js';
 
-const modules = bender.amd.require(
-	'core/treemodel/attributelist',
-	'core/treemodel/attribute'
-);
+const getIteratorCount = coreTestUtils.getIteratorCount;
 
 describe( 'AttributeList', () => {
-	let AttributeList, Attribute;
-
-	before( () => {
-		AttributeList = modules[ 'core/treemodel/attributelist' ];
-		Attribute = modules[ 'core/treemodel/attribute' ];
-	} );
-
 	let list, attrFooBar;
 
 	beforeEach( () => {

+ 3 - 13
packages/ckeditor5-engine/tests/treemodel/batch.js

@@ -7,21 +7,11 @@
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treemodel/batch',
-	'core/treemodel/delta/delta',
-	'core/ckeditorerror'
-);
+import Batch from '/ckeditor5/core/treemodel/batch.js';
+import Delta from '/ckeditor5/core/treemodel/delta/delta.js';
+import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
 
 describe( 'Batch', () => {
-	let Batch, Delta, CKEditorError;
-
-	before( () => {
-		Batch = modules[ 'core/treemodel/batch' ];
-		Delta = modules[ 'core/treemodel/delta/delta' ];
-		CKEditorError = modules[ 'core/ckeditorerror' ];
-	} );
-
 	it( 'should have registered basic methods', () => {
 		const batch = new Batch();
 

+ 6 - 17
packages/ckeditor5-engine/tests/treemodel/character.js

@@ -4,29 +4,18 @@
  */
 
 /* bender-tags: treemodel */
-/* bender-include: ../_tools/tools.js */
 
 'use strict';
 
-const getIteratorCount = bender.tools.core.getIteratorCount;
+import coreTestUtils from '/tests/core/_utils/utils.js';
+import Character from '/ckeditor5/core/treemodel/character.js';
+import Node from '/ckeditor5/core/treemodel/node.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
+import Attribute from '/ckeditor5/core/treemodel/attribute.js';
 
-const modules = bender.amd.require(
-	'core/treemodel/character',
-	'core/treemodel/node',
-	'core/treemodel/element',
-	'core/treemodel/attribute'
-);
+const getIteratorCount = coreTestUtils.getIteratorCount;
 
 describe( 'Character', () => {
-	let Element, Character, Node, Attribute;
-
-	before( () => {
-		Element = modules[ 'core/treemodel/element' ];
-		Character = modules[ 'core/treemodel/character' ];
-		Node = modules[ 'core/treemodel/node' ];
-		Attribute = modules[ 'core/treemodel/attribute' ];
-	} );
-
 	describe( 'constructor', () => {
 		it( 'should create character without attributes', () => {
 			let character = new Character( 'f' );

+ 9 - 25
packages/ckeditor5-engine/tests/treemodel/delta/attributedelta.js

@@ -5,38 +5,22 @@
 
 /* bender-tags: treemodel, delta */
 
-/* bender-include: ../../_tools/tools.js */
-
 'use strict';
 
-const getIteratorCount = bender.tools.core.getIteratorCount;
+import coreTestUtils from '/tests/core/_utils/utils.js';
+import Document from '/ckeditor5/core/treemodel/document.js';
+import Text from '/ckeditor5/core/treemodel/text.js';
+import Attribute from '/ckeditor5/core/treemodel/attribute.js';
+import Range from '/ckeditor5/core/treemodel/range.js';
+import Position from '/ckeditor5/core/treemodel/position.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
+import Character from '/ckeditor5/core/treemodel/character.js';
 
-const modules = bender.amd.require(
-	'core/treemodel/batch',
-	'core/treemodel/document',
-	'core/treemodel/text',
-	'core/treemodel/attribute',
-	'core/treemodel/range',
-	'core/treemodel/position',
-	'core/treemodel/element',
-	'core/treemodel/character' );
+const getIteratorCount = coreTestUtils.getIteratorCount;
 
 describe( 'Batch', () => {
-	let Batch, Document, Text, Attribute, Range, Position, Element, Character;
-
 	let doc, root, batch;
 
-	before( () => {
-		Batch = modules[ 'core/treemodel/batch' ];
-		Document = modules[ 'core/treemodel/document' ];
-		Text = modules[ 'core/treemodel/text' ];
-		Attribute = modules[ 'core/treemodel/attribute' ];
-		Range = modules[ 'core/treemodel/range' ];
-		Position = modules[ 'core/treemodel/position' ];
-		Element = modules[ 'core/treemodel/element' ];
-		Character = modules[ 'core/treemodel/character' ];
-	} );
-
 	beforeEach( () => {
 		doc = new Document();
 		root = doc.createRoot( 'root' );

+ 3 - 12
packages/ckeditor5-engine/tests/treemodel/delta/delta.js

@@ -5,23 +5,14 @@
 
 /* bender-tags: treemodel, delta */
 
-/* bender-include: ../../_tools/tools.js */
-
 'use strict';
 
-const getIteratorCount = bender.tools.core.getIteratorCount;
+import coreTestUtils from '/tests/core/_utils/utils.js';
+import Delta from '/ckeditor5/core/treemodel/delta/delta.js';
 
-const modules = bender.amd.require(
-	'core/treemodel/delta/delta'
-);
+const getIteratorCount = coreTestUtils.getIteratorCount;
 
 describe( 'Delta', () => {
-	let Delta;
-
-	before( () => {
-		Delta = modules[ 'core/treemodel/delta/delta' ];
-	} );
-
 	describe( 'constructor', () => {
 		it( 'should create an delta with empty properties', () => {
 			const delta = new Delta();

+ 3 - 15
packages/ckeditor5-engine/tests/treemodel/delta/insertdelta.js

@@ -7,23 +7,11 @@
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treemodel/document',
-	'core/treemodel/element',
-	'core/treemodel/position',
-	'core/treemodel/delta/insertdelta'
-);
+import Document from '/ckeditor5/core/treemodel/document.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
+import Position from '/ckeditor5/core/treemodel/position.js';
 
 describe( 'Batch', () => {
-	let Document, Element, Position, InsertDelta;
-
-	before( () => {
-		Document = modules[ 'core/treemodel/document' ];
-		Element = modules[ 'core/treemodel/element' ];
-		Position = modules[ 'core/treemodel/position' ];
-		InsertDelta = modules[ 'core/treemodel/delta/insertdelta' ];
-	} );
-
 	let doc, root, batch, p, ul, chain;
 
 	beforeEach( () => {

+ 7 - 19
packages/ckeditor5-engine/tests/treemodel/delta/mergedelta.js

@@ -5,32 +5,20 @@
 
 /* bender-tags: treemodel, delta */
 
-/* bender-include: ../../_tools/tools.js */
-
 'use strict';
 
-const getIteratorCount = bender.tools.core.getIteratorCount;
+import coreTestUtils from '/tests/core/_utils/utils.js';
+import Document from '/ckeditor5/core/treemodel/document.js';
+import Position from '/ckeditor5/core/treemodel/position.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
+import Attribute from '/ckeditor5/core/treemodel/attribute.js';
+import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
 
-const modules = bender.amd.require(
-	'core/treemodel/document',
-	'core/treemodel/position',
-	'core/treemodel/element',
-	'core/treemodel/attribute',
-	'core/ckeditorerror' );
+const getIteratorCount = coreTestUtils.getIteratorCount;
 
 describe( 'Batch', () => {
-	let Document, Position, Element, Attribute, CKEditorError;
-
 	let doc, root, p1, p2;
 
-	before( () => {
-		Document = modules[ 'core/treemodel/document' ];
-		Position = modules[ 'core/treemodel/position' ];
-		Element = modules[ 'core/treemodel/element' ];
-		Attribute = modules[ 'core/treemodel/attribute' ];
-		CKEditorError = modules[ 'core/ckeditorerror' ];
-	} );
-
 	beforeEach( () => {
 		doc = new Document();
 		root = doc.createRoot( 'root' );

+ 7 - 19
packages/ckeditor5-engine/tests/treemodel/delta/movedelta.js

@@ -4,33 +4,21 @@
  */
 
 /* bender-tags: treemodel, delta */
-/* bender-include: ../../_tools/tools.js */
 
 'use strict';
 
-const getNodesAndText = bender.tools.treemodel.getNodesAndText;
+import treeModelTestUtils from '/tests/core/treemodel/_utils/utils.js';
+import Document from '/ckeditor5/core/treemodel/document.js';
+import Position from '/ckeditor5/core/treemodel/position.js';
+import Range from '/ckeditor5/core/treemodel/range.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
+import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
 
-const modules = bender.amd.require(
-	'core/treemodel/document',
-	'core/treemodel/position',
-	'core/treemodel/range',
-	'core/treemodel/element',
-	'core/ckeditorerror'
-);
+const getNodesAndText = treeModelTestUtils.getNodesAndText;
 
 describe( 'Batch', () => {
-	let Document, Position, Range, Element, CKEditorError;
-
 	let doc, root, div, p, batch, chain;
 
-	before( () => {
-		Document = modules[ 'core/treemodel/document' ];
-		Position = modules[ 'core/treemodel/position' ];
-		Range = modules[ 'core/treemodel/range' ];
-		Element = modules[ 'core/treemodel/element' ];
-		CKEditorError = modules[ 'core/ckeditorerror' ];
-	} );
-
 	beforeEach( () => {
 		doc = new Document();
 		root = doc.createRoot( 'root' );

+ 6 - 17
packages/ckeditor5-engine/tests/treemodel/delta/removedelta.js

@@ -4,31 +4,20 @@
  */
 
 /* bender-tags: treemodel, delta */
-/* bender-include: ../../_tools/tools.js */
 
 'use strict';
 
-const getNodesAndText = bender.tools.treemodel.getNodesAndText;
+import treeModelTestUtils from '/tests/core/treemodel/_utils/utils.js';
+import Document from '/ckeditor5/core/treemodel/document.js';
+import Position from '/ckeditor5/core/treemodel/position.js';
+import Range from '/ckeditor5/core/treemodel/range.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
 
-const modules = bender.amd.require(
-	'core/treemodel/document',
-	'core/treemodel/position',
-	'core/treemodel/range',
-	'core/treemodel/element'
-);
+const getNodesAndText = treeModelTestUtils.getNodesAndText;
 
 describe( 'Batch', () => {
-	let Document, Position, Range, Element;
-
 	let doc, root, div, p, batch, chain, range;
 
-	before( () => {
-		Document = modules[ 'core/treemodel/document' ];
-		Position = modules[ 'core/treemodel/position' ];
-		Range = modules[ 'core/treemodel/range' ];
-		Element = modules[ 'core/treemodel/element' ];
-	} );
-
 	beforeEach( () => {
 		doc = new Document();
 		root = doc.createRoot( 'root' );

+ 7 - 19
packages/ckeditor5-engine/tests/treemodel/delta/splitdelta.js

@@ -5,32 +5,20 @@
 
 /* bender-tags: treemodel, delta */
 
-/* bender-include: ../../_tools/tools.js */
-
 'use strict';
 
-const getIteratorCount = bender.tools.core.getIteratorCount;
+import coreTestUtils from '/tests/core/_utils/utils.js';
+import Document from '/ckeditor5/core/treemodel/document.js';
+import Position from '/ckeditor5/core/treemodel/position.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
+import Attribute from '/ckeditor5/core/treemodel/attribute.js';
+import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
 
-const modules = bender.amd.require(
-	'core/treemodel/document',
-	'core/treemodel/position',
-	'core/treemodel/element',
-	'core/treemodel/attribute',
-	'core/ckeditorerror' );
+const getIteratorCount = coreTestUtils.getIteratorCount;
 
 describe( 'Batch', () => {
-	let Document, Position, Element, Attribute, CKEditorError;
-
 	let doc, root, p;
 
-	before( () => {
-		Document = modules[ 'core/treemodel/document' ];
-		Position = modules[ 'core/treemodel/position' ];
-		Element = modules[ 'core/treemodel/element' ];
-		Attribute = modules[ 'core/treemodel/attribute' ];
-		CKEditorError = modules[ 'core/ckeditorerror' ];
-	} );
-
 	beforeEach( () => {
 		doc = new Document();
 		root = doc.createRoot( 'root' );

+ 3 - 17
packages/ckeditor5-engine/tests/treemodel/delta/unwrapdelta.js

@@ -5,29 +5,15 @@
 
 /* bender-tags: treemodel, delta */
 
-/* bender-include: ../../_tools/tools.js */
-
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treemodel/document',
-	'core/treemodel/position',
-	'core/treemodel/element',
-	'core/ckeditorerror'
-);
+import Document from '/ckeditor5/core/treemodel/document.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
+import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
 
 describe( 'Batch', () => {
-	let Document, Position, Element, CKEditorError;
-
 	let doc, root, p;
 
-	before( () => {
-		Document = modules[ 'core/treemodel/document' ];
-		Position = modules[ 'core/treemodel/position' ];
-		Element = modules[ 'core/treemodel/element' ];
-		CKEditorError = modules[ 'core/ckeditorerror' ];
-	} );
-
 	beforeEach( () => {
 		doc = new Document();
 		root = doc.createRoot( 'root' );

+ 3 - 13
packages/ckeditor5-engine/tests/treemodel/delta/weakinsertdelta.js

@@ -7,21 +7,11 @@
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treemodel/document',
-	'core/treemodel/attribute',
-	'core/treemodel/position'
-);
+import Document from '/ckeditor5/core/treemodel/document.js';
+import Attribute from '/ckeditor5/core/treemodel/attribute.js';
+import Position from '/ckeditor5/core/treemodel/position.js';
 
 describe( 'Batch', () => {
-	let Document, Attribute, Position;
-
-	before( () => {
-		Document = modules[ 'core/treemodel/document' ];
-		Attribute = modules[ 'core/treemodel/attribute' ];
-		Position = modules[ 'core/treemodel/position' ];
-	} );
-
 	let doc, root, batch, chain, attrs;
 
 	beforeEach( () => {

+ 5 - 19
packages/ckeditor5-engine/tests/treemodel/delta/wrapdelta.js

@@ -5,31 +5,17 @@
 
 /* bender-tags: treemodel, delta */
 
-/* bender-include: ../../_tools/tools.js */
-
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treemodel/document',
-	'core/treemodel/position',
-	'core/treemodel/range',
-	'core/treemodel/element',
-	'core/ckeditorerror'
-);
+import Document from '/ckeditor5/core/treemodel/document.js';
+import Position from '/ckeditor5/core/treemodel/position.js';
+import Range from '/ckeditor5/core/treemodel/range.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
+import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
 
 describe( 'Batch', () => {
-	let Document, Position, Range, Element, CKEditorError;
-
 	let doc, root, range;
 
-	before( () => {
-		Document = modules[ 'core/treemodel/document' ];
-		Position = modules[ 'core/treemodel/position' ];
-		Range = modules[ 'core/treemodel/range' ];
-		Element = modules[ 'core/treemodel/element' ];
-		CKEditorError = modules[ 'core/ckeditorerror' ];
-	} );
-
 	beforeEach( () => {
 		doc = new Document();
 		root = doc.createRoot( 'root' );

+ 9 - 31
packages/ckeditor5-engine/tests/treemodel/document/change-event.js

@@ -7,39 +7,17 @@
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treemodel/document',
-	'core/treemodel/element',
-	'core/treemodel/rootelement',
-	'core/treemodel/attribute',
-	'core/treemodel/position',
-	'core/treemodel/range',
-	'core/treemodel/operation/attributeoperation',
-	'core/treemodel/operation/insertoperation',
-	'core/treemodel/operation/moveoperation',
-	'core/treemodel/operation/reinsertoperation',
-	'core/treemodel/operation/removeoperation'
-);
+import Document from '/ckeditor5/core/treemodel/document.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
+import Attribute from '/ckeditor5/core/treemodel/attribute.js';
+import Position from '/ckeditor5/core/treemodel/position.js';
+import Range from '/ckeditor5/core/treemodel/range.js';
+import AttributeOperation from '/ckeditor5/core/treemodel/operation/attributeoperation.js';
+import InsertOperation from '/ckeditor5/core/treemodel/operation/insertoperation.js';
+import MoveOperation from '/ckeditor5/core/treemodel/operation/moveoperation.js';
+import RemoveOperation from '/ckeditor5/core/treemodel/operation/removeoperation.js';
 
 describe( 'Document change event', () => {
-	let Document, RootElement, Element, Range, Position;
-	let AttributeOperation, InsertOperation, MoveOperation, ReinsertOperation, RemoveOperation, Attribute;
-
-	before( () => {
-		Document = modules[ 'core/treemodel/document' ];
-		Element = modules[ 'core/treemodel/element' ];
-		RootElement = modules[ 'core/treemodel/rootelement' ];
-		Attribute = modules[ 'core/treemodel/attribute' ];
-		Position = modules[ 'core/treemodel/position' ];
-		Range = modules[ 'core/treemodel/range' ];
-
-		InsertOperation = modules[ 'core/treemodel/operation/insertoperation' ];
-		AttributeOperation = modules[ 'core/treemodel/operation/attributeoperation' ];
-		MoveOperation = modules[ 'core/treemodel/operation/moveoperation' ];
-		ReinsertOperation = modules[ 'core/treemodel/operation/reinsertoperation' ];
-		RemoveOperation = modules[ 'core/treemodel/operation/removeoperation' ];
-	} );
-
 	let doc, root, graveyard, types, changes;
 
 	beforeEach( () => {

+ 4 - 15
packages/ckeditor5-engine/tests/treemodel/document/document.js

@@ -7,23 +7,12 @@
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treemodel/document',
-	'core/treemodel/rootelement',
-	'core/treemodel/batch',
-	'core/ckeditorerror'
-);
+import Document from '/ckeditor5/core/treemodel/document.js';
+import RootElement from '/ckeditor5/core/treemodel/rootelement.js';
+import Batch from '/ckeditor5/core/treemodel/batch.js';
+import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
 
 describe( 'Document', () => {
-	let Document, RootElement, Batch, CKEditorError;
-
-	before( () => {
-		Document = modules[ 'core/treemodel/document' ];
-		RootElement = modules[ 'core/treemodel/rootelement' ];
-		Batch = modules[ 'core/treemodel/batch' ];
-		CKEditorError = modules[ 'core/ckeditorerror' ];
-	} );
-
 	let doc;
 
 	beforeEach( () => {

+ 6 - 17
packages/ckeditor5-engine/tests/treemodel/element.js

@@ -4,29 +4,18 @@
  */
 
 /* bender-tags: treemodel */
-/* 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/treemodel/node.js';
+import NodeList from '/ckeditor5/core/treemodel/nodelist.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
+import Attribute from '/ckeditor5/core/treemodel/attribute.js';
 
-const modules = bender.amd.require(
-	'core/treemodel/node',
-	'core/treemodel/nodelist',
-	'core/treemodel/element',
-	'core/treemodel/attribute'
-);
+const getIteratorCount = coreTestUtils.getIteratorCount;
 
 describe( 'Element', () => {
-	let Element, Node, NodeList, Attribute;
-
-	before( () => {
-		Element = modules[ 'core/treemodel/element' ];
-		Node = modules[ 'core/treemodel/node' ];
-		NodeList = modules[ 'core/treemodel/nodelist' ];
-		Attribute = modules[ 'core/treemodel/attribute' ];
-	} );
-
 	describe( 'constructor', () => {
 		it( 'should create element without attributes', () => {
 			let element = new Element( 'elem' );

+ 5 - 16
packages/ckeditor5-engine/tests/treemodel/liveposition.js

@@ -7,27 +7,16 @@
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treemodel/document',
-	'core/treemodel/element',
-	'core/treemodel/position',
-	'core/treemodel/liveposition',
-	'core/treemodel/range',
-	'core/emittermixin'
-);
+import Document from '/ckeditor5/core/treemodel/document.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
+import Position from '/ckeditor5/core/treemodel/position.js';
+import LivePosition from '/ckeditor5/core/treemodel/liveposition.js';
+import Range from '/ckeditor5/core/treemodel/range.js';
 
 describe( 'LivePosition', () => {
-	let Document, Element, Position, LivePosition, Range, EmitterMixin;
 	let doc, root, ul, p, li1, li2;
 
 	before( () => {
-		Document = modules[ 'core/treemodel/document' ];
-		Element = modules[ 'core/treemodel/element' ];
-		Position = modules[ 'core/treemodel/position' ];
-		LivePosition = modules[ 'core/treemodel/liveposition' ];
-		Range = modules[ 'core/treemodel/range' ];
-		EmitterMixin = modules[ 'core/emittermixin' ];
-
 		doc = new Document();
 		root = doc.createRoot( 'root' );
 

+ 5 - 16
packages/ckeditor5-engine/tests/treemodel/liverange.js

@@ -7,27 +7,16 @@
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treemodel/document',
-	'core/treemodel/element',
-	'core/treemodel/position',
-	'core/treemodel/liverange',
-	'core/treemodel/range',
-	'core/emittermixin'
-);
+import Document from '/ckeditor5/core/treemodel/document.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
+import Position from '/ckeditor5/core/treemodel/position.js';
+import LiveRange from '/ckeditor5/core/treemodel/liverange.js';
+import Range from '/ckeditor5/core/treemodel/range.js';
 
 describe( 'LiveRange', () => {
-	let Document, Element, Position, LiveRange, Range, EmitterMixin;
 	let doc, root, ul, p;
 
 	before( () => {
-		Document = modules[ 'core/treemodel/document' ];
-		Element = modules[ 'core/treemodel/element' ];
-		Position = modules[ 'core/treemodel/position' ];
-		LiveRange = modules[ 'core/treemodel/liverange' ];
-		Range = modules[ 'core/treemodel/range' ];
-		EmitterMixin = modules[ 'core/emittermixin' ];
-
 		doc = new Document();
 		root = doc.createRoot( 'root' );
 

+ 6 - 19
packages/ckeditor5-engine/tests/treemodel/node.js

@@ -4,37 +4,24 @@
  */
 
 /* bender-tags: treemodel */
-/* bender-include: ../_tools/tools.js */
 
 'use strict';
 
-const getIteratorCount = bender.tools.core.getIteratorCount;
+import coreTestUtils from '/tests/core/_utils/utils.js';
+import Attribute from '/ckeditor5/core/treemodel/attribute.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
+import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
+import Character from '/ckeditor5/core/treemodel/character.js';
 
-const modules = bender.amd.require(
-	'core/treemodel/element',
-	'core/treemodel/character',
-	'core/treemodel/attribute',
-	'core/treemodel/attributelist',
-	'core/treemodel/nodelist',
-	'core/ckeditorerror'
-);
+const getIteratorCount = coreTestUtils.getIteratorCount;
 
 describe( 'Node', () => {
-	let Element, Character, Attribute, AttributeList, NodeList, CKEditorError;
-
 	let root;
 	let one, two, three;
 	let charB, charA, charR, img, attrEle;
 	let attrFooBar;
 
 	before( () => {
-		Element = modules[ 'core/treemodel/element' ];
-		Character = modules[ 'core/treemodel/character' ];
-		Attribute = modules[ 'core/treemodel/attribute' ];
-		AttributeList = modules[ 'core/treemodel/attributelist' ];
-		NodeList = modules[ 'core/treemodel/nodelist' ];
-		CKEditorError = modules[ 'core/ckeditorerror' ];
-
 		charB = new Character( 'b' );
 		charA = new Character( 'a' );
 		img = new Element( 'img' );

+ 4 - 15
packages/ckeditor5-engine/tests/treemodel/nodelist.js

@@ -7,23 +7,12 @@
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treemodel/nodelist',
-	'core/treemodel/character',
-	'core/treemodel/text',
-	'core/treemodel/attribute'
-);
+import NodeList from '/ckeditor5/core/treemodel/nodelist.js';
+import Character from '/ckeditor5/core/treemodel/character.js';
+import Text from '/ckeditor5/core/treemodel/text.js';
+import Attribute from '/ckeditor5/core/treemodel/attribute.js';
 
 describe( 'NodeList', () => {
-	let NodeList, Character, Text, Attribute;
-
-	before( () => {
-		NodeList = modules[ 'core/treemodel/nodelist' ];
-		Character = modules[ 'core/treemodel/character' ];
-		Text = modules[ 'core/treemodel/text' ];
-		Attribute = modules[ 'core/treemodel/attribute' ];
-	} );
-
 	describe( 'constructor', () => {
 		it( 'should change array of strings into a set of nodes', () => {
 			let nodeList = new NodeList( [ 'foo', new Character( 'x' ), 'bar' ] );

+ 11 - 29
packages/ckeditor5-engine/tests/treemodel/operation/attributeoperation.js

@@ -4,41 +4,23 @@
  */
 
 /* bender-tags: treemodel, operation */
-/* global describe, before, beforeEach, it, expect */
-
-/* bender-include: ../../_tools/tools.js */
 
 'use strict';
 
-const getIteratorCount = bender.tools.core.getIteratorCount;
+import coreTestUtils from '/tests/core/_utils/utils.js';
+import Document from '/ckeditor5/core/treemodel/document.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
+import AttributeOperation from '/ckeditor5/core/treemodel/operation/attributeoperation.js';
+import Position from '/ckeditor5/core/treemodel/position.js';
+import Range from '/ckeditor5/core/treemodel/range.js';
+import Character from '/ckeditor5/core/treemodel/character.js';
+import Attribute from '/ckeditor5/core/treemodel/attribute.js';
+import Text from '/ckeditor5/core/treemodel/text.js';
+import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
 
-const modules = bender.amd.require(
-	'core/treemodel/document',
-	'core/treemodel/element',
-	'core/treemodel/operation/attributeoperation',
-	'core/treemodel/position',
-	'core/treemodel/range',
-	'core/treemodel/character',
-	'core/treemodel/attribute',
-	'core/treemodel/text',
-	'core/ckeditorerror'
-);
+const getIteratorCount = coreTestUtils.getIteratorCount;
 
 describe( 'AttributeOperation', () => {
-	let Document, Element, AttributeOperation, Position, Range, Character, Attribute, Text, CKEditorError;
-
-	before( () => {
-		Document = modules[ 'core/treemodel/document' ];
-		Element = modules[ 'core/treemodel/element' ];
-		AttributeOperation = modules[ 'core/treemodel/operation/attributeoperation' ];
-		Position = modules[ 'core/treemodel/position' ];
-		Range = modules[ 'core/treemodel/range' ];
-		Character = modules[ 'core/treemodel/character' ];
-		Attribute = modules[ 'core/treemodel/attribute' ];
-		Text = modules[ 'core/treemodel/text' ];
-		CKEditorError = modules[ 'core/ckeditorerror' ];
-	} );
-
 	let doc, root;
 
 	beforeEach( () => {

+ 7 - 23
packages/ckeditor5-engine/tests/treemodel/operation/insertoperation.js

@@ -4,34 +4,18 @@
  */
 
 /* bender-tags: treemodel, operation */
-/* global describe, before, beforeEach, it, expect */
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treemodel/document',
-	'core/treemodel/node',
-	'core/treemodel/nodelist',
-	'core/treemodel/operation/insertoperation',
-	'core/treemodel/operation/removeoperation',
-	'core/treemodel/position',
-	'core/treemodel/character',
-	'core/treemodel/nodelist'
-);
+import Document from '/ckeditor5/core/treemodel/document.js';
+import Node from '/ckeditor5/core/treemodel/node.js';
+import NodeList from '/ckeditor5/core/treemodel/nodelist.js';
+import InsertOperation from '/ckeditor5/core/treemodel/operation/insertoperation.js';
+import RemoveOperation from '/ckeditor5/core/treemodel/operation/removeoperation.js';
+import Position from '/ckeditor5/core/treemodel/position.js';
+import Character from '/ckeditor5/core/treemodel/character.js';
 
 describe( 'InsertOperation', () => {
-	let Document, Node, NodeList, InsertOperation, RemoveOperation, Position, Character;
-
-	before( () => {
-		Document = modules[ 'core/treemodel/document' ];
-		Node = modules[ 'core/treemodel/node' ];
-		NodeList = modules[ 'core/treemodel/nodelist' ];
-		InsertOperation = modules[ 'core/treemodel/operation/insertoperation' ];
-		RemoveOperation = modules[ 'core/treemodel/operation/removeoperation' ];
-		Position = modules[ 'core/treemodel/position' ];
-		Character = modules[ 'core/treemodel/character' ];
-	} );
-
 	let doc, root;
 
 	beforeEach( () => {

+ 6 - 20
packages/ckeditor5-engine/tests/treemodel/operation/moveoperation.js

@@ -4,31 +4,17 @@
  */
 
 /* bender-tags: treemodel, operation */
-/* global describe, before, beforeEach, it, expect */
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treemodel/document',
-	'core/treemodel/operation/moveoperation',
-	'core/treemodel/position',
-	'core/treemodel/element',
-	'core/treemodel/nodelist',
-	'core/ckeditorerror'
-);
+import Document from '/ckeditor5/core/treemodel/document.js';
+import MoveOperation from '/ckeditor5/core/treemodel/operation/moveoperation.js';
+import Position from '/ckeditor5/core/treemodel/position.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
+import NodeList from '/ckeditor5/core/treemodel/nodelist.js';
+import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
 
 describe( 'MoveOperation', () => {
-	let Document, MoveOperation, Position, Element, NodeList, CKEditorError;
-
-	before( () => {
-		Document = modules[ 'core/treemodel/document' ];
-		MoveOperation = modules[ 'core/treemodel/operation/moveoperation' ];
-		Position = modules[ 'core/treemodel/position' ];
-		Element = modules[ 'core/treemodel/element' ];
-		NodeList = modules[ 'core/treemodel/nodelist' ];
-		CKEditorError = modules[ 'core/ckeditorerror' ];
-	} );
-
 	let doc, root;
 
 	beforeEach( () => {

+ 2 - 11
packages/ckeditor5-engine/tests/treemodel/operation/nooperation.js

@@ -7,19 +7,10 @@
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treemodel/document',
-	'core/treemodel/operation/nooperation'
-);
+import Document from '/ckeditor5/core/treemodel/document.js';
+import NoOperation from '/ckeditor5/core/treemodel/operation/nooperation.js';
 
 describe( 'NoOperation', () => {
-	let Document, NoOperation;
-
-	before( function() {
-		Document = modules[ 'core/treemodel/document' ];
-		NoOperation = modules[ 'core/treemodel/operation/nooperation' ];
-	} );
-
 	let noop, doc, root;
 
 	beforeEach( () => {

+ 5 - 17
packages/ckeditor5-engine/tests/treemodel/operation/reinsertoperation.js

@@ -7,25 +7,13 @@
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treemodel/document',
-	'core/treemodel/operation/reinsertoperation',
-	'core/treemodel/operation/removeoperation',
-	'core/treemodel/operation/moveoperation',
-	'core/treemodel/position'
-);
+import Document from '/ckeditor5/core/treemodel/document.js';
+import ReinsertOperation from '/ckeditor5/core/treemodel/operation/reinsertoperation.js';
+import RemoveOperation from '/ckeditor5/core/treemodel/operation/removeoperation.js';
+import MoveOperation from '/ckeditor5/core/treemodel/operation/moveoperation.js';
+import Position from '/ckeditor5/core/treemodel/position.js';
 
 describe( 'ReinsertOperation', () => {
-	let Document, ReinsertOperation, RemoveOperation, MoveOperation, Position;
-
-	before( () => {
-		Document = modules[ 'core/treemodel/document' ];
-		ReinsertOperation = modules[ 'core/treemodel/operation/reinsertoperation' ];
-		RemoveOperation = modules[ 'core/treemodel/operation/removeoperation' ];
-		MoveOperation = modules[ 'core/treemodel/operation/moveoperation' ];
-		Position = modules[ 'core/treemodel/position' ];
-	} );
-
 	let doc, root, graveyard, operation, graveyardPosition, rootPosition;
 
 	beforeEach( () => {

+ 5 - 17
packages/ckeditor5-engine/tests/treemodel/operation/removeoperation.js

@@ -7,25 +7,13 @@
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treemodel/document',
-	'core/treemodel/operation/reinsertoperation',
-	'core/treemodel/operation/removeoperation',
-	'core/treemodel/operation/moveoperation',
-	'core/treemodel/position'
-);
+import Document from '/ckeditor5/core/treemodel/document.js';
+import ReinsertOperation from '/ckeditor5/core/treemodel/operation/reinsertoperation.js';
+import RemoveOperation from '/ckeditor5/core/treemodel/operation/removeoperation.js';
+import MoveOperation from '/ckeditor5/core/treemodel/operation/moveoperation.js';
+import Position from '/ckeditor5/core/treemodel/position.js';
 
 describe( 'RemoveOperation', () => {
-	let Document, ReinsertOperation, RemoveOperation, MoveOperation, Position;
-
-	before( () => {
-		Document = modules[ 'core/treemodel/document' ];
-		ReinsertOperation = modules[ 'core/treemodel/operation/reinsertoperation' ];
-		RemoveOperation = modules[ 'core/treemodel/operation/removeoperation' ];
-		MoveOperation = modules[ 'core/treemodel/operation/removeoperation' ];
-		Position = modules[ 'core/treemodel/position' ];
-	} );
-
 	let doc, root, graveyard;
 
 	beforeEach( () => {

+ 10 - 32
packages/ckeditor5-engine/tests/treemodel/operation/transform.js

@@ -3,44 +3,22 @@
  * For licensing, see LICENSE.md.
  */
 
-/* jshint expr: true */
-
 /* bender-tags: treemodel, operation */
-/* global describe, before, beforeEach, it, expect */
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treemodel/rootelement',
-	'core/treemodel/node',
-	'core/treemodel/position',
-	'core/treemodel/range',
-	'core/treemodel/attribute',
-	'core/treemodel/operation/transform',
-	'core/treemodel/operation/insertoperation',
-	'core/treemodel/operation/attributeoperation',
-	'core/treemodel/operation/moveoperation',
-	'core/treemodel/operation/nooperation'
-);
+import RootElement from '/ckeditor5/core/treemodel/rootelement.js';
+import Node from '/ckeditor5/core/treemodel/node.js';
+import Position from '/ckeditor5/core/treemodel/position.js';
+import Range from '/ckeditor5/core/treemodel/range.js';
+import Attribute from '/ckeditor5/core/treemodel/attribute.js';
+import transform from '/ckeditor5/core/treemodel/operation/transform.js';
+import InsertOperation from '/ckeditor5/core/treemodel/operation/insertoperation.js';
+import AttributeOperation from '/ckeditor5/core/treemodel/operation/attributeoperation.js';
+import MoveOperation from '/ckeditor5/core/treemodel/operation/moveoperation.js';
+import NoOperation from '/ckeditor5/core/treemodel/operation/nooperation.js';
 
 describe( 'transform', () => {
-	let RootElement, Node, Position, Range, Attribute, InsertOperation, AttributeOperation, MoveOperation, NoOperation;
-	let transform;
-
-	before( () => {
-		RootElement = modules[ 'core/treemodel/rootelement' ];
-		Node = modules[ 'core/treemodel/node' ];
-		Position = modules[ 'core/treemodel/position' ];
-		Range = modules[ 'core/treemodel/range' ];
-		Attribute = modules[ 'core/treemodel/attribute' ];
-		InsertOperation = modules[ 'core/treemodel/operation/insertoperation' ];
-		AttributeOperation = modules[ 'core/treemodel/operation/attributeoperation' ];
-		MoveOperation = modules[ 'core/treemodel/operation/moveoperation' ];
-		NoOperation = modules[ 'core/treemodel/operation/nooperation' ];
-
-		transform = modules[ 'core/treemodel/operation/transform' ];
-	} );
-
 	let root, op, nodeA, nodeB, expected, baseVersion;
 
 	beforeEach( () => {

+ 5 - 17
packages/ckeditor5-engine/tests/treemodel/position.js

@@ -7,18 +7,13 @@
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treemodel/element',
-	'core/treemodel/character',
-	'core/treemodel/position',
-	'core/treemodel/document',
-	'core/ckeditorerror',
-	'core/treemodel/nodelist'
-);
+import Document from '/ckeditor5/core/treemodel/document.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
+import Character from '/ckeditor5/core/treemodel/character.js';
+import Position from '/ckeditor5/core/treemodel/position.js';
+import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
 
 describe( 'position', () => {
-	let Element, Character, Document, NodeList, Position, CKEditorError;
-
 	let doc, root, otherRoot, p, ul, li1, li2, f, o, z, b, a, r;
 
 	// root
@@ -33,13 +28,6 @@ describe( 'position', () => {
 	//        |- a   Before: [ 1, 1, 1 ] After: [ 1, 1, 2 ]
 	//        |- r   Before: [ 1, 1, 2 ] After: [ 1, 1, 3 ]
 	before( () => {
-		Element = modules[ 'core/treemodel/element' ];
-		Character = modules[ 'core/treemodel/character' ];
-		Document = modules[ 'core/treemodel/document' ];
-		NodeList = modules[ 'core/treemodel/nodelist' ];
-		Position = modules[ 'core/treemodel/position' ];
-		CKEditorError = modules[ 'core/ckeditorerror' ];
-
 		doc = new Document();
 
 		root = doc.createRoot( 'root' );

+ 6 - 16
packages/ckeditor5-engine/tests/treemodel/positioniterator.js

@@ -7,29 +7,19 @@
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treemodel/document',
-	'core/treemodel/element',
-	'core/treemodel/character',
-	'core/treemodel/positioniterator',
-	'core/treemodel/position',
-	'core/treemodel/range'
-);
+import Document from '/ckeditor5/core/treemodel/document.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
+import Character from '/ckeditor5/core/treemodel/character.js';
+import PositionIterator from '/ckeditor5/core/treemodel/positioniterator.js';
+import Position from '/ckeditor5/core/treemodel/position.js';
+import Range from '/ckeditor5/core/treemodel/range.js';
 
 describe( 'range iterator', () => {
-	let Document, Element, Character, PositionIterator, Position, Range;
 	let ELEMENT_ENTER, ELEMENT_LEAVE, CHARACTER;
 
 	let doc, expectedItems, root, img1, paragraph, b, a, r, img2, x;
 
 	before( () => {
-		Document = modules[ 'core/treemodel/document' ];
-		Element = modules[ 'core/treemodel/element' ];
-		Character = modules[ 'core/treemodel/character' ];
-		PositionIterator = modules[ 'core/treemodel/positioniterator' ];
-		Position = modules[ 'core/treemodel/position' ];
-		Range = modules[ 'core/treemodel/range' ];
-
 		ELEMENT_ENTER = PositionIterator.ELEMENT_ENTER;
 		ELEMENT_LEAVE = PositionIterator.ELEMENT_LEAVE;
 		CHARACTER = PositionIterator.CHARACTER;

+ 5 - 17
packages/ckeditor5-engine/tests/treemodel/range.js

@@ -7,25 +7,13 @@
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treemodel/range',
-	'core/treemodel/position',
-	'core/treemodel/element',
-	'core/treemodel/character',
-	'core/treemodel/document'
-);
+import Range from '/ckeditor5/core/treemodel/range.js';
+import Position from '/ckeditor5/core/treemodel/position.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
+import Character from '/ckeditor5/core/treemodel/character.js';
+import Document from '/ckeditor5/core/treemodel/document.js';
 
 describe( 'Range', () => {
-	let Range, Position, Element, Character, Document;
-
-	before( () => {
-		Position = modules[ 'core/treemodel/position' ];
-		Range = modules[ 'core/treemodel/range' ];
-		Element = modules[ 'core/treemodel/element' ];
-		Character = modules[ 'core/treemodel/character' ];
-		Document = modules[ 'core/treemodel/document' ];
-	} );
-
 	let range, start, end, root, otherRoot;
 
 	beforeEach( () => {

+ 5 - 15
packages/ckeditor5-engine/tests/treemodel/rootelement.js

@@ -4,27 +4,17 @@
  */
 
 /* bender-tags: treemodel */
-/* bender-include: ../_tools/tools.js */
 
 'use strict';
 
-const getIteratorCount = bender.tools.core.getIteratorCount;
+import coreTestUtils from '/tests/core/_utils/utils.js';
+import Document from '/ckeditor5/core/treemodel/document.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
+import RootElement from '/ckeditor5/core/treemodel/rootelement.js';
 
-const modules = bender.amd.require(
-	'core/treemodel/document',
-	'core/treemodel/element',
-	'core/treemodel/rootelement'
-);
+const getIteratorCount = coreTestUtils.getIteratorCount;
 
 describe( 'Element', () => {
-	let Document, Element, RootElement;
-
-	before( () => {
-		Document = modules[ 'core/treemodel/document' ];
-		Element = modules[ 'core/treemodel/element' ];
-		RootElement = modules[ 'core/treemodel/rootelement' ];
-	} );
-
 	describe( 'constructor', () => {
 		it( 'should create root element without attributes', () => {
 			let doc = new Document();

+ 13 - 28
packages/ckeditor5-engine/tests/treemodel/selection.js

@@ -5,41 +5,26 @@
 
 /* bender-tags: treemodel */
 
-/* bender-include: ../_tools/tools.js */
-
 'use strict';
 
-const getIteratorCount = bender.tools.core.getIteratorCount;
-
-const modules = bender.amd.require(
-	'core/treemodel/document',
-	'core/treemodel/attribute',
-	'core/treemodel/element',
-	'core/treemodel/range',
-	'core/treemodel/position',
-	'core/treemodel/liverange',
-	'core/treemodel/selection',
-	'core/treemodel/operation/insertoperation',
-	'core/treemodel/operation/moveoperation',
-	'core/ckeditorerror'
-);
+import coreTestUtils from '/tests/core/_utils/utils.js';
+import Document from '/ckeditor5/core/treemodel/document.js';
+import Attribute from '/ckeditor5/core/treemodel/attribute.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
+import Range from '/ckeditor5/core/treemodel/range.js';
+import Position from '/ckeditor5/core/treemodel/position.js';
+import LiveRange from '/ckeditor5/core/treemodel/liverange.js';
+import Selection from '/ckeditor5/core/treemodel/selection.js';
+import InsertOperation from '/ckeditor5/core/treemodel/operation/insertoperation.js';
+import MoveOperation from '/ckeditor5/core/treemodel/operation/moveoperation.js';
+import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
+
+const getIteratorCount = coreTestUtils.getIteratorCount;
 
 describe( 'Selection', () => {
-	let Document, Attribute, Element, Range, Position, LiveRange, Selection, InsertOperation, MoveOperation, CKEditorError;
 	let attrFooBar;
 
 	before( () => {
-		Document = modules[ 'core/treemodel/document' ];
-		Attribute = modules[ 'core/treemodel/attribute' ];
-		Element = modules[ 'core/treemodel/element' ];
-		Range = modules[ 'core/treemodel/range' ];
-		Position = modules[ 'core/treemodel/position' ];
-		LiveRange = modules[ 'core/treemodel/liverange' ];
-		Selection = modules[ 'core/treemodel/selection' ];
-		InsertOperation = modules[ 'core/treemodel/operation/insertoperation' ];
-		MoveOperation = modules[ 'core/treemodel/operation/moveoperation' ];
-		CKEditorError = modules[ 'core/ckeditorerror' ];
-
 		attrFooBar = new Attribute( 'foo', 'bar' );
 	} );
 

+ 2 - 7
packages/ckeditor5-engine/tests/treemodel/text.js

@@ -7,17 +7,12 @@
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/treemodel/text',
-	'core/treemodel/attribute'
-);
+import Text from '/ckeditor5/core/treemodel/text.js';
+import Attribute from '/ckeditor5/core/treemodel/attribute.js';
 
 describe( 'Text', () => {
 	describe( 'constructor', () => {
 		it( 'should create character without attributes', () => {
-			const Text = modules[ 'core/treemodel/text' ];
-			const Attribute = modules[ 'core/treemodel/attribute' ];
-
 			let attrs = [ new Attribute( 'bold', true ) ];
 			let text = new Text( 'bar', attrs );
 

+ 31 - 0
packages/ckeditor5-engine/tests/treemodel/utils-tests/utils.js

@@ -0,0 +1,31 @@
+/**
+ * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md.
+ */
+
+'use strict';
+
+import treeModelTestUtils from '/tests/core/treemodel/_utils/utils.js';
+import Document from '/ckeditor5/core/treemodel/document.js';
+import Range from '/ckeditor5/core/treemodel/range.js';
+import Element from '/ckeditor5/core/treemodel/element.js';
+
+const getNodesAndText = treeModelTestUtils.getNodesAndText;
+
+describe( 'getNodesAndText', () => {
+	let doc, root, div, p;
+
+	beforeEach( () => {
+		doc = new Document();
+		root = doc.createRoot( 'root' );
+
+		div = new Element( 'div', [], 'foobar' );
+		p = new Element( 'p', [], 'abcxyz' );
+
+		root.insertChildren( 0, [ div, p ] );
+	} );
+
+	it( 'reads two elements with text', () => {
+		expect( getNodesAndText( Range.createFromElement( root ) ) ).to.equal( 'DIVfoobarDIVPabcxyzP' );
+	} );
+} );

+ 15 - 31
packages/ckeditor5-engine/tests/ui/controller.js

@@ -7,25 +7,18 @@
 
 'use strict';
 
-const modules = bender.amd.require( 'ckeditor',
-	'core/ui/view',
-	'core/ui/controller',
-	'core/ui/controllercollection',
-	'core/ui/region',
-	'core/ckeditorerror',
-	'core/model',
-	'core/collection',
-	'core/eventinfo'
-);
-
-let View, Controller, Model, CKEditorError, Collection, ControllerCollection;
+import testUtils from '/tests/_utils/utils.js';
+import View from '/ckeditor5/core/ui/view.js';
+import Controller from '/ckeditor5/core/ui/controller.js';
+import ControllerCollection from '/ckeditor5/core/ui/controllercollection.js';
+import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
+import Model from '/ckeditor5/core/model.js';
+
 let ParentController, ParentView;
 
-bender.tools.createSinonSandbox();
+testUtils.createSinonSandbox();
 
 describe( 'Controller', () => {
-	beforeEach( updateModuleReference );
-
 	describe( 'constructor', () => {
 		it( 'defines basic properties', () => {
 			const controller = new Controller();
@@ -73,7 +66,7 @@ describe( 'Controller', () => {
 		it( 'should initialize own view', () => {
 			const view = new View();
 			const controller = new Controller( null, view );
-			const spy = bender.sinon.spy( view, 'init' );
+			const spy = testUtils.sinon.spy( view, 'init' );
 
 			return controller.init().then( () => {
 				sinon.assert.calledOnce( spy );
@@ -87,8 +80,8 @@ describe( 'Controller', () => {
 
 			const childController1 = new Controller();
 			const childController2 = new Controller();
-			const spy1 = bender.sinon.spy( childController1, 'init' );
-			const spy2 = bender.sinon.spy( childController2, 'init' );
+			const spy1 = testUtils.sinon.spy( childController1, 'init' );
+			const spy2 = testUtils.sinon.spy( childController2, 'init' );
 
 			buttonCollection.add( childController1 );
 			buttonCollection.add( childController2 );
@@ -127,7 +120,7 @@ describe( 'Controller', () => {
 				const parentController = new ParentController( null, parentView );
 				const collection = parentController.collections.get( 'x' );
 				const childController = new Controller( null, new View() );
-				const spy1 = bender.sinon.spy( parentView, 'addChild' );
+				const spy1 = testUtils.sinon.spy( parentView, 'addChild' );
 
 				collection.add( childController );
 
@@ -175,7 +168,7 @@ describe( 'Controller', () => {
 				const parentController = new ParentController( null, parentView );
 				const collection = parentController.collections.get( 'x' );
 				const childController = new Controller( null, new View() );
-				const spy = bender.sinon.spy( parentView, 'removeChild' );
+				const spy = testUtils.sinon.spy( parentView, 'removeChild' );
 
 				collection.add( childController );
 
@@ -198,7 +191,7 @@ describe( 'Controller', () => {
 		it( 'should destroy the controller', () => {
 			const view = new View();
 			const controller = new Controller( null, view );
-			const spy = bender.sinon.spy( view, 'destroy' );
+			const spy = testUtils.sinon.spy( view, 'destroy' );
 
 			return controller.init()
 				.then( () => {
@@ -233,7 +226,7 @@ describe( 'Controller', () => {
 			const collection = parentController.collections.get( 'x' );
 			const childView = new View();
 			const childController = new Controller( null, childView );
-			const spy = bender.sinon.spy( childView, 'destroy' );
+			const spy = testUtils.sinon.spy( childView, 'destroy' );
 
 			collection.add( childController );
 
@@ -269,15 +262,6 @@ describe( 'Controller', () => {
 	} );
 } );
 
-function updateModuleReference() {
-	View = modules[ 'core/ui/view' ];
-	Controller = modules[ 'core/ui/controller' ];
-	Model = modules[ 'core/model' ];
-	Collection = modules[ 'core/collection ' ];
-	ControllerCollection = modules[ 'core/ui/controllercollection' ];
-	CKEditorError = modules[ 'core/ckeditorerror' ];
-}
-
 function defineParentViewClass() {
 	ParentView = class extends View {
 		constructor() {

+ 7 - 16
packages/ckeditor5-engine/tests/ui/controllercollection.js

@@ -7,19 +7,16 @@
 
 'use strict';
 
-const modules = bender.amd.require( 'ckeditor',
-	'core/ui/controllercollection',
-	'core/ui/controller',
-	'core/ui/view'
-);
+import testUtils from '/tests/_utils/utils.js';
+import ControllerCollection from '/ckeditor5/core/ui/controllercollection.js';
+import Controller from '/ckeditor5/core/ui/controller.js';
+import View from '/ckeditor5/core/ui/view.js';
 
-bender.tools.createSinonSandbox();
+testUtils.createSinonSandbox();
 
-let ControllerCollection, Controller, View;
 let ParentView;
 
 describe( 'ControllerCollection', () => {
-	beforeEach( updateModuleReference );
 	beforeEach( defineParentViewClass );
 
 	describe( 'constructor', () => {
@@ -62,7 +59,7 @@ describe( 'ControllerCollection', () => {
 		it( 'should initialize child controller if parent is ready', () => {
 			const parentController = new Controller( null, new ParentView() );
 			const childController = new Controller( null, new View() );
-			const spy = bender.sinon.spy( childController, 'init' );
+			const spy = testUtils.sinon.spy( childController, 'init' );
 			const collection = new ControllerCollection( 'x' );
 
 			parentController.collections.add( collection );
@@ -83,7 +80,7 @@ describe( 'ControllerCollection', () => {
 		it( 'should not initialize child controller twice', () => {
 			const parentController = new Controller( null, new ParentView() );
 			const childController = new Controller( null, new View() );
-			const spy = bender.sinon.spy( childController, 'init' );
+			const spy = testUtils.sinon.spy( childController, 'init' );
 			const collection = new ControllerCollection( 'x' );
 
 			parentController.collections.add( collection );
@@ -102,12 +99,6 @@ describe( 'ControllerCollection', () => {
 	} );
 } );
 
-function updateModuleReference() {
-	View = modules[ 'core/ui/view' ];
-	Controller = modules[ 'core/ui/controller' ];
-	ControllerCollection = modules[ 'core/ui/controllercollection' ];
-}
-
 function defineParentViewClass() {
 	ParentView = class extends View {
 		constructor() {

+ 40 - 36
packages/ckeditor5-engine/tests/ui/domemittermixin.js

@@ -8,13 +8,17 @@
 
 'use strict';
 
-const modules = bender.amd.require( 'core/lib/lodash/object', 'core/ui/domemittermixin', 'core/emittermixin' );
+import testUtils from '/tests/_utils/utils.js';
+import objectUtils from '/ckeditor5/core/lib/lodash/object.js';
+import DOMEmitterMixin from '/ckeditor5/core/ui/domemittermixin.js';
+import EmitterMixin from '/ckeditor5/core/emittermixin.js';
+
 let emitter, domEmitter, node;
 
-bender.tools.createSinonSandbox();
+testUtils.createSinonSandbox();
 
-let getEmitterInstance = () => modules[ 'core/lib/lodash/object' ].extend( {}, modules[ 'core/emittermixin' ] );
-let getDOMEmitterInstance = () => modules[ 'core/lib/lodash/object' ].extend( {}, modules[ 'core/ui/domemittermixin' ] );
+let getEmitterInstance = () => objectUtils.extend( {}, EmitterMixin );
+let getDOMEmitterInstance = () => objectUtils.extend( {}, DOMEmitterMixin );
 let getDOMNodeInstance = () => document.createElement( 'div' );
 
 function updateEmitterInstance() {
@@ -35,7 +39,7 @@ beforeEach( updateDOMNodeInstance );
 
 describe( 'listenTo', () => {
 	it( 'should listen to EmitterMixin events', () => {
-		let spy = bender.sinon.spy();
+		let spy = testUtils.sinon.spy();
 
 		domEmitter.listenTo( emitter, 'test', spy );
 		emitter.fire( 'test' );
@@ -44,7 +48,7 @@ describe( 'listenTo', () => {
 	} );
 
 	it( 'should listen to native DOM events', () => {
-		let spy = bender.sinon.spy();
+		let spy = testUtils.sinon.spy();
 
 		domEmitter.listenTo( node, 'test', spy );
 
@@ -57,8 +61,8 @@ describe( 'listenTo', () => {
 
 describe( 'stopListening', () => {
 	it( 'should stop listening to a specific event callback', () => {
-		let spy1 = bender.sinon.spy();
-		let spy2 = bender.sinon.spy();
+		let spy1 = testUtils.sinon.spy();
+		let spy2 = testUtils.sinon.spy();
 
 		domEmitter.listenTo( node, 'event1', spy1 );
 		domEmitter.listenTo( node, 'event2', spy2 );
@@ -76,9 +80,9 @@ describe( 'stopListening', () => {
 	} );
 
 	it( 'should stop listening to an specific event', () => {
-		let spy1a = bender.sinon.spy();
-		let spy1b = bender.sinon.spy();
-		let spy2 = bender.sinon.spy();
+		let spy1a = testUtils.sinon.spy();
+		let spy1b = testUtils.sinon.spy();
+		let spy2 = testUtils.sinon.spy();
 
 		domEmitter.listenTo( node, 'event1', spy1a );
 		domEmitter.listenTo( node, 'event1', spy1b );
@@ -102,8 +106,8 @@ describe( 'stopListening', () => {
 	} );
 
 	it( 'should stop listening to all events from a specific node', () => {
-		let spy1 = bender.sinon.spy();
-		let spy2 = bender.sinon.spy();
+		let spy1 = testUtils.sinon.spy();
+		let spy2 = testUtils.sinon.spy();
 
 		domEmitter.listenTo( node, 'event1', spy1 );
 		domEmitter.listenTo( node, 'event2', spy2 );
@@ -121,8 +125,8 @@ describe( 'stopListening', () => {
 	} );
 
 	it( 'should stop listening to everything', () => {
-		let spy1 = bender.sinon.spy();
-		let spy2 = bender.sinon.spy();
+		let spy1 = testUtils.sinon.spy();
+		let spy2 = testUtils.sinon.spy();
 
 		let node1 = getDOMNodeInstance();
 		let node2 = getDOMNodeInstance();
@@ -147,7 +151,7 @@ describe( 'stopListening', () => {
 	} );
 
 	it( 'should not stop other nodes when a non-listened node is provided', () => {
-		let spy = bender.sinon.spy();
+		let spy = testUtils.sinon.spy();
 
 		let node1 = getDOMNodeInstance();
 		let node2 = getDOMNodeInstance();
@@ -162,7 +166,7 @@ describe( 'stopListening', () => {
 	} );
 
 	it( 'should pass DOM Event data to the listener', () => {
-		let spy = bender.sinon.spy();
+		let spy = testUtils.sinon.spy();
 
 		let node = getDOMNodeInstance();
 
@@ -180,13 +184,13 @@ describe( 'stopListening', () => {
 	} );
 
 	it( 'should detach native DOM event listener proxy, specific event', () => {
-		let spy1a = bender.sinon.spy();
-		let spy1b = bender.sinon.spy();
+		let spy1a = testUtils.sinon.spy();
+		let spy1b = testUtils.sinon.spy();
 
 		domEmitter.listenTo( node, 'test', spy1a );
 
 		let proxyEmitter = domEmitter._getProxyEmitter( node );
-		let spy2 = bender.sinon.spy( proxyEmitter, 'fire' );
+		let spy2 = testUtils.sinon.spy( proxyEmitter, 'fire' );
 
 		node.dispatchEvent( new Event( 'test' ) );
 
@@ -211,15 +215,15 @@ describe( 'stopListening', () => {
 	} );
 
 	it( 'should detach native DOM event listener proxy, specific callback', () => {
-		let spy1a = bender.sinon.spy();
-		let spy1b = bender.sinon.spy();
-		let spy1c = bender.sinon.spy();
+		let spy1a = testUtils.sinon.spy();
+		let spy1b = testUtils.sinon.spy();
+		let spy1c = testUtils.sinon.spy();
 
 		domEmitter.listenTo( node, 'test', spy1a );
 		domEmitter.listenTo( node, 'test', spy1b );
 
 		let proxyEmitter = domEmitter._getProxyEmitter( node );
-		let spy2 = bender.sinon.spy( proxyEmitter, 'fire' );
+		let spy2 = testUtils.sinon.spy( proxyEmitter, 'fire' );
 
 		node.dispatchEvent( new Event( 'test' ) );
 
@@ -254,16 +258,16 @@ describe( 'stopListening', () => {
 	} );
 
 	it( 'should detach native DOM event listener proxy, specific emitter', () => {
-		let spy1a = bender.sinon.spy();
-		let spy1b = bender.sinon.spy();
-		let spy1c = bender.sinon.spy();
-		let spy1d = bender.sinon.spy();
+		let spy1a = testUtils.sinon.spy();
+		let spy1b = testUtils.sinon.spy();
+		let spy1c = testUtils.sinon.spy();
+		let spy1d = testUtils.sinon.spy();
 
 		domEmitter.listenTo( node, 'test1', spy1a );
 		domEmitter.listenTo( node, 'test2', spy1b );
 
 		let proxyEmitter = domEmitter._getProxyEmitter( node );
-		let spy2 = bender.sinon.spy( proxyEmitter, 'fire' );
+		let spy2 = testUtils.sinon.spy( proxyEmitter, 'fire' );
 
 		node.dispatchEvent( new Event( 'test1' ) );
 		node.dispatchEvent( new Event( 'test2' ) );
@@ -287,7 +291,7 @@ describe( 'stopListening', () => {
 
 		// Old proxy emitter died when stopped listening to the node.
 		let proxyEmitter2 = domEmitter._getProxyEmitter( node );
-		let spy3 = bender.sinon.spy( proxyEmitter2, 'fire' );
+		let spy3 = testUtils.sinon.spy( proxyEmitter2, 'fire' );
 
 		node.dispatchEvent( new Event( 'test1' ) );
 		node.dispatchEvent( new Event( 'test2' ) );
@@ -303,16 +307,16 @@ describe( 'stopListening', () => {
 	} );
 
 	it( 'should detach native DOM event listener proxy, everything', () => {
-		let spy1a = bender.sinon.spy();
-		let spy1b = bender.sinon.spy();
-		let spy1c = bender.sinon.spy();
-		let spy1d = bender.sinon.spy();
+		let spy1a = testUtils.sinon.spy();
+		let spy1b = testUtils.sinon.spy();
+		let spy1c = testUtils.sinon.spy();
+		let spy1d = testUtils.sinon.spy();
 
 		domEmitter.listenTo( node, 'test1', spy1a );
 		domEmitter.listenTo( node, 'test2', spy1b );
 
 		let proxyEmitter = domEmitter._getProxyEmitter( node );
-		let spy2 = bender.sinon.spy( proxyEmitter, 'fire' );
+		let spy2 = testUtils.sinon.spy( proxyEmitter, 'fire' );
 
 		node.dispatchEvent( new Event( 'test1' ) );
 		node.dispatchEvent( new Event( 'test2' ) );
@@ -336,7 +340,7 @@ describe( 'stopListening', () => {
 
 		// Old proxy emitter died when stopped listening to the node.
 		let proxyEmitter2 = domEmitter._getProxyEmitter( node );
-		let spy3 = bender.sinon.spy( proxyEmitter2, 'fire' );
+		let spy3 = testUtils.sinon.spy( proxyEmitter2, 'fire' );
 
 		node.dispatchEvent( new Event( 'test1' ) );
 		node.dispatchEvent( new Event( 'test2' ) );

+ 2 - 7
packages/ckeditor5-engine/tests/ui/region.js

@@ -8,11 +8,9 @@
 
 'use strict';
 
-const modules = bender.amd.require( 'core/ui/region', 'core/ui/view' );
+import Region from '/ckeditor5/core/ui/region.js';
+import View from '/ckeditor5/core/ui/view.js';
 
-bender.tools.createSinonSandbox();
-
-let Region, View;
 let TestViewA, TestViewB;
 let region, el;
 
@@ -107,9 +105,6 @@ describe( 'View', () => {
 } );
 
 function createRegionInstance() {
-	Region = modules[ 'core/ui/region' ];
-	View = modules[ 'core/ui/view' ];
-
 	class A extends View {
 		constructor() {
 			super();

+ 15 - 21
packages/ckeditor5-engine/tests/ui/template.js

@@ -8,14 +8,12 @@
 
 'use strict';
 
-const modules = bender.amd.require( 'core/ui/template' );
-let Template;
+import testUtils from '/tests/_utils/utils.js';
+import Template from '/ckeditor5/core/ui/template.js';
 
-bender.tools.createSinonSandbox();
+testUtils.createSinonSandbox();
 
 describe( 'Template', () => {
-	beforeEach( createClassReferences );
-
 	describe( 'constructor', () => {
 		it( 'accepts the definition', () => {
 			let def = {
@@ -75,8 +73,8 @@ describe( 'Template', () => {
 
 		describe( 'callback', () => {
 			it( 'works for attributes', () => {
-				let spy1 = bender.sinon.spy();
-				let spy2 = bender.sinon.spy();
+				let spy1 = testUtils.sinon.spy();
+				let spy2 = testUtils.sinon.spy();
 
 				let el = new Template( {
 					tag: 'p',
@@ -103,8 +101,8 @@ describe( 'Template', () => {
 			} );
 
 			it( 'works for "text" property', () => {
-				let spy1 = bender.sinon.spy();
-				let spy2 = bender.sinon.spy();
+				let spy1 = testUtils.sinon.spy();
+				let spy2 = testUtils.sinon.spy();
 
 				let el = new Template( {
 					tag: 'p',
@@ -128,10 +126,10 @@ describe( 'Template', () => {
 			} );
 
 			it( 'works for "on" property', () => {
-				let spy1 = bender.sinon.spy();
-				let spy2 = bender.sinon.spy();
-				let spy3 = bender.sinon.spy();
-				let spy4 = bender.sinon.spy();
+				let spy1 = testUtils.sinon.spy();
+				let spy2 = testUtils.sinon.spy();
+				let spy3 = testUtils.sinon.spy();
+				let spy4 = testUtils.sinon.spy();
 
 				let el = new Template( {
 					tag: 'p',
@@ -156,10 +154,10 @@ describe( 'Template', () => {
 			} );
 
 			it( 'works for "on" property with selectors', () => {
-				let spy1 = bender.sinon.spy();
-				let spy2 = bender.sinon.spy();
-				let spy3 = bender.sinon.spy();
-				let spy4 = bender.sinon.spy();
+				let spy1 = testUtils.sinon.spy();
+				let spy2 = testUtils.sinon.spy();
+				let spy3 = testUtils.sinon.spy();
+				let spy4 = testUtils.sinon.spy();
 
 				let el = new Template( {
 					tag: 'p',
@@ -194,7 +192,3 @@ describe( 'Template', () => {
 		} );
 	} );
 } );
-
-function createClassReferences() {
-	Template = modules[ 'core/ui/template' ];
-}

+ 22 - 33
packages/ckeditor5-engine/tests/ui/view.js

@@ -8,21 +8,17 @@
 
 'use strict';
 
-const modules = bender.amd.require(
-	'core/ui/view',
-	'core/ui/region',
-	'core/ckeditorerror',
-	'core/model'
-);
+import testUtils from '/tests/_utils/utils.js';
+import View from '/ckeditor5/core/ui/view.js';
+import Region from '/ckeditor5/core/ui/region.js';
+import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
+import Model from '/ckeditor5/core/model.js';
 
-let View, TestView, Model, Region, CKEditorError;
-let view;
+let TestView, view;
 
-bender.tools.createSinonSandbox();
+testUtils.createSinonSandbox();
 
 describe( 'View', () => {
-	beforeEach( updateModuleReference );
-
 	describe( 'constructor', () => {
 		beforeEach( () => {
 			setTestViewClass();
@@ -73,8 +69,8 @@ describe( 'View', () => {
 			view.register( region1, el => el );
 			view.register( region2, el => el );
 
-			const spy1 = bender.sinon.spy( region1, 'init' );
-			const spy2 = bender.sinon.spy( region2, 'init' );
+			const spy1 = testUtils.sinon.spy( region1, 'init' );
+			const spy2 = testUtils.sinon.spy( region2, 'init' );
 
 			view.init();
 
@@ -319,7 +315,7 @@ describe( 'View', () => {
 
 		it( 'should not override an existing region with the same region with override flag', () => {
 			const region = new Region( 'x' );
-			const spy = bender.sinon.spy( view.regions, 'remove' );
+			const spy = testUtils.sinon.spy( view.regions, 'remove' );
 
 			view.register( region, true );
 			view.register( region, true, true );
@@ -359,7 +355,7 @@ describe( 'View', () => {
 		it( 'returns a function that passes arguments', () => {
 			setTestViewInstance( { a: 'foo' } );
 
-			let spy = bender.sinon.spy();
+			let spy = testUtils.sinon.spy();
 			let callback = view.bindToAttribute( 'a', spy );
 
 			expect( spy.called ).to.be.false;
@@ -463,7 +459,7 @@ describe( 'View', () => {
 
 	describe( 'on', () => {
 		it( 'accepts plain binding', () => {
-			let spy = bender.sinon.spy();
+			let spy = testUtils.sinon.spy();
 
 			setTestViewClass( function() {
 				return {
@@ -486,8 +482,8 @@ describe( 'View', () => {
 		} );
 
 		it( 'accepts an array of event bindings', () => {
-			let spy1 = bender.sinon.spy();
-			let spy2 = bender.sinon.spy();
+			let spy1 = testUtils.sinon.spy();
+			let spy2 = testUtils.sinon.spy();
 
 			setTestViewClass( function() {
 				return {
@@ -515,9 +511,9 @@ describe( 'View', () => {
 		} );
 
 		it( 'accepts DOM selectors', () => {
-			let spy1 = bender.sinon.spy();
-			let spy2 = bender.sinon.spy();
-			let spy3 = bender.sinon.spy();
+			let spy1 = testUtils.sinon.spy();
+			let spy2 = testUtils.sinon.spy();
+			let spy3 = testUtils.sinon.spy();
 
 			setTestViewClass( function() {
 				return {
@@ -600,8 +596,8 @@ describe( 'View', () => {
 		} );
 
 		it( 'accepts function callbacks', () => {
-			let spy1 = bender.sinon.spy();
-			let spy2 = bender.sinon.spy();
+			let spy1 = testUtils.sinon.spy();
+			let spy2 = testUtils.sinon.spy();
 
 			setTestViewClass( function() {
 				return {
@@ -633,7 +629,7 @@ describe( 'View', () => {
 		} );
 
 		it( 'supports event delegation', () => {
-			let spy = bender.sinon.spy();
+			let spy = testUtils.sinon.spy();
 
 			setTestViewClass( function() {
 				return {
@@ -661,7 +657,7 @@ describe( 'View', () => {
 		} );
 
 		it( 'works for future elements', () => {
-			let spy = bender.sinon.spy();
+			let spy = testUtils.sinon.spy();
 
 			setTestViewClass( function() {
 				return {
@@ -710,7 +706,7 @@ describe( 'View', () => {
 
 		it( 'destroys child regions', () => {
 			const region = new Region( 'x' );
-			const spy = bender.sinon.spy( region, 'destroy' );
+			const spy = testUtils.sinon.spy( region, 'destroy' );
 			const regionsRef = view.regions;
 			const regionViewsRef = region.views;
 
@@ -757,13 +753,6 @@ describe( 'View', () => {
 	} );
 } );
 
-function updateModuleReference() {
-	View = modules[ 'core/ui/view' ];
-	Region = modules[ 'core/ui/region' ];
-	Model = modules[ 'core/model' ];
-	CKEditorError = modules[ 'core/ckeditorerror' ];
-}
-
 function createViewInstanceWithTemplate() {
 	setTestViewClass( () => ( { tag: 'a' } ) );
 	setTestViewInstance();

+ 23 - 24
packages/ckeditor5-engine/tests/bender/tools.js → packages/ckeditor5-engine/tests/utils-tests/utils.js

@@ -3,55 +3,54 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-include: ../_tools/tools.js */
-
 'use strict';
 
+import amdTestUtils from '/tests/_utils/amd.js';
+import coreTestUtils from '/tests/core/_utils/utils.js';
+import Creator from '/ckeditor5/core/creator.js';
+
 let createFn3 = () => {};
 let destroyFn3 = () => {};
 
-bender.tools.core.defineEditorCreatorMock( 'test1' );
-bender.tools.core.defineEditorCreatorMock( 'test2', {
+coreTestUtils.defineEditorCreatorMock( 'test1' );
+coreTestUtils.defineEditorCreatorMock( 'test2', {
 	foo: 1,
 	bar: 2
 } );
-bender.tools.core.defineEditorCreatorMock( 'test3', {
+coreTestUtils.defineEditorCreatorMock( 'test3', {
 	create: createFn3,
 	destroy: destroyFn3
 } );
 
-const modules = bender.amd.require( 'core/creator', 'creator-test1', 'creator-test2', 'creator-test3' );
-let Creator;
+const modules = amdTestUtils.require( {
+	testCreator1: 'creator-test1/creator-test1',
+	testCreator2: 'creator-test2/creator-test2',
+	testCreator3: 'creator-test3/creator-test3'
+} );
 
 ///////////////////
 
+let TestCreator1, TestCreator2, TestCreator3;
+
 before( () => {
-	Creator = modules[ 'core/creator' ];
+	TestCreator1 = modules.testCreator1;
+	TestCreator2 = modules.testCreator2;
+	TestCreator3 = modules.testCreator3;
 } );
 
-describe( 'bender.tools.core.defineEditorCreatorMock()', () => {
+describe( 'coreTestUtils.defineEditorCreatorMock()', () => {
 	it( 'should register all creators', () => {
-		const TestCreator1 = modules[ 'creator-test1' ];
-		const TestCreator2 = modules[ 'creator-test2' ];
-		const TestCreator3 = modules[ 'creator-test3' ];
-
 		expect( TestCreator1.prototype ).to.be.instanceof( Creator );
 		expect( TestCreator2.prototype ).to.be.instanceof( Creator );
 		expect( TestCreator3.prototype ).to.be.instanceof( Creator );
 	} );
 
 	it( 'should copy properties from the second argument', () => {
-		const TestCreator = modules[ 'creator-test2' ];
-
-		expect( TestCreator.prototype ).to.have.property( 'foo', 1 );
-		expect( TestCreator.prototype ).to.have.property( 'bar', 2 );
+		expect( TestCreator2.prototype ).to.have.property( 'foo', 1 );
+		expect( TestCreator2.prototype ).to.have.property( 'bar', 2 );
 	} );
 
 	it( 'should create spies for create() and destroy() if not defined', () => {
-		const TestCreator1 = modules[ 'creator-test1' ];
-		const TestCreator2 = modules[ 'creator-test2' ];
-		const TestCreator3 = modules[ 'creator-test3' ];
-
 		expect( TestCreator1.prototype.create ).to.have.property( 'called', false, 'test1.create' );
 		expect( TestCreator1.prototype.destroy ).to.have.property( 'called', false, 'test1.destroy' );
 		expect( TestCreator2.prototype.create ).to.have.property( 'called', false, 'test2.create' );
@@ -63,9 +62,9 @@ describe( 'bender.tools.core.defineEditorCreatorMock()', () => {
 	} );
 } );
 
-describe( 'bender.tools.core.getIteratorCount()', () => {
+describe( 'coreTestUtils.getIteratorCount()', () => {
 	it( 'should returns number of editable items ', () => {
-		const count = bender.tools.core.getIteratorCount( [ 1, 2, 3, 4, 5 ] );
+		const count = coreTestUtils.getIteratorCount( [ 1, 2, 3, 4, 5 ] );
 		expect( count ).to.equal( 5 );
 	} );
-} );
+} );

+ 1 - 7
packages/ckeditor5-engine/tests/utils.js

@@ -5,15 +5,9 @@
 
 'use strict';
 
-const modules = bender.amd.require( 'core/utils' );
+import utils from '/ckeditor5/core/utils.js';
 
 describe( 'utils', () => {
-	let utils;
-
-	before( () => {
-		utils = modules[ 'core/utils' ];
-	} );
-
 	describe( 'spy', () => {
 		it( 'should not have `called` after creation', () => {
 			let spy = utils.spy();