Refactored balloon toolbar manual tests.

ckeditor · Apr 10, 2019 · 773676c · 773676c
1 parent 7df4b59
commit 773676c
Show file tree

Hide file tree

Showing 22 changed files with 29 additions and 57 deletions.
diff --git a/tests/plugins/balloontoolbar/context/manual/complex.html b/tests/plugins/balloontoolbar/context/manual/complex.html
@@ -23,9 +23,7 @@
 </div>
 
 <script>
-	if ( CKEDITOR.env.ie && CKEDITOR.env.version === 8 ) {
-		bender.ignore();
-	}
+	bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
 
 	CKEDITOR.disableAutoInline = true;
 

diff --git a/tests/plugins/balloontoolbar/context/manual/context.html b/tests/plugins/balloontoolbar/context/manual/context.html
@@ -21,9 +21,7 @@
 </div>
 
 <script>
-	if ( CKEDITOR.env.ie && CKEDITOR.env.version === 8 ) {
-		bender.ignore();
-	}
+	bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
 
 	CKEDITOR.disableAutoInline = true;
 

diff --git a/tests/plugins/balloontoolbar/context/manual/focusablebuttons.html b/tests/plugins/balloontoolbar/context/manual/focusablebuttons.html
@@ -20,10 +20,7 @@ <h2>Inline editor</h2>
 </div>
 
 <script>
-	// Ignore on mobiles due to 'mousedown' event.
-	if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 || bender.tools.env.mobile ) {
-		bender.ignore();
-	}
+	bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
 
 	CKEDITOR.on( 'instanceReady', function( evt ) {
 		evt.editor.balloonToolbars.create( {

diff --git a/tests/plugins/balloontoolbar/context/manual/imgselect.html b/tests/plugins/balloontoolbar/context/manual/imgselect.html
@@ -11,9 +11,7 @@
 </div>
 
 <script>
-	if ( CKEDITOR.env.ie && CKEDITOR.env.version === 8 ) {
-		bender.ignore();
-	}
+	bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
 
 	CKEDITOR.disableAutoInline = true;
 

diff --git a/tests/plugins/balloontoolbar/context/manual/toolbar.html b/tests/plugins/balloontoolbar/context/manual/toolbar.html
@@ -33,9 +33,7 @@
 </style>
 
 <script>
-	if ( CKEDITOR.env.ie && CKEDITOR.env.version === 8 ) {
-		bender.ignore();
-	}
+	bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
 
 	CKEDITOR.disableAutoInline = true;
 

diff --git a/tests/plugins/balloontoolbar/context/manual/widget.html b/tests/plugins/balloontoolbar/context/manual/widget.html
@@ -21,9 +21,7 @@
 </div>
 
 <script>
-	if ( CKEDITOR.env.ie && CKEDITOR.env.version === 8 ) {
-		bender.ignore();
-	}
+	bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
 
 	CKEDITOR.disableAutoInline = true;
 

diff --git a/tests/plugins/balloontoolbar/context/manual/widgetdnd.html b/tests/plugins/balloontoolbar/context/manual/widgetdnd.html
@@ -26,10 +26,12 @@
 
 <script>
 	// Ignore on mobiles due to lack of support for widgets drag and drop.
-	if ( CKEDITOR.env.ie && CKEDITOR.env.version === 8 || bender.tools.env.mobile ) {
+	if ( bender.tools.env.mobile ) {
 		bender.ignore();
 	}
 
+	bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
+
 	CKEDITOR.disableAutoInline = true;
 
 	CKEDITOR.skin.addIcon( 'testcommandButton', '%BASE_PATH%_assets/test_icon.png' );

diff --git a/tests/plugins/balloontoolbar/manual/balloontoolbar.html b/tests/plugins/balloontoolbar/manual/balloontoolbar.html
@@ -11,9 +11,7 @@
 </div>
 <script>
 	// Currently balloon toolbar is not integrated with old IE browsers.
-	if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 ) {
-		bender.ignore();
-	}
+bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
 
 	CKEDITOR.disableAutoInline = true;
 

diff --git a/tests/plugins/balloontoolbar/manual/contextapi.html b/tests/plugins/balloontoolbar/manual/contextapi.html
@@ -1,11 +1,12 @@
 <textarea id="editor1" cols="10" rows="10"></textarea>
 <script>
-	// Currently balloon toolbar is not integrated with old IE browsers.
 	// Ignore on mobiles due to browser dev console requirement.
-	if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 || bender.tools.env.mobile ) {
+	if ( bender.tools.env.mobile ) {
 		bender.ignore();
 	}
 
+	bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
+
 	CKEDITOR.plugins.add( 'testplugin', {
 		requires: 'balloontoolbar',
 		init: function( editor ) {

diff --git a/tests/plugins/balloontoolbar/manual/destroy.html b/tests/plugins/balloontoolbar/manual/destroy.html
@@ -8,12 +8,13 @@
 	</ul>
 </textarea>
 <script>
-	// Currently balloon toolbar is not integrated with old IE browsers.
 	// Ignore mobiles, as test requires using console.
-	if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 || bender.tools.env.mobile ) {
+	if ( bender.tools.env.mobile ) {
 		bender.ignore();
 	}
 
+	bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
+
 	CKEDITOR.replace( 'editor1', {
 		on: {
 			instanceReady: instanceReadyListener

diff --git a/tests/plugins/balloontoolbar/manual/drag.html b/tests/plugins/balloontoolbar/manual/drag.html
@@ -30,9 +30,7 @@
 
 <script>
 	// Currently balloon toolbar is not integrated with old IE browsers.
-	if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 ) {
-		bender.ignore();
-	}
+	bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
 
 	CKEDITOR.disableAutoInline = true;
 	function instanceReadyListener( evt ) {

diff --git a/tests/plugins/balloontoolbar/manual/fallbackstyles.html b/tests/plugins/balloontoolbar/manual/fallbackstyles.html
@@ -30,9 +30,7 @@
 </div>
 
 <script>
-	if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 ) {
-		bender.ignore();
-	}
+	bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
 	function instanceReadyListener( evt ) {
 		var images = this.editable().find( 'img' ).toArray(),
 			panel = new CKEDITOR.ui.balloonToolbar( this );

diff --git a/tests/plugins/balloontoolbar/manual/focus.html b/tests/plugins/balloontoolbar/manual/focus.html
@@ -35,9 +35,7 @@
 
 <script>
 	// Currently balloon toolbar is not integrated with old IE browsers.
-	if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 ) {
-		bender.ignore();
-	}
+	bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
 
 	CKEDITOR.disableAutoInline = true;
 	function instanceReadyListener( evt ) {

diff --git a/tests/plugins/balloontoolbar/manual/kama.html b/tests/plugins/balloontoolbar/manual/kama.html
@@ -30,9 +30,7 @@
 
 <script>
 	// Currently balloon toolbar is not integrated with old IE browsers.
-	if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 ) {
-		bender.ignore();
-	}
+	bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
 	CKEDITOR.disableAutoInline = true;
 
 	function instanceReadyListener( evt ) {

diff --git a/tests/plugins/balloontoolbar/manual/moono-lisa.html b/tests/plugins/balloontoolbar/manual/moono-lisa.html
@@ -30,9 +30,7 @@
 
 <script>
 	// Currently balloon toolbar is not integrated with old IE browsers.
-	if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 ) {
-		bender.ignore();
-	}
+	bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
 	CKEDITOR.disableAutoInline = true;
 
 	function instanceReadyListener( evt ) {

diff --git a/tests/plugins/balloontoolbar/manual/moono.html b/tests/plugins/balloontoolbar/manual/moono.html
@@ -30,9 +30,7 @@
 
 <script>
 	// Currently balloon toolbar is not integrated with old IE browsers.
-	if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 ) {
-		bender.ignore();
-	}
+	bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
 	CKEDITOR.disableAutoInline = true;
 
 	function instanceReadyListener( evt ) {

diff --git a/tests/plugins/balloontoolbar/manual/moonolisaflickering.html b/tests/plugins/balloontoolbar/manual/moonolisaflickering.html
@@ -4,9 +4,7 @@
 
 <script>
 	// Currently balloon toolbar is not integrated with old IE browsers.
-	if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 ) {
-		bender.ignore();
-	}
+	bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
 
 	function instanceReadyListener( evt ) {
 		var image = this.editable().findOne( 'img' ),

diff --git a/tests/plugins/balloontoolbar/manual/positioning.html b/tests/plugins/balloontoolbar/manual/positioning.html
@@ -13,6 +13,7 @@
 <p class="spacer"></p>
 
 <script>
+	bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
 	CKEDITOR.replace( 'editor', {
 		extraAllowedContent: 'span;p{margin}',
 		plugins: 'toolbar,wysiwygarea,basicstyles,balloontoolbar',

diff --git a/tests/plugins/balloontoolbar/manual/refreshposition.html b/tests/plugins/balloontoolbar/manual/refreshposition.html
@@ -17,9 +17,7 @@
 </div>
 
 <script>
-	if ( CKEDITOR.env.ie && CKEDITOR.env.version === 8 ) {
-		bender.ignore();
-	}
+	bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
 
 	CKEDITOR.disableAutoInline = true;
 

diff --git a/tests/plugins/balloontoolbar/manual/reposition.html b/tests/plugins/balloontoolbar/manual/reposition.html
@@ -23,6 +23,8 @@
 </form>
 
 <script>
+	bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
+
 	CKEDITOR.addCss( '.square{background:indianred;position:absolute}' );
 
 	editor = CKEDITOR.replace( 'editor', {

diff --git a/tests/plugins/balloontoolbar/manual/skinpath.html b/tests/plugins/balloontoolbar/manual/skinpath.html
@@ -5,9 +5,7 @@
 
 <script>
 	// Currently balloon toolbar is not integrated with old IE browsers.
-	if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 ) {
-		bender.ignore();
-	}
+	bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
 
 	CKEDITOR.disableAutoInline = true;
 

diff --git a/tests/plugins/balloontoolbar/manual/windowresize.html b/tests/plugins/balloontoolbar/manual/windowresize.html
@@ -46,9 +46,7 @@ <h2>Divarea</h2>
 </textarea>
 
 <script>
-	if ( CKEDITOR.env.ie && CKEDITOR.env.version === 8 ) {
-		bender.ignore();
-	}
+	bender.tools.ignoreUnsupportedEnvironment( 'balloontoolbar' );
 
 	CKEDITOR.disableAutoInline = true;