Преглед на файлове

Ported some more tests.

Piotrek Koszuliński преди 10 години
родител
ревизия
809de23169

+ 44 - 0
packages/ckeditor5-engine/tests/lodash.js

@@ -0,0 +1,44 @@
+/**
+ * @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md.
+ */
+
+'use strict';
+
+const modules = bender.amd.require( 'core/lib/lodash/object' );
+
+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.
+		it( 'should extend by several params in the correct order', () => {
+			let target = {
+				a: 0,
+				b: 0
+			};
+
+			let ext1 = {
+				b: 1,
+				c: 1
+			};
+
+			let ext2 = {
+				c: 2,
+				d: 2
+			};
+
+			objectUtils.extend( target, ext1, ext2 );
+
+			expect( target ).to.have.property( 'a' ).to.equal( 0 );
+			expect( target ).to.have.property( 'b' ).to.equal( 1 );
+			expect( target ).to.have.property( 'c' ).to.equal( 2 );
+			expect( target ).to.have.property( 'd' ).to.equal( 2 );
+		} );
+	} );
+} );

+ 6 - 6
packages/ckeditor5-engine/tests/ui/controllercollection.js

@@ -8,9 +8,9 @@
 'use strict';
 
 const modules = bender.amd.require( 'ckeditor',
-	'ui/controllercollection',
-	'ui/controller',
-	'ui/view'
+	'core/ui/controllercollection',
+	'core/ui/controller',
+	'core/ui/view'
 );
 
 bender.tools.createSinonSandbox();
@@ -103,9 +103,9 @@ describe( 'ControllerCollection', () => {
 } );
 
 function updateModuleReference() {
-	View = modules[ 'ui/view' ];
-	Controller = modules[ 'ui/controller' ];
-	ControllerCollection = modules[ 'ui/controllercollection' ];
+	View = modules[ 'core/ui/view' ];
+	Controller = modules[ 'core/ui/controller' ];
+	ControllerCollection = modules[ 'core/ui/controllercollection' ];
 }
 
 function defineParentViewClass() {

+ 3 - 3
packages/ckeditor5-engine/tests/ui/domemittermixin.js

@@ -8,13 +8,13 @@
 
 'use strict';
 
-const modules = bender.amd.require( 'utils', 'ui/domemittermixin', 'emittermixin' );
+const modules = bender.amd.require( 'core/lib/lodash/object', 'core/ui/domemittermixin', 'core/emittermixin' );
 let emitter, domEmitter, node;
 
 bender.tools.createSinonSandbox();
 
-let getEmitterInstance = () => modules.utils.extend( {}, modules.emittermixin );
-let getDOMEmitterInstance = () => modules.utils.extend( {}, modules[ 'ui/domemittermixin' ] );
+let getEmitterInstance = () => modules[ 'core/lib/lodash/object' ].extend( {}, modules[ 'core/emittermixin' ] );
+let getDOMEmitterInstance = () => modules[ 'core/lib/lodash/object' ].extend( {}, modules[ 'core/ui/domemittermixin' ] );
 let getDOMNodeInstance = () => document.createElement( 'div' );
 
 function updateEmitterInstance() {

+ 3 - 3
packages/ckeditor5-engine/tests/ui/region.js

@@ -8,7 +8,7 @@
 
 'use strict';
 
-const modules = bender.amd.require( 'ckeditor', 'ui/region', 'ui/view', 'collection' );
+const modules = bender.amd.require( 'core/ui/region', 'core/ui/view' );
 
 bender.tools.createSinonSandbox();
 
@@ -107,8 +107,8 @@ describe( 'View', () => {
 } );
 
 function createRegionInstance() {
-	Region = modules[ 'ui/region' ];
-	View = modules[ 'ui/view' ];
+	Region = modules[ 'core/ui/region' ];
+	View = modules[ 'core/ui/view' ];
 
 	class A extends View {
 		constructor() {

+ 2 - 2
packages/ckeditor5-engine/tests/ui/template.js

@@ -8,7 +8,7 @@
 
 'use strict';
 
-const modules = bender.amd.require( 'ckeditor', 'ui/view', 'ui/template' );
+const modules = bender.amd.require( 'core/ui/template' );
 let Template;
 
 bender.tools.createSinonSandbox();
@@ -196,5 +196,5 @@ describe( 'Template', () => {
 } );
 
 function createClassReferences() {
-	Template = modules[ 'ui/template' ];
+	Template = modules[ 'core/ui/template' ];
 }

+ 9 - 11
packages/ckeditor5-engine/tests/ui/view.js

@@ -9,12 +9,10 @@
 'use strict';
 
 const modules = bender.amd.require(
-	'ckeditor',
-	'ui/view',
-	'ui/region',
-	'ckeditorerror',
-	'model',
-	'eventinfo'
+	'core/ui/view',
+	'core/ui/region',
+	'core/ckeditorerror',
+	'core/model'
 );
 
 let View, TestView, Model, Region, CKEditorError;
@@ -34,7 +32,7 @@ describe( 'View', () => {
 		it( 'accepts the model', () => {
 			setTestViewInstance( { a: 'foo', b: 42 } );
 
-			expect( view.model ).to.be.an.instanceof( modules.model );
+			expect( view.model ).to.be.an.instanceof( Model );
 			expect( view ).to.have.deep.property( 'model.a', 'foo' );
 			expect( view ).to.have.deep.property( 'model.b', 42 );
 		} );
@@ -760,10 +758,10 @@ describe( 'View', () => {
 } );
 
 function updateModuleReference() {
-	View = modules[ 'ui/view' ];
-	Region = modules[ 'ui/region' ];
-	Model = modules.model;
-	CKEditorError = modules.ckeditorerror;
+	View = modules[ 'core/ui/view' ];
+	Region = modules[ 'core/ui/region' ];
+	Model = modules[ 'core/model' ];
+	CKEditorError = modules[ 'core/ckeditorerror' ];
 }
 
 function createViewInstanceWithTemplate() {

+ 2 - 42
packages/ckeditor5-engine/tests/utils/utils.js

@@ -5,41 +5,13 @@
 
 'use strict';
 
-const modules = bender.amd.require( 'utils', 'utils-lodash' );
+const modules = bender.amd.require( 'core/utils' );
 
 describe( 'utils', () => {
 	let utils;
 
 	before( () => {
-		utils = modules.utils;
-	} );
-
-	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.
-		it( 'should extend by several params in the correct order', () => {
-			let target = {
-				a: 0,
-				b: 0
-			};
-
-			let ext1 = {
-				b: 1,
-				c: 1
-			};
-
-			let ext2 = {
-				c: 2,
-				d: 2
-			};
-
-			utils.extend( target, ext1, ext2 );
-
-			expect( target ).to.have.property( 'a' ).to.equal( 0 );
-			expect( target ).to.have.property( 'b' ).to.equal( 1 );
-			expect( target ).to.have.property( 'c' ).to.equal( 2 );
-			expect( target ).to.have.property( 'd' ).to.equal( 2 );
-		} );
+		utils = modules[ 'core/utils' ];
 	} );
 
 	describe( 'spy', () => {
@@ -177,16 +149,4 @@ describe( 'utils', () => {
 			yield 33;
 		}
 	} );
-
-	describe( 'Lo-Dash extensions', () => {
-		// Ensures that the required Lo-Dash extensions are available in `utils`.
-		it( 'should be exposed in utils', () => {
-			let utils = modules.utils;
-			let extensions = modules[ 'utils-lodash' ];
-
-			extensions.forEach( ( extension ) => {
-				expect( utils ).to.have.property( extension ).to.not.be.undefined();
-			} );
-		} );
-	} );
 } );