Merge pull request #3539 from ckeditor/t/3424

Improve stability of Paste Tools tests with filters
ckeditor · Nov 18, 2019 · 438226e · 438226e
2 parents 422c234 + cc66b69
commit 438226e
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 24 deletions.
diff --git a/tests/plugins/pastefromword/generated/functions.js b/tests/plugins/pastefromword/generated/functions.js
@@ -269,10 +269,8 @@
 
 	ptTools.ignoreTestsOnMobiles( tests );
 
-	ptTools.loadFilters( [
+	ptTools.testWithFilters( tests, [
 		CKEDITOR.getUrl( CKEDITOR.plugins.getPath( 'pastetools' ) + 'filter/common.js' ),
 		CKEDITOR.getUrl( CKEDITOR.plugins.getPath( 'pastefromword' ) + 'filter/default.js' )
-	], function() {
-		bender.test( tests );
-	} );
+	] );
 } )();
diff --git a/tests/plugins/pastefromword/generated/heuristics.js b/tests/plugins/pastefromword/generated/heuristics.js
@@ -96,10 +96,8 @@
 
 	ptTools.ignoreTestsOnMobiles( tests );
 
-	ptTools.loadFilters( [
+	ptTools.testWithFilters( tests, [
 		CKEDITOR.getUrl( CKEDITOR.plugins.getPath( 'pastetools' ) + 'filter/common.js' ),
 		CKEDITOR.getUrl( CKEDITOR.plugins.getPath( 'pastefromword' ) + 'filter/default.js' )
-	], function() {
-		bender.test( tests );
-	} );
+	] );
 } )();
diff --git a/tests/plugins/pastefromword/helpers.js b/tests/plugins/pastefromword/helpers.js
@@ -73,10 +73,8 @@
 
 	ptTools.ignoreTestsOnMobiles( tests );
 
-	ptTools.loadFilters( [
+	ptTools.testWithFilters( tests, [
 		CKEDITOR.getUrl( CKEDITOR.plugins.getPath( 'pastetools' ) + 'filter/common.js' ),
 		CKEDITOR.getUrl( CKEDITOR.plugins.getPath( 'pastefromword' ) + 'filter/default.js' )
-	], function() {
-		bender.test( tests );
-	} );
+	] );
 } )();
diff --git a/tests/plugins/pastefromword/pasteimage.js b/tests/plugins/pastefromword/pasteimage.js
@@ -25,7 +25,7 @@
 
 	ptTools.ignoreTestsOnMobiles( tests );
 
-	ptTools.loadFilters( [
+	ptTools.testWithFilters( tests, [
 		CKEDITOR.getUrl( CKEDITOR.plugins.getPath( 'pastetools' ) + 'filter/common.js' ),
 		CKEDITOR.getUrl( CKEDITOR.plugins.getPath( 'pastefromword' ) + 'filter/default.js' )
 	], function() {

diff --git a/tests/plugins/pastetools/_helpers/ptTools.js b/tests/plugins/pastetools/_helpers/ptTools.js
@@ -29,6 +29,20 @@
 					} );
 				}( filters[ i ] ) );
 			}
+		},
+
+		testWithFilters: function( tests, filters, callback ) {
+			this.loadFilters( filters, function() {
+				tests[ 'async:init' ] = function() {
+					if ( callback ) {
+						callback( this );
+					}
+
+					this.callback();
+				};
+
+				bender.test( tests );
+			} );
 		}
 	};
 } )();

diff --git a/tests/plugins/pastetools/filter/functions.js b/tests/plugins/pastetools/filter/functions.js
@@ -22,10 +22,6 @@
 		filterMock = new CKEDITOR.htmlParser.filter(),
 
 		tests = {
-			setUp: function(  ) {
-				this.commonFilter = CKEDITOR.plugins.pastetools.filters.common;
-			},
-
 			'test create style stack': function() {
 				var element = new CKEDITOR.htmlParser.element( 'p' );
 
@@ -97,10 +93,10 @@
 
 	ptTools.ignoreTestsOnMobiles( tests );
 
-	ptTools.loadFilters( [
+	ptTools.testWithFilters( tests, [
 		CKEDITOR.getUrl( CKEDITOR.plugins.getPath( 'pastetools' ) + 'filter/common.js' ),
 		CKEDITOR.getUrl( CKEDITOR.plugins.getPath( 'pastefromword' ) + 'filter/default.js' )
-	], function() {
-		bender.test( tests );
+	], function( testCase ) {
+		testCase.commonFilter = CKEDITOR.plugins.pastetools.filters.common;
 	} );
 } )();
diff --git a/tests/plugins/pastetools/filter/parsestyles.js b/tests/plugins/pastetools/filter/parsestyles.js
@@ -109,10 +109,8 @@
 
 	ptTools.ignoreTestsOnMobiles( tests );
 
-	ptTools.loadFilters( [
+	ptTools.testWithFilters( tests, [
 		CKEDITOR.getUrl( CKEDITOR.plugins.getPath( 'pastetools' ) + 'filter/common.js' ),
 		CKEDITOR.getUrl( CKEDITOR.plugins.getPath( 'pastefromword' ) + 'filter/default.js' )
-	], function() {
-		bender.test( tests );
-	} );
+	] );
 } )();