Parcourir la source

Code style: wraped tests in the main describe().

Piotrek Koszuliński il y a 9 ans
Parent
commit
dfadc672ff

+ 224 - 222
packages/ckeditor5-utils/tests/config.js

@@ -5,297 +5,299 @@
 
 import Config from 'ckeditor5/utils/config.js';
 
-let config;
-
-beforeEach( () => {
-	config = new Config( {
-		creator: 'inline',
-		language: 'pl',
-		resize: {
-			minHeight: 300,
-			maxHeight: 800,
-			icon: {
-				path: 'xyz'
-			}
-		},
-		toolbar: 'top'
-	} );
-} );
+describe( 'Config', () => {
+	let config;
 
-describe( 'constructor', () => {
-	it( 'should set configurations', () => {
-		expect( config.get( 'creator' ) ).to.equal( 'inline' );
-		expect( config.get( 'language' ) ).to.equal( 'pl' );
-		expect( config.get( 'resize' ) ).to.deep.equal( {
-			minHeight: 300,
-			maxHeight: 800,
-			icon: {
-				path: 'xyz'
-			}
+	beforeEach( () => {
+		config = new Config( {
+			creator: 'inline',
+			language: 'pl',
+			resize: {
+				minHeight: 300,
+				maxHeight: 800,
+				icon: {
+					path: 'xyz'
+				}
+			},
+			toolbar: 'top'
 		} );
-		expect( config.get( 'toolbar' ) ).to.equal( 'top' );
 	} );
 
-	it( 'should work with no parameters', () => {
-		// No error should be thrown.
-		config = new Config();
+	describe( 'constructor', () => {
+		it( 'should set configurations', () => {
+			expect( config.get( 'creator' ) ).to.equal( 'inline' );
+			expect( config.get( 'language' ) ).to.equal( 'pl' );
+			expect( config.get( 'resize' ) ).to.deep.equal( {
+				minHeight: 300,
+				maxHeight: 800,
+				icon: {
+					path: 'xyz'
+				}
+			} );
+			expect( config.get( 'toolbar' ) ).to.equal( 'top' );
+		} );
+
+		it( 'should work with no parameters', () => {
+			// No error should be thrown.
+			config = new Config();
+		} );
 	} );
-} );
 
-describe( 'set', () => {
-	it( 'should set configurations when passing objects', () => {
-		config.set( {
-			option1: 1,
-			option2: {
-				subOption21: 21
-			}
+	describe( 'set', () => {
+		it( 'should set configurations when passing objects', () => {
+			config.set( {
+				option1: 1,
+				option2: {
+					subOption21: 21
+				}
+			} );
+
+			expect( config.get( 'option1' ) ).to.equal( 1 );
+			expect( config.get( 'option2.subOption21' ) ).to.equal( 21 );
 		} );
 
-		expect( config.get( 'option1' ) ).to.equal( 1 );
-		expect( config.get( 'option2.subOption21' ) ).to.equal( 21 );
-	} );
+		it( 'should set configurations when passing name and value', () => {
+			config.set( 'something', 'anything' );
 
-	it( 'should set configurations when passing name and value', () => {
-		config.set( 'something', 'anything' );
+			expect( config.get( 'something' ) ).to.equal( 'anything' );
+		} );
 
-		expect( config.get( 'something' ) ).to.equal( 'anything' );
-	} );
+		it( 'should set configurations when passing name.with.deep and value', () => {
+			config.set( 'color.red', 'f00' );
+			config.set( 'background.color.blue', '00f' );
 
-	it( 'should set configurations when passing name.with.deep and value', () => {
-		config.set( 'color.red', 'f00' );
-		config.set( 'background.color.blue', '00f' );
+			expect( config.get( 'color.red' ) ).to.equal( 'f00' );
+			expect( config.get( 'background.color.blue' ) ).to.equal( '00f' );
+		} );
 
-		expect( config.get( 'color.red' ) ).to.equal( 'f00' );
-		expect( config.get( 'background.color.blue' ) ).to.equal( '00f' );
-	} );
+		it( 'should replace a simple entry with an object', () => {
+			config.set( 'test', 1 );
+			config.set( 'test', {
+				prop: 1
+			} );
 
-	it( 'should replace a simple entry with an object', () => {
-		config.set( 'test', 1 );
-		config.set( 'test', {
-			prop: 1
+			expect( config.get( 'test' ) ).to.be.an( 'object' );
+			expect( config.get( 'test.prop' ) ).to.equal( 1 );
 		} );
 
-		expect( config.get( 'test' ) ).to.be.an( 'object' );
-		expect( config.get( 'test.prop' ) ).to.equal( 1 );
-	} );
+		it( 'should replace a simple entry with an object when passing only object', () => {
+			config.set( 'test', 1 );
+			config.set( {
+				test: {
+					prop: 1
+				}
+			} );
 
-	it( 'should replace a simple entry with an object when passing only object', () => {
-		config.set( 'test', 1 );
-		config.set( {
-			test: {
-				prop: 1
-			}
+			expect( config.get( 'test' ) ).to.be.an( 'object' );
+			expect( config.get( 'test.prop' ) ).to.equal( 1 );
 		} );
 
-		expect( config.get( 'test' ) ).to.be.an( 'object' );
-		expect( config.get( 'test.prop' ) ).to.equal( 1 );
-	} );
+		it( 'should replace a simple entry with an object when passing a name.with.deep', () => {
+			config.set( 'test.prop', 1 );
+			config.set( 'test.prop.value', 1 );
 
-	it( 'should replace a simple entry with an object when passing a name.with.deep', () => {
-		config.set( 'test.prop', 1 );
-		config.set( 'test.prop.value', 1 );
+			expect( config.get( 'test' ) ).to.be.an( 'object' );
+			expect( config.get( 'test.prop' ) ).to.be.an( 'object' );
+			expect( config.get( 'test.prop.value' ) ).to.equal( 1 );
+		} );
 
-		expect( config.get( 'test' ) ).to.be.an( 'object' );
-		expect( config.get( 'test.prop' ) ).to.be.an( 'object' );
-		expect( config.get( 'test.prop.value' ) ).to.equal( 1 );
-	} );
+		it( 'should override and expand deep configurations', () => {
+			config.set( {
+				resize: {
+					minHeight: 400,		// Override
+					hidden: true,		// Expand
+					icon: {
+						path: 'abc',	// Override
+						url: true		// Expand
+					}
+				}
+			} );
 
-	it( 'should override and expand deep configurations', () => {
-		config.set( {
-			resize: {
+			expect( config.get( 'resize' ) ).to.be.deep.equal( {
+				minHeight: 400,		// Overridden
+				maxHeight: 800,		// The same
+				hidden: true,		// Expanded
+				icon: {
+					path: 'abc',	// Overridden
+					url: true		// Expanded
+				}
+			} );
+		} );
+
+		it( 'should override and expand object when passing an object', () => {
+			config.set( 'resize', {
 				minHeight: 400,		// Override
 				hidden: true,		// Expand
 				icon: {
 					path: 'abc',	// Override
 					url: true		// Expand
 				}
-			}
-		} );
+			} );
 
-		expect( config.get( 'resize' ) ).to.be.deep.equal( {
-			minHeight: 400,		// Overridden
-			maxHeight: 800,		// The same
-			hidden: true,		// Expanded
-			icon: {
-				path: 'abc',	// Overridden
-				url: true		// Expanded
-			}
+			expect( config.get( 'resize' ) ).to.deep.equal( {
+				minHeight: 400,		// Overridden
+				maxHeight: 800,		// The same
+				hidden: true,		// Expanded
+				icon: {
+					path: 'abc',	// Overridden
+					url: true		// Expanded
+				}
+			} );
 		} );
-	} );
 
-	it( 'should override and expand object when passing an object', () => {
-		config.set( 'resize', {
-			minHeight: 400,		// Override
-			hidden: true,		// Expand
-			icon: {
-				path: 'abc',	// Override
-				url: true		// Expand
-			}
-		} );
+		it( 'should not create object for non-pure objects', () => {
+			function SomeClass() {}
+
+			config.set( 'date', new Date() );
+			config.set( {
+				instance: new SomeClass()
+			} );
 
-		expect( config.get( 'resize' ) ).to.deep.equal( {
-			minHeight: 400,		// Overridden
-			maxHeight: 800,		// The same
-			hidden: true,		// Expanded
-			icon: {
-				path: 'abc',	// Overridden
-				url: true		// Expanded
-			}
+			expect( config.get( 'date' ) ).to.be.an.instanceof( Date );
+			expect( config.get( 'instance' ) ).to.be.an.instanceof( SomeClass );
 		} );
 	} );
 
-	it( 'should not create object for non-pure objects', () => {
-		function SomeClass() {}
+	describe( 'define', () => {
+		it( 'should set configurations when passing objects', () => {
+			config.set( {
+				option1: 1,
+				option2: {
+					subOption21: 21
+				}
+			} );
 
-		config.set( 'date', new Date() );
-		config.set( {
-			instance: new SomeClass()
+			expect( config.get( 'option1' ) ).to.equal( 1 );
+			expect( config.get( 'option2.subOption21' ) ).to.equal( 21 );
 		} );
 
-		expect( config.get( 'date' ) ).to.be.an.instanceof( Date );
-		expect( config.get( 'instance' ) ).to.be.an.instanceof( SomeClass );
-	} );
-} );
+		it( 'should set configurations when passing name and value', () => {
+			config.set( 'something', 'anything' );
 
-describe( 'define', () => {
-	it( 'should set configurations when passing objects', () => {
-		config.set( {
-			option1: 1,
-			option2: {
-				subOption21: 21
-			}
+			expect( config.get( 'something' ) ).to.equal( 'anything' );
 		} );
 
-		expect( config.get( 'option1' ) ).to.equal( 1 );
-		expect( config.get( 'option2.subOption21' ) ).to.equal( 21 );
-	} );
-
-	it( 'should set configurations when passing name and value', () => {
-		config.set( 'something', 'anything' );
+		it( 'should set configurations when passing name.with.deep and value', () => {
+			config.set( 'color.red', 'f00' );
+			config.set( 'background.color.blue', '00f' );
 
-		expect( config.get( 'something' ) ).to.equal( 'anything' );
-	} );
+			expect( config.get( 'color.red' ) ).to.equal( 'f00' );
+			expect( config.get( 'background.color.blue' ) ).to.equal( '00f' );
+		} );
 
-	it( 'should set configurations when passing name.with.deep and value', () => {
-		config.set( 'color.red', 'f00' );
-		config.set( 'background.color.blue', '00f' );
+		it( 'should not replace already defined values', () => {
+			config.define( 'language', 'en' );
+			config.define( 'resize.minHeight', 400 );
+			config.define( 'resize.icon', 'some value' );
 
-		expect( config.get( 'color.red' ) ).to.equal( 'f00' );
-		expect( config.get( 'background.color.blue' ) ).to.equal( '00f' );
-	} );
+			expect( config.get( 'language' ) ).to.equal( 'pl' );
+			expect( config.get( 'resize.icon' ) ).to.be.an( 'object' );
+			expect( config.get( 'resize.minHeight' ) ).to.equal( 300 );
+		} );
 
-	it( 'should not replace already defined values', () => {
-		config.define( 'language', 'en' );
-		config.define( 'resize.minHeight', 400 );
-		config.define( 'resize.icon', 'some value' );
+		it( 'should expand but not override deep configurations', () => {
+			config.define( {
+				resize: {
+					minHeight: 400,		// No override
+					hidden: true,		// Expand
+					icon: {
+						path: 'abc',	// No override
+						url: true		// Expand
+					}
+				}
+			} );
 
-		expect( config.get( 'language' ) ).to.equal( 'pl' );
-		expect( config.get( 'resize.icon' ) ).to.be.an( 'object' );
-		expect( config.get( 'resize.minHeight' ) ).to.equal( 300 );
-	} );
+			expect( config.get( 'resize' ) ).to.be.deep.equal( {
+				minHeight: 300,		// The same
+				maxHeight: 800,		// The same
+				hidden: true,		// Expanded
+				icon: {
+					path: 'xyz',	// The same
+					url: true		// Expanded
+				}
+			} );
+		} );
 
-	it( 'should expand but not override deep configurations', () => {
-		config.define( {
-			resize: {
+		it( 'should expand but not override when passing an object', () => {
+			config.define( 'resize', {
 				minHeight: 400,		// No override
 				hidden: true,		// Expand
 				icon: {
 					path: 'abc',	// No override
 					url: true		// Expand
 				}
-			}
-		} );
+			} );
 
-		expect( config.get( 'resize' ) ).to.be.deep.equal( {
-			minHeight: 300,		// The same
-			maxHeight: 800,		// The same
-			hidden: true,		// Expanded
-			icon: {
-				path: 'xyz',	// The same
-				url: true		// Expanded
-			}
-		} );
-	} );
-
-	it( 'should expand but not override when passing an object', () => {
-		config.define( 'resize', {
-			minHeight: 400,		// No override
-			hidden: true,		// Expand
-			icon: {
-				path: 'abc',	// No override
-				url: true		// Expand
-			}
+			expect( config.get( 'resize' ) ).to.be.deep.equal( {
+				minHeight: 300,		// The same
+				maxHeight: 800,		// The same
+				hidden: true,		// Expanded
+				icon: {
+					path: 'xyz',	// The same
+					url: true		// Expanded
+				}
+			} );
 		} );
 
-		expect( config.get( 'resize' ) ).to.be.deep.equal( {
-			minHeight: 300,		// The same
-			maxHeight: 800,		// The same
-			hidden: true,		// Expanded
-			icon: {
-				path: 'xyz',	// The same
-				url: true		// Expanded
-			}
-		} );
-	} );
+		it( 'should not create an object for non-pure objects', () => {
+			function SomeClass() {}
 
-	it( 'should not create an object for non-pure objects', () => {
-		function SomeClass() {}
+			config.define( 'date', new Date() );
+			config.define( {
+				instance: new SomeClass()
+			} );
 
-		config.define( 'date', new Date() );
-		config.define( {
-			instance: new SomeClass()
+			expect( config.get( 'date' ) ).to.be.an.instanceof( Date );
+			expect( config.get( 'instance' ) ).to.be.an.instanceof( SomeClass );
 		} );
-
-		expect( config.get( 'date' ) ).to.be.an.instanceof( Date );
-		expect( config.get( 'instance' ) ).to.be.an.instanceof( SomeClass );
 	} );
-} );
 
-describe( 'get', () => {
-	it( 'should retrieve a configuration', () => {
-		expect( config.get( 'creator' ) ).to.equal( 'inline' );
-	} );
+	describe( 'get', () => {
+		it( 'should retrieve a configuration', () => {
+			expect( config.get( 'creator' ) ).to.equal( 'inline' );
+		} );
 
-	it( 'should retrieve a deep configuration', () => {
-		expect( config.get( 'resize.minHeight' ) ).to.equal( 300 );
-		expect( config.get( 'resize.icon.path' ) ).to.equal( 'xyz' );
-	} );
+		it( 'should retrieve a deep configuration', () => {
+			expect( config.get( 'resize.minHeight' ) ).to.equal( 300 );
+			expect( config.get( 'resize.icon.path' ) ).to.equal( 'xyz' );
+		} );
 
-	it( 'should retrieve a object of the configuration', () => {
-		let resize = config.get( 'resize' );
+		it( 'should retrieve a object of the configuration', () => {
+			let resize = config.get( 'resize' );
 
-		expect( resize ).to.be.an( 'object' );
-		expect( resize.minHeight ).equal( 300 );
-		expect( resize.maxHeight ).to.equal( 800 );
-		expect( resize.icon ).to.be.an( 'object' );
+			expect( resize ).to.be.an( 'object' );
+			expect( resize.minHeight ).equal( 300 );
+			expect( resize.maxHeight ).to.equal( 800 );
+			expect( resize.icon ).to.be.an( 'object' );
 
-		expect( resize.icon ).to.be.an( 'object' );
-	} );
+			expect( resize.icon ).to.be.an( 'object' );
+		} );
 
-	it( 'should not retrieve values case-insensitively', () => {
-		expect( config.get( 'Creator' ) ).to.be.undefined;
-		expect( config.get( 'resize.MINHEIGHT' ) ).to.be.undefined;
-	} );
+		it( 'should not retrieve values case-insensitively', () => {
+			expect( config.get( 'Creator' ) ).to.be.undefined;
+			expect( config.get( 'resize.MINHEIGHT' ) ).to.be.undefined;
+		} );
 
-	it( 'should return undefined for non existing configuration', () => {
-		expect( config.get( 'invalid' ) ).to.be.undefined;
-	} );
+		it( 'should return undefined for non existing configuration', () => {
+			expect( config.get( 'invalid' ) ).to.be.undefined;
+		} );
 
-	it( 'should return undefined for empty configuration', () => {
-		config = new Config();
+		it( 'should return undefined for empty configuration', () => {
+			config = new Config();
 
-		expect( config.get( 'invalid' ) ).to.be.undefined;
-		expect( config.get( 'deep.invalid' ) ).to.be.undefined;
-	} );
+			expect( config.get( 'invalid' ) ).to.be.undefined;
+			expect( config.get( 'deep.invalid' ) ).to.be.undefined;
+		} );
 
-	it( 'should return undefined for non existing deep configuration', () => {
-		expect( config.get( 'resize.invalid.value' ) ).to.be.undefined;
-	} );
+		it( 'should return undefined for non existing deep configuration', () => {
+			expect( config.get( 'resize.invalid.value' ) ).to.be.undefined;
+		} );
 
-	it( 'should not be possible to retrieve value directly from config object', () => {
-		expect( config.creator ).to.be.undefined;
-		expect( () => {
-			config.resize.maxHeight;
-		} ).to.throw();
+		it( 'should not be possible to retrieve value directly from config object', () => {
+			expect( config.creator ).to.be.undefined;
+			expect( () => {
+				config.resize.maxHeight;
+			} ).to.throw();
+		} );
 	} );
 } );

Fichier diff supprimé car celui-ci est trop grand
+ 819 - 817
packages/ckeditor5-utils/tests/emittermixin.js


+ 29 - 27
packages/ckeditor5-utils/tests/log.js

@@ -7,42 +7,44 @@
 
 import log from 'ckeditor5/utils/log.js';
 
-let spy;
+describe( 'log', () => {
+	let spy;
 
-beforeEach( () => {
-	if ( spy ) {
-		spy.restore();
-	}
-} );
+	beforeEach( () => {
+		if ( spy ) {
+			spy.restore();
+		}
+	} );
 
-describe( 'warn()', () => {
-	it( 'logs the message to the console using console.warn()', () => {
-		let spy = sinon.stub( console, 'warn' );
-		let data = { bar: 1 };
+	describe( 'warn()', () => {
+		it( 'logs the message to the console using console.warn()', () => {
+			let spy = sinon.stub( console, 'warn' );
+			let data = { bar: 1 };
 
-		log.warn( 'foo', data );
+			log.warn( 'foo', data );
 
-		sinon.assert.calledOnce( spy );
-		sinon.assert.calledWith( spy, 'foo', data );
+			sinon.assert.calledOnce( spy );
+			sinon.assert.calledWith( spy, 'foo', data );
 
-		log.warn( 'bar' );
-		sinon.assert.calledTwice( spy );
-		sinon.assert.calledWith( spy, 'bar' );
+			log.warn( 'bar' );
+			sinon.assert.calledTwice( spy );
+			sinon.assert.calledWith( spy, 'bar' );
+		} );
 	} );
-} );
 
-describe( 'error()', () => {
-	it( 'logs the message to the console using console.error()', () => {
-		let spy = sinon.stub( console, 'error' );
-		let data = { bar: 1 };
+	describe( 'error()', () => {
+		it( 'logs the message to the console using console.error()', () => {
+			let spy = sinon.stub( console, 'error' );
+			let data = { bar: 1 };
 
-		log.error( 'foo', data );
+			log.error( 'foo', data );
 
-		sinon.assert.calledOnce( spy );
-		sinon.assert.calledWith( spy, 'foo', data );
+			sinon.assert.calledOnce( spy );
+			sinon.assert.calledWith( spy, 'foo', data );
 
-		log.error( 'bar' );
-		sinon.assert.calledTwice( spy );
-		sinon.assert.calledWith( spy, 'bar' );
+			log.error( 'bar' );
+			sinon.assert.calledTwice( spy );
+			sinon.assert.calledWith( spy, 'bar' );
+		} );
 	} );
 } );