X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FOutputPageTest.php;h=448eec8fd089c84014e9d41a984b18ba674f34d4;hp=5f0067deffae0ca73cb21d927d80bfefc488e1bd;hb=04d1aa3033f40a38d721f7f0e88b5bac440d2869;hpb=78354323c1d1f8d8117a5d5c2955b6a94d08f318

diff --git a/tests/phpunit/includes/OutputPageTest.php b/tests/phpunit/includes/OutputPageTest.php
index 5f0067deff..448eec8fd0 100644
--- a/tests/phpunit/includes/OutputPageTest.php
+++ b/tests/phpunit/includes/OutputPageTest.php
@@ -298,33 +298,6 @@ class OutputPageTest extends MediaWikiTestCase {
 		);
 	}
 
-	/**
-	 * Test that addScriptFile() throws due to deprecation.
-	 *
-	 * @covers OutputPage::addScriptFile
-	 */
-	public function testAddDeprecatedScriptFileWarning() {
-		$this->setExpectedException( PHPUnit_Framework_Error_Deprecated::class,
-			'Use of OutputPage::addScriptFile was deprecated in MediaWiki 1.24.' );
-
-		$op = $this->newInstance();
-		$op->addScriptFile( 'ignored-script.js' );
-	}
-
-	/**
-	 * Test the actual behavior of the method (in the case where it doesn't throw, e.g., in
-	 * production).
-	 *
-	 * @covers OutputPage::addScriptFile
-	 */
-	public function testAddDeprecatedScriptFileNoOp() {
-		$this->hideDeprecated( 'OutputPage::addScriptFile' );
-		$op = $this->newInstance();
-		$op->addScriptFile( 'ignored-script.js' );
-
-		$this->assertNotContains( 'ignored-script.js', '' . $op->getBottomScripts() );
-	}
-
 	/**
 	 * @covers OutputPage::addInlineScript
 	 */
@@ -2250,7 +2223,6 @@ class OutputPageTest extends MediaWikiTestCase {
 	 * @param array[] $calls For each array, call addVaryHeader() with those arguments
 	 * @param string[] $cookies Array of cookie names to vary on
 	 * @param string $vary Text of expected Vary header (including the 'Vary: ')
-	 * @param string $key Text of expected Key header (including the 'Key: ')
 	 */
 	public function testVaryHeaders( array $calls, array $cookies, $vary ) {
 		// Get rid of default Vary fields
@@ -2702,11 +2674,11 @@ class OutputPageTest extends MediaWikiTestCase {
 		return [
 			'empty' => [
 				'exemptStyleModules' => [],
-				'<meta name="ResourceLoaderDynamicStyles" content=""/>',
+				'',
 			],
 			'empty sets' => [
 				'exemptStyleModules' => [ 'site' => [], 'noscript' => [], 'private' => [], 'user' => [] ],
-				'<meta name="ResourceLoaderDynamicStyles" content=""/>',
+				'',
 			],
 			'default logged-out' => [
 				'exemptStyleModules' => [ 'site' => [ 'site.styles' ] ],