From: Timo Tijhof <krinklemail@gmail.com>
Date: Sat, 24 Mar 2018 04:17:42 +0000 (-0700)
Subject: mediawiki.api.upload: Fix test assumption about <iframe>
X-Git-Tag: 1.31.0-rc.0~274^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22brouteur%22%2C%28%24id_rubrique%20?a=commitdiff_plain;h=80791024f1c3e16f8d555734809cc8c522e6ffcf;p=lhc%2Fweb%2Fwiklou.git

mediawiki.api.upload: Fix test assumption about <iframe>

This test failed when another iframe exists before the one added
during the test, because it uses $('iframe').prop() to access the
property, which, if matching multiple iframes, will use the first
one on the page.

Make it slightly less bad, by specifying that it should use the
last one instead, given we know that mediawiki/api/upload.js appends
to document.body.

Really, though, it should have a more reliable method of obtaining
the references to these nodes.

Change-Id: I0f0723668fa3366fb8228a7a3e8a4cb03ff87d27
---

diff --git a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.upload.test.js b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.upload.test.js
index bfaf7f268a..788a427e72 100644
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.upload.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.upload.test.js
@@ -19,15 +19,15 @@
 
 		api.uploadWithIframe( $( '<input>' )[ 0 ], { filename: 'Testing API upload.jpg' } );
 
-		$iframe = $( 'iframe' );
+		$iframe = $( 'iframe:last-child' );
 		$form = $( 'form.mw-api-upload-form' );
 		$input = $form.find( 'input[name=filename]' );
 
-		assert.ok( $form.length > 0 );
-		assert.ok( $input.length > 0 );
-		assert.ok( $iframe.length > 0 );
-		assert.strictEqual( $form.prop( 'target' ), $iframe.prop( 'id' ) );
-		assert.strictEqual( $input.val(), 'Testing API upload.jpg' );
+		assert.ok( $form.length > 0, 'form' );
+		assert.ok( $input.length > 0, 'input' );
+		assert.ok( $iframe.length > 0, 'frame' );
+		assert.strictEqual( $form.prop( 'target' ), $iframe.prop( 'id' ), 'form.target and frame.id ' );
+		assert.strictEqual( $input.val(), 'Testing API upload.jpg', 'input value' );
 	} );
 
 }( mediaWiki, jQuery ) );