Merge 2bd48b5 into cc88556

ckeditor · Mar 8, 2021 · 381a7a0 · 381a7a0
2 parents cc88556 + 2bd48b5
commit 381a7a0
Show file tree

Hide file tree

Showing 4 changed files with 610 additions and 410 deletions.
diff --git a/src/ckeditor.jsx b/src/ckeditor.jsx
@@ -159,6 +159,12 @@ export default class CKEditor extends React.Component {
 	 * Destroys the editor by destroying the watchdog.
 	 */
 	_destroyEditor() {
+		// It may happen during the tests that the watchdog instance is not assigned before destroying itself. See: #197.
+		/* istanbul ignore next */
+		if ( !this.watchdog ) {
+			return;
+		}
+
 		this.watchdog.destroy();
 		this.watchdog = null;
 	}

diff --git a/tests/39/1.jsx → tests/integrations/39-frozen browser.jsx b/tests/39/1.jsx → tests/integrations/39-frozen browser.jsx
diff --git a/webpack.config.js b/webpack.config.js
@@ -64,7 +64,7 @@ module.exports = {
 				test: /\.jsx$/,
 				loader: 'babel-loader',
 				exclude: /node_modules/,
-				query: {
+				options: {
 					compact: false,
 					presets: [ '@babel/preset-react' ]
 				}