Merge pull request #17136 from ckeditor/ck/improve-ci/add-missing-des…

…troy

Tests: Add missing `editor.destroy` calls to tests.
Tests: Add await to some `editor.destroy` calls.

packages/ckeditor5-alignment/tests/alignmentcommand.js

@@ -28,8 +28,8 @@ describe( 'AlignmentCommand', () => {
 			} );
 	} );
 
-	afterEach( () => {
-		editor.destroy();
+	afterEach( async () => {
+		await editor.destroy();
 	} );
 
 	it( 'is a command', () => {

packages/ckeditor5-alignment/tests/alignmentediting.js

@@ -25,8 +25,8 @@ describe( 'AlignmentEditing', () => {
 		model = editor.model;
 	} );
 
-	afterEach( () => {
-		editor.destroy();
+	afterEach( async () => {
+		await editor.destroy();
 	} );
 
 	it( 'should have pluginName', () => {
@@ -57,6 +57,10 @@ describe( 'AlignmentEditing', () => {
 			model = editor.model;
 		} );
 
+		afterEach( async () => {
+			await editor.destroy();
+		} );
+
 		it( 'is allowed on paragraph', () => {
 			expect( model.schema.checkAttribute( [ '$root', 'paragraph' ], 'alignment' ) ).to.be.true;
 		} );

packages/ckeditor5-autoformat/tests/autoformat.js

@@ -1182,6 +1182,10 @@ describe( 'Autoformat', () => {
 					} );
 			} );
 
+			afterEach( async () => {
+				await editor.destroy();
+			} );
+
 			it( 'should not replace asterisk with bulleted list item', () => {
 				setData( model, '<paragraph>*[]</paragraph>' );
 				insertSpace();
@@ -1308,6 +1312,8 @@ describe( 'Autoformat', () => {
 						insertSpace();
 
 						expect( getData( model ) ).to.equal( '<paragraph>## []</paragraph>' );
+
+						return editor.destroy();
 					} );
 			} );
 		} );
@@ -2401,6 +2407,10 @@ describe( 'Autoformat', () => {
 					} );
 			} );
 
+			afterEach( async () => {
+				await editor.destroy();
+			} );
+
 			it( 'should not replace asterisk with bulleted list item', () => {
 				setData( model, '<paragraph>*[]</paragraph>' );
 				insertSpace();
@@ -2528,6 +2538,8 @@ describe( 'Autoformat', () => {
 						insertSpace();
 
 						expect( getData( model ) ).to.equal( '<paragraph>## []</paragraph>' );
+
+						return editor.destroy();
 					} );
 			} );
 		} );

packages/ckeditor5-autoformat/tests/blockautoformatediting.js

@@ -30,6 +30,10 @@ describe( 'blockAutoformatEditing', () => {
 			} );
 	} );
 
+	afterEach( async () => {
+		await editor.destroy();
+	} );
+
 	describe( 'command name', () => {
 		it( 'should run a command when the pattern is matched', () => {
 			const spy = testUtils.sinon.spy();

packages/ckeditor5-autoformat/tests/inlineautoformatediting.js

@@ -33,6 +33,10 @@ describe( 'inlineAutoformatEditing', () => {
 			} );
 	} );
 
+	afterEach( async () => {
+		await editor.destroy();
+	} );
+
 	describe( 'regExp', () => {
 		it( 'should not call the formatCallback if there are less than 3 capture groups', () => {
 			inlineAutoformatEditing( editor, plugin, /(\*)(.+?)\*/g, formatSpy );

packages/ckeditor5-block-quote/tests/blockquotecommand.js

@@ -44,8 +44,8 @@ describe( 'BlockQuoteCommand', () => {
 			} );
 	} );
 
-	afterEach( () => {
-		editor.destroy();
+	afterEach( async () => {
+		await editor.destroy();
 	} );
 
 	it( 'is a command', () => {

packages/ckeditor5-block-quote/tests/blockquoteediting.js

@@ -88,6 +88,8 @@ describe( 'BlockQuoteEditing', () => {
 				editor.setData( '<blockquote><ul><li>xx</li></ul></blockquote>' );
 
 				expect( editor.getData() ).to.equal( '<blockquote><ul><li>xx</li></ul></blockquote>' );
+
+				return editor.destroy();
 			} );
 	} );
 

packages/ckeditor5-ckbox/tests/ckboxediting.js

@@ -1870,6 +1870,8 @@ describe( 'CKBoxEditing', () => {
 
 			expect( uploadImageCommand.isEnabled ).to.be.true;
 			expect( uploadImageCommand.isAccessAllowed ).to.be.true;
+
+			await editor.destroy();
 		} );
 
 		it( 'should disable image upload command if access not allowed', async () => {
@@ -1894,6 +1896,8 @@ describe( 'CKBoxEditing', () => {
 
 			expect( uploadImageCommand.isEnabled ).to.be.false;
 			expect( uploadImageCommand.isAccessAllowed ).to.be.false;
+
+			await editor.destroy();
 		} );
 
 		it( 'should not disable image upload command if access allowed ( CKBox loaded first )', async () => {
@@ -1918,6 +1922,8 @@ describe( 'CKBoxEditing', () => {
 
 			expect( uploadImageCommand.isEnabled ).to.be.true;
 			expect( uploadImageCommand.isAccessAllowed ).to.be.true;
+
+			await editor.destroy();
 		} );
 
 		it( 'should disable image upload command if access not allowed ( CKBox loaded first )', async () => {
@@ -1942,6 +1948,8 @@ describe( 'CKBoxEditing', () => {
 
 			expect( uploadImageCommand.isEnabled ).to.be.false;
 			expect( uploadImageCommand.isAccessAllowed ).to.be.false;
+
+			await editor.destroy();
 		} );
 	} );
 } );

packages/ckeditor5-clipboard/tests/clipboardpipeline.js

@@ -45,6 +45,10 @@ describe( 'ClipboardPipeline feature', () => {
 			} );
 	} );
 
+	afterEach( async () => {
+		await editor.destroy();
+	} );
+
 	describe( 'constructor()', () => {
 		it( 'registers ClipboardObserver', () => {
 			expect( view.getObserver( ClipboardObserver ) ).to.be.instanceOf( ClipboardObserver );

packages/ckeditor5-clipboard/tests/pasteplaintext.js

@@ -50,6 +50,10 @@ describe( 'PastePlainText', () => {
 			} );
 	} );
 
+	afterEach( async () => {
+		await editor.destroy();
+	} );
+
 	it( 'should inherit selection attributes (collapsed selection)', () => {
 		let insertedNode;
 

packages/ckeditor5-core/tests/_utils-tests/classictesteditor.js

@@ -38,7 +38,7 @@ describe( 'ClassicTestEditor', () => {
 	} );
 
 	describe( 'constructor()', () => {
-		it( 'creates an instance of editor', () => {
+		it( 'creates an instance of editor', async () => {
 			const editor = new ClassicTestEditor( editorElement, { foo: 1 } );
 
 			expect( editor ).to.be.instanceof( Editor );
@@ -47,28 +47,40 @@ describe( 'ClassicTestEditor', () => {
 			expect( editor.ui ).to.be.instanceOf( EditorUI );
 			expect( editor.ui.view ).to.be.instanceOf( BoxedEditorUIView );
 			expect( editor.data.processor ).to.be.instanceof( HtmlDataProcessor );
+
+			editor.fire( 'ready' );
+			await editor.destroy();
 		} );
 
-		it( 'creates the instance of the editable (without rendering)', () => {
+		it( 'creates the instance of the editable (without rendering)', async () => {
 			const editor = new ClassicTestEditor( editorElement );
 
 			expect( editor.ui.view.editable ).to.be.instanceOf( InlineEditableUIView );
 			expect( editor.ui.view.editable.isRendered ).to.be.false;
+
+			editor.fire( 'ready' );
+			await editor.destroy();
 		} );
 
-		it( 'creates the #ui and ui#view (without rendering)', () => {
+		it( 'creates the #ui and ui#view (without rendering)', async () => {
 			const editor = new ClassicTestEditor( editorElement );
 
 			expect( editor.ui ).to.be.instanceOf( EditorUI );
 			expect( editor.ui.view ).to.be.instanceOf( BoxedEditorUIView );
 			expect( editor.ui.view.isRendered ).to.be.false;
 			expect( editor.ui.getEditableElement() ).to.be.undefined;
+
+			editor.fire( 'ready' );
+			await editor.destroy();
 		} );
 
-		it( 'creates main root element', () => {
+		it( 'creates main root element', async () => {
 			const editor = new ClassicTestEditor( editorElement );
 
 			expect( editor.model.document.getRoot( 'main' ) ).to.instanceof( RootElement );
+
+			editor.fire( 'ready' );
+			await editor.destroy();
 		} );
 
 		it( 'mixes ElementApiMixin', () => {
@@ -152,15 +164,18 @@ describe( 'ClassicTestEditor', () => {
 		} );
 
 		it( 'sets proper states', () => {
-			const editor = new ClassicTestEditor();
+			const baseEditor = new ClassicTestEditor();
 
-			expect( editor.state ).to.equal( 'initializing' );
+			expect( baseEditor.state ).to.equal( 'initializing' );
 
 			return ClassicTestEditor.create( editorElement ).then( editor => {
 				expect( editor.state ).to.equal( 'ready' );
 
 				return editor.destroy().then( () => {
 					expect( editor.state ).to.equal( 'destroyed' );
+
+					baseEditor.fire( 'ready' );
+					return baseEditor.destroy();
 				} );
 			} );
 		} );

packages/ckeditor5-core/tests/_utils-tests/modeltesteditor.js

@@ -18,12 +18,15 @@ describe( 'ModelTestEditor', () => {
 	testUtils.createSinonSandbox();
 
 	describe( 'constructor()', () => {
-		it( 'creates an instance of editor', () => {
+		it( 'creates an instance of editor', async () => {
 			const editor = new ModelTestEditor( { foo: 1 } );
 
 			expect( editor ).to.be.instanceof( Editor );
 			expect( editor.config.get( 'foo' ) ).to.equal( 1 );
 			expect( editor.data.processor ).to.be.instanceof( HtmlDataProcessor );
+
+			editor.fire( 'ready' );
+			await editor.destroy();
 		} );
 
 		it( 'should disable editing pipeline', () => {
@@ -38,10 +41,13 @@ describe( 'ModelTestEditor', () => {
 			} );
 		} );
 
-		it( 'creates main root element', () => {
+		it( 'creates main root element', async () => {
 			const editor = new ModelTestEditor();
 
 			expect( editor.model.document.getRoot( 'main' ) ).to.instanceof( RootElement );
+
+			editor.fire( 'ready' );
+			await editor.destroy();
 		} );
 	} );
 
@@ -57,6 +63,10 @@ describe( 'ModelTestEditor', () => {
 				} );
 		} );
 
+		afterEach( async () => {
+			await editor.destroy();
+		} );
+
 		it( 'should set data of the first root', () => {
 			editor.model.document.createRoot( '$root', 'secondRoot' );
 
@@ -78,6 +88,10 @@ describe( 'ModelTestEditor', () => {
 				} );
 		} );
 
+		afterEach( async () => {
+			await editor.destroy();
+		} );
+
 		it( 'should set data of the first root', () => {
 			setData( editor.model, 'foo' );
 

packages/ckeditor5-core/tests/_utils-tests/virtualtesteditor.js

@@ -16,18 +16,24 @@ describe( 'VirtualTestEditor', () => {
 	testUtils.createSinonSandbox();
 
 	describe( 'constructor()', () => {
-		it( 'creates an instance of editor', () => {
+		it( 'creates an instance of editor', async () => {
 			const editor = new VirtualTestEditor( { foo: 1 } );
 
 			expect( editor ).to.be.instanceof( Editor );
 			expect( editor.data.processor ).to.be.instanceof( HtmlDataProcessor );
 			expect( editor.config.get( 'foo' ) ).to.equal( 1 );
+
+			editor.fire( 'ready' );
+			await editor.destroy();
 		} );
 
-		it( 'creates main root element', () => {
+		it( 'creates main root element', async () => {
 			const editor = new VirtualTestEditor();
 
 			expect( editor.model.document.getRoot( 'main' ) ).to.instanceof( RootElement );
+
+			editor.fire( 'ready' );
+			await editor.destroy();
 		} );
 	} );
 

packages/ckeditor5-core/tests/_utils/memory.js

@@ -6,8 +6,8 @@
 /* global window, document, setTimeout */
 
 const TEST_RETRIES = 2;
-const TEST_TIMEOUT = 5000;
-const GARBAGE_COLLECTOR_TIMEOUT = 500;
+const TEST_TIMEOUT = 6500;
+const GARBAGE_COLLECTOR_TIMEOUT = 800;
 
 /**
  * Memory tests suite definition that:
@@ -83,10 +83,15 @@ function runTest( createEditor ) {
 		} )
 		// Run create&destroy multiple times. Helps scaling up the issue.
 		.then( createAndDestroy ) // #1
+		.then( () => timeout( 300 ) )
 		.then( createAndDestroy ) // #2
+		.then( () => timeout( 300 ) )
 		.then( createAndDestroy ) // #3
+		.then( () => timeout( 300 ) )
 		.then( createAndDestroy ) // #4
+		.then( () => timeout( 300 ) )
 		.then( createAndDestroy ) // #5
+		.then( () => timeout( 300 ) )
 		.then( collectMemoryStats )
 		.then( memory => {
 			const memoryDifference = memory.usedJSHeapSize - memoryAfterFirstStart.usedJSHeapSize;
@@ -164,3 +169,7 @@ function isWindows() {
 
 	return userAgent.indexOf( 'windows' ) > -1;
 }
+
+function timeout( ms ) {
+	return new Promise( resolve => setTimeout( resolve, ms ) );
+}

packages/ckeditor5-core/tests/accessibility.js

@@ -16,7 +16,11 @@ describe( 'Accessibility', () => {
 	} );
 
 	afterEach( async () => {
-		editor.destroy();
+		if ( editor.state === 'initializing' ) {
+			editor.fire( 'ready' );
+		}
+
+		await editor.destroy();
 	} );
 
 	it( 'should provide default categories, groups, and keystrokes', () => {
@@ -95,7 +99,7 @@ describe( 'Accessibility', () => {
 		] );
 	} );
 
-	it( 'should add info specific to the menu bar when available', () => {
+	it( 'should add info specific to the menu bar when available', async () => {
 		const editor = new Editor( {
 			menuBar: {
 				isVisible: true
@@ -111,7 +115,8 @@ describe( 'Accessibility', () => {
 			mayRequireFn: true
 		} );
 
-		editor.destroy();
+		editor.fire( 'ready' );
+		await editor.destroy();
 	} );
 
 	describe( 'addKeystrokeInfoCategory()', () => {