ソースを参照

Upgraded tests to the latest Chai and Sinon version.

Kamil Piechaczek 8 年 前
コミット
f35cf1cf12

+ 1 - 3
packages/ckeditor5-engine/tests/dev-utils/view.js

@@ -611,9 +611,7 @@ describe( 'view test utils', () => {
 		} );
 
 		it( 'should throw when wrong type is provided', () => {
-			sinon.stub( XmlDataProcessor.prototype, 'toView', () => {
-				return new ContainerElement( 'invalidType:b' );
-			} );
+			sinon.stub( XmlDataProcessor.prototype, 'toView' ).returns( new ContainerElement( 'invalidType:b' ) );
 
 			expect( () => {
 				parse( 'sth' );

+ 1 - 1
packages/ckeditor5-engine/tests/model/selection.js

@@ -468,7 +468,7 @@ describe( 'Selection', () => {
 			const startPos = Position.createAt( root, 1 );
 			const endPos = Position.createAt( root, 2 );
 			const newEndPos = Position.createAt( root, 4 );
-			const spy = testUtils.sinon.stub( Position, 'createAt', () => newEndPos );
+			const spy = testUtils.sinon.stub( Position, 'createAt' ).returns( newEndPos );
 
 			selection.addRange( new Range( startPos, endPos ) );
 

+ 1 - 2
packages/ckeditor5-engine/tests/view/domconverter/binding.js

@@ -277,7 +277,7 @@ describe( 'DomConverter', () => {
 
 		it( 'should bind DOM element to selection', () => {
 			const bindSelection = converter.fakeSelectionToView( domEl );
-			expect( bindSelection ).to.be.defined;
+			expect( bindSelection ).to.not.be.undefined;
 			expect( bindSelection.isEqual( selection ) ).to.be.true;
 		} );
 
@@ -287,7 +287,6 @@ describe( 'DomConverter', () => {
 			selection.addRange( ViewRange.createIn( new ViewElement() ), true );
 			const bindSelection = converter.fakeSelectionToView( domEl );
 
-			expect( bindSelection ).to.be.defined;
 			expect( bindSelection ).to.not.equal( selection );
 			expect( bindSelection.isEqual( selection ) ).to.be.false;
 			expect( bindSelection.isEqual( selectionCopy ) ).to.be.true;

+ 2 - 2
packages/ckeditor5-engine/tests/view/domconverter/uielement.js

@@ -47,8 +47,8 @@ describe( 'DOMConverter UIElement integration', () => {
 			const domSpan = domElement.childNodes[ 0 ];
 
 			expect( converter.mapDomToView( domElement ) ).to.equal( myElement );
-			expect( converter.mapDomToView( domSpan ) ).to.be.falsy;
-			expect( converter.mapDomToView( domSpan.childNodes[ 0 ] ) ).to.be.falsy;
+			expect( converter.mapDomToView( domSpan ) ).to.be.false;
+			expect( converter.mapDomToView( domSpan.childNodes[ 0 ] ) ).to.be.false;
 		} );
 	} );
 

+ 4 - 2
packages/ckeditor5-engine/tests/view/observer/selectionobserver.js

@@ -162,7 +162,7 @@ describe( 'SelectionObserver', () => {
 		viewDocument.selection.addRange( ViewRange.createFromParentsAndOffsets( viewFoo, 0, viewFoo, 0 ) );
 
 		return new Promise( ( resolve, reject ) => {
-			testUtils.sinon.stub( log, 'warn', msg => {
+			testUtils.sinon.stub( log, 'warn' ).callsFake( msg => {
 				expect( msg ).to.match( /^selectionchange-infinite-loop/ );
 
 				resolve();
@@ -197,7 +197,9 @@ describe( 'SelectionObserver', () => {
 	} );
 
 	it( 'should not be treated as an infinite loop if changes are not often', () => {
-		const clock = testUtils.sinon.useFakeTimers( 'setInterval', 'clearInterval' );
+		const clock = testUtils.sinon.useFakeTimers( {
+			toFake: [ 'setInterval', 'clearInterval' ]
+		} );
 		const stub = testUtils.sinon.stub( log, 'warn' );
 
 		// We need to recreate SelectionObserver, so it will use mocked setInterval.

+ 1 - 1
packages/ckeditor5-engine/tests/view/renderer.js

@@ -1438,7 +1438,7 @@ describe( 'Renderer', () => {
 				const container = domRoot.childNodes[ 1 ];
 
 				const bindSelection = renderer.domConverter.fakeSelectionToView( container );
-				expect( bindSelection ).to.be.defined;
+				expect( bindSelection ).to.not.be.undefined;
 				expect( bindSelection.isEqual( selection ) ).to.be.true;
 			} );
 

+ 1 - 1
packages/ckeditor5-engine/tests/view/selection.js

@@ -241,7 +241,7 @@ describe( 'Selection', () => {
 			const endPos = Position.createAt( el, 2 );
 			const newEndPos = Position.createAt( el, 4 );
 
-			const spy = sinon.stub( Position, 'createAt', () => newEndPos );
+			const spy = sinon.stub( Position, 'createAt' ).returns( newEndPos );
 
 			selection.addRange( new Range( startPos, endPos ) );
 			selection.setFocus( el, 'end' );