Merge branch 't/12295' into major

ckeditor · Sep 8, 2014 · 409e8d5 · 409e8d5
2 parents 87be663 + 4fe909b
commit 409e8d5
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/tests/plugins/mathjax/mathjax-mock.js b/tests/plugins/mathjax/mathjax-mock.js
@@ -81,10 +81,16 @@
 			'test conflict with iframe plugin': function() {
 				var editor = editors[ 'with_iframe' ];
 
+				editor.on( 'afterPaste', function() {
+					resume( function() {
+						assert.areSame( 2, editor.document.getElementsByTag( 'iframe' ).count(), 'There should be two iFrames.' );
+					} );
+				} );
+
 				editor.focus();
 				bender.tools.emulatePaste( editor, editor.document.getElementsByTag( 'p' ).getItem( 0 ).$.innerHTML );
 
-				assert.areSame( 2, editor.document.getElementsByTag( 'iframe' ).count(), 'There should be two iFrames.' );
+				wait();
 			},
 
 			'test not a widget': function() {