Merge pull request #10 from ckeditor/i/6002

Tests: Fixed tests leaking editor instances / DOM elements. See ckeditor/ckeditor5#6002.
ckeditor · Jan 7, 2020 · 58f7cac · 58f7cac
2 parents 306f6e8 + 090e184
commit 58f7cac
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/tests/specialcharactersarrows.js b/tests/specialcharactersarrows.js
@@ -13,10 +13,10 @@ import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 describe( 'SpecialCharactersArrows', () => {
 	testUtils.createSinonSandbox();
 
-	let addItemsSpy, addItemsFirstCallArgs;
+	let editor, editorElement, addItemsSpy, addItemsFirstCallArgs;
 
 	beforeEach( () => {
-		const editorElement = document.createElement( 'div' );
+		editorElement = document.createElement( 'div' );
 
 		addItemsSpy = sinon.spy( SpecialCharacters.prototype, 'addItems' );
 
@@ -25,13 +25,17 @@ describe( 'SpecialCharactersArrows', () => {
 			.create( editorElement, {
 				plugins: [ SpecialCharacters, SpecialCharactersArrows ]
 			} )
-			.then( () => {
+			.then( newEditor => {
+				editor = newEditor;
 				addItemsFirstCallArgs = addItemsSpy.args[ 0 ];
 			} );
 	} );
 
 	afterEach( () => {
 		addItemsSpy.restore();
+
+		editorElement.remove();
+		return editor.destroy();
 	} );
 
 	it( 'adds new items', () => {

diff --git a/tests/specialcharacterscurrency.js b/tests/specialcharacterscurrency.js
@@ -13,10 +13,10 @@ import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 describe( 'SpecialCharactersCurrency', () => {
 	testUtils.createSinonSandbox();
 
-	let addItemsSpy, addItemsFirstCallArgs;
+	let editor, editorElement, addItemsSpy, addItemsFirstCallArgs;
 
 	beforeEach( () => {
-		const editorElement = document.createElement( 'div' );
+		editorElement = document.createElement( 'div' );
 
 		addItemsSpy = sinon.spy( SpecialCharacters.prototype, 'addItems' );
 
@@ -25,13 +25,17 @@ describe( 'SpecialCharactersCurrency', () => {
 			.create( editorElement, {
 				plugins: [ SpecialCharacters, SpecialCharactersCurrency ]
 			} )
-			.then( () => {
+			.then( newEditor => {
+				editor = newEditor;
 				addItemsFirstCallArgs = addItemsSpy.args[ 0 ];
 			} );
 	} );
 
 	afterEach( () => {
 		addItemsSpy.restore();
+
+		editorElement.remove();
+		return editor.destroy();
 	} );
 
 	it( 'adds new items', () => {

diff --git a/tests/specialcharacterslatin.js b/tests/specialcharacterslatin.js
@@ -13,10 +13,10 @@ import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 describe( 'SpecialCharactersLatin', () => {
 	testUtils.createSinonSandbox();
 
-	let addItemsSpy, addItemsFirstCallArgs;
+	let editor, editorElement, addItemsSpy, addItemsFirstCallArgs;
 
 	beforeEach( () => {
-		const editorElement = document.createElement( 'div' );
+		editorElement = document.createElement( 'div' );
 
 		addItemsSpy = sinon.spy( SpecialCharacters.prototype, 'addItems' );
 
@@ -25,13 +25,17 @@ describe( 'SpecialCharactersLatin', () => {
 			.create( editorElement, {
 				plugins: [ SpecialCharacters, SpecialCharactersLatin ]
 			} )
-			.then( () => {
+			.then( newEditor => {
+				editor = newEditor;
 				addItemsFirstCallArgs = addItemsSpy.args[ 0 ];
 			} );
 	} );
 
 	afterEach( () => {
 		addItemsSpy.restore();
+
+		editorElement.remove();
+		return editor.destroy();
 	} );
 
 	it( 'adds new items', () => {

diff --git a/tests/specialcharacterstext.js b/tests/specialcharacterstext.js
@@ -13,10 +13,10 @@ import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 describe( 'SpecialCharactersText', () => {
 	testUtils.createSinonSandbox();
 
-	let addItemsSpy, addItemsFirstCallArgs;
+	let editor, editorElement, addItemsSpy, addItemsFirstCallArgs;
 
 	beforeEach( () => {
-		const editorElement = document.createElement( 'div' );
+		editorElement = document.createElement( 'div' );
 
 		addItemsSpy = sinon.spy( SpecialCharacters.prototype, 'addItems' );
 
@@ -25,13 +25,17 @@ describe( 'SpecialCharactersText', () => {
 			.create( editorElement, {
 				plugins: [ SpecialCharacters, SpecialCharactersText ]
 			} )
-			.then( () => {
+			.then( newEditor => {
+				editor = newEditor;
 				addItemsFirstCallArgs = addItemsSpy.args[ 0 ];
 			} );
 	} );
 
 	afterEach( () => {
 		addItemsSpy.restore();
+
+		editorElement.remove();
+		return editor.destroy();
 	} );
 
 	it( 'adds new items', () => {