Browse Source

Merge branch 'master' into t/138

Piotrek Koszuliński 10 năm trước cách đây
mục cha
commit
fd0af65bc6

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

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

+ 0 - 94
packages/ckeditor5-ui/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;
-		}
-	};
-} )();

+ 0 - 71
packages/ckeditor5-ui/tests/bender/tools.js

@@ -1,71 +0,0 @@
-/**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
- */
-
-/* bender-include: ../_tools/tools.js */
-
-'use strict';
-
-let createFn3 = () => {};
-let destroyFn3 = () => {};
-
-bender.tools.core.defineEditorCreatorMock( 'test1' );
-bender.tools.core.defineEditorCreatorMock( 'test2', {
-	foo: 1,
-	bar: 2
-} );
-bender.tools.core.defineEditorCreatorMock( 'test3', {
-	create: createFn3,
-	destroy: destroyFn3
-} );
-
-const modules = bender.amd.require( 'core/creator', 'creator-test1', 'creator-test2', 'creator-test3' );
-let Creator;
-
-///////////////////
-
-before( () => {
-	Creator = modules[ 'core/creator' ];
-} );
-
-describe( 'bender.tools.core.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 );
-	} );
-
-	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' );
-		expect( TestCreator2.prototype.destroy ).to.have.property( 'called', false, 'test2.destroy' );
-
-		// Not spies:
-		expect( TestCreator3.prototype ).to.have.property( 'create', createFn3 );
-		expect( TestCreator3.prototype ).to.have.property( 'destroy', destroyFn3 );
-	} );
-} );
-
-describe( 'bender.tools.core.getIteratorCount()', () => {
-	it( 'should returns number of editable items ', () => {
-		const count = bender.tools.core.getIteratorCount( [ 1, 2, 3, 4, 5 ] );
-		expect( count ).to.equal( 5 );
-	} );
-} );

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

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

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

@@ -5,13 +5,9 @@
 
 
 'use strict';
 '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( () => {
 beforeEach( () => {
 	config = new Config( {
 	config = new Config( {

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

@@ -5,15 +5,11 @@
 
 
 'use strict';
 '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 );
 beforeEach( refreshEmitter );
 
 

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

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

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

@@ -5,15 +5,9 @@
 
 
 'use strict';
 'use strict';
 
 
-const modules = bender.amd.require( 'core/lib/lodash/object' );
+import objectUtils from '/ckeditor5/core/lib/lodash/object.js';
 
 
 describe( 'utils', () => {
 describe( 'utils', () => {
-	let objectUtils;
-
-	before( () => {
-		objectUtils = modules[ 'core/lib/lodash/object' ];
-	} );
-
 	describe( 'extend()', () => {
 	describe( 'extend()', () => {
 		// Properties of the subsequent objects should override properties of the preceding objects. This is critical for
 		// 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.
 		// 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-ui/tests/log.js

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

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

@@ -5,21 +5,16 @@
 
 
 'use strict';
 '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;
 let Car, car;
 
 
-bender.tools.createSinonSandbox();
+testUtils.createSinonSandbox();
 
 
 describe( 'Model', () => {
 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', () => {
 	beforeEach( 'Create a test model instance', () => {
 		Car = class extends Model {};
 		Car = class extends Model {};
 
 

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

@@ -7,25 +7,18 @@
 
 
 'use strict';
 '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;
 let ParentController, ParentView;
 
 
-bender.tools.createSinonSandbox();
+testUtils.createSinonSandbox();
 
 
 describe( 'Controller', () => {
 describe( 'Controller', () => {
-	beforeEach( updateModuleReference );
-
 	describe( 'constructor', () => {
 	describe( 'constructor', () => {
 		it( 'defines basic properties', () => {
 		it( 'defines basic properties', () => {
 			const controller = new Controller();
 			const controller = new Controller();
@@ -73,7 +66,7 @@ describe( 'Controller', () => {
 		it( 'should initialize own view', () => {
 		it( 'should initialize own view', () => {
 			const view = new View();
 			const view = new View();
 			const controller = new Controller( null, 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( () => {
 			return controller.init().then( () => {
 				sinon.assert.calledOnce( spy );
 				sinon.assert.calledOnce( spy );
@@ -87,8 +80,8 @@ describe( 'Controller', () => {
 
 
 			const childController1 = new Controller();
 			const childController1 = new Controller();
 			const childController2 = 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( childController1 );
 			buttonCollection.add( childController2 );
 			buttonCollection.add( childController2 );
@@ -127,7 +120,7 @@ describe( 'Controller', () => {
 				const parentController = new ParentController( null, parentView );
 				const parentController = new ParentController( null, parentView );
 				const collection = parentController.collections.get( 'x' );
 				const collection = parentController.collections.get( 'x' );
 				const childController = new Controller( null, new View() );
 				const childController = new Controller( null, new View() );
-				const spy1 = bender.sinon.spy( parentView, 'addChild' );
+				const spy1 = testUtils.sinon.spy( parentView, 'addChild' );
 
 
 				collection.add( childController );
 				collection.add( childController );
 
 
@@ -175,7 +168,7 @@ describe( 'Controller', () => {
 				const parentController = new ParentController( null, parentView );
 				const parentController = new ParentController( null, parentView );
 				const collection = parentController.collections.get( 'x' );
 				const collection = parentController.collections.get( 'x' );
 				const childController = new Controller( null, new View() );
 				const childController = new Controller( null, new View() );
-				const spy = bender.sinon.spy( parentView, 'removeChild' );
+				const spy = testUtils.sinon.spy( parentView, 'removeChild' );
 
 
 				collection.add( childController );
 				collection.add( childController );
 
 
@@ -198,7 +191,7 @@ describe( 'Controller', () => {
 		it( 'should destroy the controller', () => {
 		it( 'should destroy the controller', () => {
 			const view = new View();
 			const view = new View();
 			const controller = new Controller( null, view );
 			const controller = new Controller( null, view );
-			const spy = bender.sinon.spy( view, 'destroy' );
+			const spy = testUtils.sinon.spy( view, 'destroy' );
 
 
 			return controller.init()
 			return controller.init()
 				.then( () => {
 				.then( () => {
@@ -233,7 +226,7 @@ describe( 'Controller', () => {
 			const collection = parentController.collections.get( 'x' );
 			const collection = parentController.collections.get( 'x' );
 			const childView = new View();
 			const childView = new View();
 			const childController = new Controller( null, childView );
 			const childController = new Controller( null, childView );
-			const spy = bender.sinon.spy( childView, 'destroy' );
+			const spy = testUtils.sinon.spy( childView, 'destroy' );
 
 
 			collection.add( childController );
 			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() {
 function defineParentViewClass() {
 	ParentView = class extends View {
 	ParentView = class extends View {
 		constructor() {
 		constructor() {

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

@@ -7,19 +7,16 @@
 
 
 'use strict';
 '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;
 let ParentView;
 
 
 describe( 'ControllerCollection', () => {
 describe( 'ControllerCollection', () => {
-	beforeEach( updateModuleReference );
 	beforeEach( defineParentViewClass );
 	beforeEach( defineParentViewClass );
 
 
 	describe( 'constructor', () => {
 	describe( 'constructor', () => {
@@ -62,7 +59,7 @@ describe( 'ControllerCollection', () => {
 		it( 'should initialize child controller if parent is ready', () => {
 		it( 'should initialize child controller if parent is ready', () => {
 			const parentController = new Controller( null, new ParentView() );
 			const parentController = new Controller( null, new ParentView() );
 			const childController = new Controller( null, new View() );
 			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' );
 			const collection = new ControllerCollection( 'x' );
 
 
 			parentController.collections.add( collection );
 			parentController.collections.add( collection );
@@ -83,7 +80,7 @@ describe( 'ControllerCollection', () => {
 		it( 'should not initialize child controller twice', () => {
 		it( 'should not initialize child controller twice', () => {
 			const parentController = new Controller( null, new ParentView() );
 			const parentController = new Controller( null, new ParentView() );
 			const childController = new Controller( null, new View() );
 			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' );
 			const collection = new ControllerCollection( 'x' );
 
 
 			parentController.collections.add( collection );
 			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() {
 function defineParentViewClass() {
 	ParentView = class extends View {
 	ParentView = class extends View {
 		constructor() {
 		constructor() {

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

@@ -8,13 +8,17 @@
 
 
 'use strict';
 '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;
 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' );
 let getDOMNodeInstance = () => document.createElement( 'div' );
 
 
 function updateEmitterInstance() {
 function updateEmitterInstance() {
@@ -35,7 +39,7 @@ beforeEach( updateDOMNodeInstance );
 
 
 describe( 'listenTo', () => {
 describe( 'listenTo', () => {
 	it( 'should listen to EmitterMixin events', () => {
 	it( 'should listen to EmitterMixin events', () => {
-		let spy = bender.sinon.spy();
+		let spy = testUtils.sinon.spy();
 
 
 		domEmitter.listenTo( emitter, 'test', spy );
 		domEmitter.listenTo( emitter, 'test', spy );
 		emitter.fire( 'test' );
 		emitter.fire( 'test' );
@@ -44,7 +48,7 @@ describe( 'listenTo', () => {
 	} );
 	} );
 
 
 	it( 'should listen to native DOM events', () => {
 	it( 'should listen to native DOM events', () => {
-		let spy = bender.sinon.spy();
+		let spy = testUtils.sinon.spy();
 
 
 		domEmitter.listenTo( node, 'test', spy );
 		domEmitter.listenTo( node, 'test', spy );
 
 
@@ -57,8 +61,8 @@ describe( 'listenTo', () => {
 
 
 describe( 'stopListening', () => {
 describe( 'stopListening', () => {
 	it( 'should stop listening to a specific event callback', () => {
 	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, 'event1', spy1 );
 		domEmitter.listenTo( node, 'event2', spy2 );
 		domEmitter.listenTo( node, 'event2', spy2 );
@@ -76,9 +80,9 @@ describe( 'stopListening', () => {
 	} );
 	} );
 
 
 	it( 'should stop listening to an specific event', () => {
 	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', spy1a );
 		domEmitter.listenTo( node, 'event1', spy1b );
 		domEmitter.listenTo( node, 'event1', spy1b );
@@ -102,8 +106,8 @@ describe( 'stopListening', () => {
 	} );
 	} );
 
 
 	it( 'should stop listening to all events from a specific node', () => {
 	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, 'event1', spy1 );
 		domEmitter.listenTo( node, 'event2', spy2 );
 		domEmitter.listenTo( node, 'event2', spy2 );
@@ -121,8 +125,8 @@ describe( 'stopListening', () => {
 	} );
 	} );
 
 
 	it( 'should stop listening to everything', () => {
 	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 node1 = getDOMNodeInstance();
 		let node2 = getDOMNodeInstance();
 		let node2 = getDOMNodeInstance();
@@ -147,7 +151,7 @@ describe( 'stopListening', () => {
 	} );
 	} );
 
 
 	it( 'should not stop other nodes when a non-listened node is provided', () => {
 	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 node1 = getDOMNodeInstance();
 		let node2 = getDOMNodeInstance();
 		let node2 = getDOMNodeInstance();
@@ -162,7 +166,7 @@ describe( 'stopListening', () => {
 	} );
 	} );
 
 
 	it( 'should pass DOM Event data to the listener', () => {
 	it( 'should pass DOM Event data to the listener', () => {
-		let spy = bender.sinon.spy();
+		let spy = testUtils.sinon.spy();
 
 
 		let node = getDOMNodeInstance();
 		let node = getDOMNodeInstance();
 
 
@@ -180,13 +184,13 @@ describe( 'stopListening', () => {
 	} );
 	} );
 
 
 	it( 'should detach native DOM event listener proxy, specific event', () => {
 	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 );
 		domEmitter.listenTo( node, 'test', spy1a );
 
 
 		let proxyEmitter = domEmitter._getProxyEmitter( node );
 		let proxyEmitter = domEmitter._getProxyEmitter( node );
-		let spy2 = bender.sinon.spy( proxyEmitter, 'fire' );
+		let spy2 = testUtils.sinon.spy( proxyEmitter, 'fire' );
 
 
 		node.dispatchEvent( new Event( 'test' ) );
 		node.dispatchEvent( new Event( 'test' ) );
 
 
@@ -211,15 +215,15 @@ describe( 'stopListening', () => {
 	} );
 	} );
 
 
 	it( 'should detach native DOM event listener proxy, specific callback', () => {
 	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', spy1a );
 		domEmitter.listenTo( node, 'test', spy1b );
 		domEmitter.listenTo( node, 'test', spy1b );
 
 
 		let proxyEmitter = domEmitter._getProxyEmitter( node );
 		let proxyEmitter = domEmitter._getProxyEmitter( node );
-		let spy2 = bender.sinon.spy( proxyEmitter, 'fire' );
+		let spy2 = testUtils.sinon.spy( proxyEmitter, 'fire' );
 
 
 		node.dispatchEvent( new Event( 'test' ) );
 		node.dispatchEvent( new Event( 'test' ) );
 
 
@@ -254,16 +258,16 @@ describe( 'stopListening', () => {
 	} );
 	} );
 
 
 	it( 'should detach native DOM event listener proxy, specific emitter', () => {
 	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, 'test1', spy1a );
 		domEmitter.listenTo( node, 'test2', spy1b );
 		domEmitter.listenTo( node, 'test2', spy1b );
 
 
 		let proxyEmitter = domEmitter._getProxyEmitter( node );
 		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( 'test1' ) );
 		node.dispatchEvent( new Event( 'test2' ) );
 		node.dispatchEvent( new Event( 'test2' ) );
@@ -287,7 +291,7 @@ describe( 'stopListening', () => {
 
 
 		// Old proxy emitter died when stopped listening to the node.
 		// Old proxy emitter died when stopped listening to the node.
 		let proxyEmitter2 = domEmitter._getProxyEmitter( 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( 'test1' ) );
 		node.dispatchEvent( new Event( 'test2' ) );
 		node.dispatchEvent( new Event( 'test2' ) );
@@ -303,16 +307,16 @@ describe( 'stopListening', () => {
 	} );
 	} );
 
 
 	it( 'should detach native DOM event listener proxy, everything', () => {
 	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, 'test1', spy1a );
 		domEmitter.listenTo( node, 'test2', spy1b );
 		domEmitter.listenTo( node, 'test2', spy1b );
 
 
 		let proxyEmitter = domEmitter._getProxyEmitter( node );
 		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( 'test1' ) );
 		node.dispatchEvent( new Event( 'test2' ) );
 		node.dispatchEvent( new Event( 'test2' ) );
@@ -336,7 +340,7 @@ describe( 'stopListening', () => {
 
 
 		// Old proxy emitter died when stopped listening to the node.
 		// Old proxy emitter died when stopped listening to the node.
 		let proxyEmitter2 = domEmitter._getProxyEmitter( 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( 'test1' ) );
 		node.dispatchEvent( new Event( 'test2' ) );
 		node.dispatchEvent( new Event( 'test2' ) );

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

@@ -8,11 +8,9 @@
 
 
 'use strict';
 '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 TestViewA, TestViewB;
 let region, el;
 let region, el;
 
 
@@ -107,9 +105,6 @@ describe( 'View', () => {
 } );
 } );
 
 
 function createRegionInstance() {
 function createRegionInstance() {
-	Region = modules[ 'core/ui/region' ];
-	View = modules[ 'core/ui/view' ];
-
 	class A extends View {
 	class A extends View {
 		constructor() {
 		constructor() {
 			super();
 			super();

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

@@ -8,14 +8,12 @@
 
 
 'use strict';
 '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', () => {
 describe( 'Template', () => {
-	beforeEach( createClassReferences );
-
 	describe( 'constructor', () => {
 	describe( 'constructor', () => {
 		it( 'accepts the definition', () => {
 		it( 'accepts the definition', () => {
 			let def = {
 			let def = {
@@ -75,8 +73,8 @@ describe( 'Template', () => {
 
 
 		describe( 'callback', () => {
 		describe( 'callback', () => {
 			it( 'works for attributes', () => {
 			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( {
 				let el = new Template( {
 					tag: 'p',
 					tag: 'p',
@@ -103,8 +101,8 @@ describe( 'Template', () => {
 			} );
 			} );
 
 
 			it( 'works for "text" property', () => {
 			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( {
 				let el = new Template( {
 					tag: 'p',
 					tag: 'p',
@@ -128,10 +126,10 @@ describe( 'Template', () => {
 			} );
 			} );
 
 
 			it( 'works for "on" property', () => {
 			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( {
 				let el = new Template( {
 					tag: 'p',
 					tag: 'p',
@@ -156,10 +154,10 @@ describe( 'Template', () => {
 			} );
 			} );
 
 
 			it( 'works for "on" property with selectors', () => {
 			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( {
 				let el = new Template( {
 					tag: 'p',
 					tag: 'p',
@@ -194,7 +192,3 @@ describe( 'Template', () => {
 		} );
 		} );
 	} );
 	} );
 } );
 } );
-
-function createClassReferences() {
-	Template = modules[ 'core/ui/template' ];
-}

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

@@ -8,21 +8,17 @@
 
 
 'use strict';
 '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', () => {
 describe( 'View', () => {
-	beforeEach( updateModuleReference );
-
 	describe( 'constructor', () => {
 	describe( 'constructor', () => {
 		beforeEach( () => {
 		beforeEach( () => {
 			setTestViewClass();
 			setTestViewClass();
@@ -73,8 +69,8 @@ describe( 'View', () => {
 			view.register( region1, el => el );
 			view.register( region1, el => el );
 			view.register( region2, 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();
 			view.init();
 
 
@@ -319,7 +315,7 @@ describe( 'View', () => {
 
 
 		it( 'should not override an existing region with the same region with override flag', () => {
 		it( 'should not override an existing region with the same region with override flag', () => {
 			const region = new Region( 'x' );
 			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 );
 			view.register( region, true, true );
 			view.register( region, true, true );
@@ -359,7 +355,7 @@ describe( 'View', () => {
 		it( 'returns a function that passes arguments', () => {
 		it( 'returns a function that passes arguments', () => {
 			setTestViewInstance( { a: 'foo' } );
 			setTestViewInstance( { a: 'foo' } );
 
 
-			let spy = bender.sinon.spy();
+			let spy = testUtils.sinon.spy();
 			let callback = view.bindToAttribute( 'a', spy );
 			let callback = view.bindToAttribute( 'a', spy );
 
 
 			expect( spy.called ).to.be.false;
 			expect( spy.called ).to.be.false;
@@ -463,7 +459,7 @@ describe( 'View', () => {
 
 
 	describe( 'on', () => {
 	describe( 'on', () => {
 		it( 'accepts plain binding', () => {
 		it( 'accepts plain binding', () => {
-			let spy = bender.sinon.spy();
+			let spy = testUtils.sinon.spy();
 
 
 			setTestViewClass( function() {
 			setTestViewClass( function() {
 				return {
 				return {
@@ -486,8 +482,8 @@ describe( 'View', () => {
 		} );
 		} );
 
 
 		it( 'accepts an array of event bindings', () => {
 		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() {
 			setTestViewClass( function() {
 				return {
 				return {
@@ -515,9 +511,9 @@ describe( 'View', () => {
 		} );
 		} );
 
 
 		it( 'accepts DOM selectors', () => {
 		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() {
 			setTestViewClass( function() {
 				return {
 				return {
@@ -600,8 +596,8 @@ describe( 'View', () => {
 		} );
 		} );
 
 
 		it( 'accepts function callbacks', () => {
 		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() {
 			setTestViewClass( function() {
 				return {
 				return {
@@ -633,7 +629,7 @@ describe( 'View', () => {
 		} );
 		} );
 
 
 		it( 'supports event delegation', () => {
 		it( 'supports event delegation', () => {
-			let spy = bender.sinon.spy();
+			let spy = testUtils.sinon.spy();
 
 
 			setTestViewClass( function() {
 			setTestViewClass( function() {
 				return {
 				return {
@@ -661,7 +657,7 @@ describe( 'View', () => {
 		} );
 		} );
 
 
 		it( 'works for future elements', () => {
 		it( 'works for future elements', () => {
-			let spy = bender.sinon.spy();
+			let spy = testUtils.sinon.spy();
 
 
 			setTestViewClass( function() {
 			setTestViewClass( function() {
 				return {
 				return {
@@ -710,7 +706,7 @@ describe( 'View', () => {
 
 
 		it( 'destroys child regions', () => {
 		it( 'destroys child regions', () => {
 			const region = new Region( 'x' );
 			const region = new Region( 'x' );
-			const spy = bender.sinon.spy( region, 'destroy' );
+			const spy = testUtils.sinon.spy( region, 'destroy' );
 			const regionsRef = view.regions;
 			const regionsRef = view.regions;
 			const regionViewsRef = region.views;
 			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() {
 function createViewInstanceWithTemplate() {
 	setTestViewClass( () => ( { tag: 'a' } ) );
 	setTestViewClass( () => ( { tag: 'a' } ) );
 	setTestViewInstance();
 	setTestViewInstance();