소스 검색

Wait for editor destroy in tests.

Maciej Gołaszewski 6 년 전
부모
커밋
0d6eb8889b

+ 4 - 7
packages/ckeditor5-core/tests/_utils-tests/articlepluginset.js

@@ -29,18 +29,15 @@ import normalizeHtml from '@ckeditor/ckeditor5-utils/tests/_utils/normalizehtml'
 describe( 'ArticlePluginSet', () => {
 	let editor, editorElement;
 
-	beforeEach( () => {
+	beforeEach( async () => {
 		editorElement = document.createElement( 'div' );
 		document.body.appendChild( editorElement );
 
-		return ClassicTestEditor.create( editorElement, { plugins: [ ArticlePluginSet ] } )
-			.then( newEditor => {
-				editor = newEditor;
-			} );
+		editor = await ClassicTestEditor.create( editorElement, { plugins: [ ArticlePluginSet ] } );
 	} );
 
-	afterEach( () => {
-		editor.destroy();
+	afterEach( async () => {
+		await editor.destroy();
 
 		editorElement.remove();
 	} );

+ 3 - 2
packages/ckeditor5-core/tests/editor/utils/dataapimixin.js

@@ -22,10 +22,11 @@ describe( 'DataApiMixin', () => {
 		editor.model.document.createRoot( '$root', 'main' );
 		editor.model.document.createRoot( '$root', 'secondRoot' );
 		editor.model.schema.extend( '$text', { allowIn: '$root' } );
+		editor.fire( 'ready' );
 	} );
 
-	afterEach( () => {
-		editor.destroy();
+	afterEach( async () => {
+		await editor.destroy();
 	} );
 
 	describe( 'setData()', () => {

+ 6 - 3
packages/ckeditor5-core/tests/editor/utils/elementapimixin.js

@@ -15,17 +15,20 @@ describe( 'ElementApiMixin', () => {
 	let editor;
 
 	beforeEach( () => {
-		class CustomEditor extends Editor {}
+		class CustomEditor extends Editor {
+		}
+
 		mix( CustomEditor, ElementApiMixin );
 
 		editor = new CustomEditor();
 		editor.data.processor = new HtmlDataProcessor();
 		editor.model.document.createRoot();
 		editor.model.schema.extend( '$text', { allowIn: '$root' } );
+		editor.fire( 'ready' );
 	} );
 
-	afterEach( () => {
-		editor.destroy();
+	afterEach( async () => {
+		await editor.destroy();
 	} );
 
 	describe( 'updateSourceElement()', () => {