Skip to content

Commit

Permalink
Merge pull request #4504 from ckeditor/t/4499
Browse files Browse the repository at this point in the history
Remove duplicated test, add IE ignore
  • Loading branch information
f1ames authored Jan 21, 2021
2 parents 6ab1e0b + 8ab3d7e commit 87c1c99
Showing 1 changed file with 4 additions and 21 deletions.
25 changes: 4 additions & 21 deletions tests/plugins/ajax/ajax.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,27 +102,6 @@
assert.isNull( data );
},

test_loadXml_async: function() {
if ( CKEDITOR.env.ie && CKEDITOR.env.version > 9 ) {
assert.ignore();
}

var callback = function( data ) {
resume( function() {
assert.isInstanceOf( CKEDITOR.xml, data );
assert.isNotNull( data.selectSingleNode( '//list/item' ), 'The loaded data doesn\'t match (null)' );
assert.isNotUndefined( data.selectSingleNode( '//list/item' ), 'The loaded data doesn\'t match (undefined)' );
} );
};

// Defer loading file, because in some cases on IE7 it's done synchronously, so resume() is called before wait().
setTimeout( function() {
CKEDITOR.ajax.loadXml( '../../_assets/sample.xml', callback );
} );

wait();
},

test_loadXml_async_404: function() {
var callback = function( data ) {
resume( function() {
Expand Down Expand Up @@ -205,6 +184,10 @@

// (#1134)
'test load async xml': function() {
if ( CKEDITOR.env.ie && CKEDITOR.env.version > 9 ) {
assert.ignore();
}

setTimeout( function() {
CKEDITOR.ajax.loadXml( '../../_assets/sample.xml', callback );
}, 0 );
Expand Down

0 comments on commit 87c1c99

Please sign in to comment.