From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 25 Sep 2017 16:11:01 +0000 (+0000)
Subject: Merge "Make `ApiUploadTest` up to date so it passes"
X-Git-Tag: 1.31.0-rc.0~1971
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=5e899b366ce2bee773d587b998660186268f817e;hp=606dced3ff34b49dcc595a51b2ca899f8c19aa83;p=lhc%2Fweb%2Fwiklou.git

Merge "Make `ApiUploadTest` up to date so it passes"
---

diff --git a/tests/phpunit/includes/api/ApiUploadTest.php b/tests/phpunit/includes/api/ApiUploadTest.php
index 9b79e6c538..159a0e36e4 100644
--- a/tests/phpunit/includes/api/ApiUploadTest.php
+++ b/tests/phpunit/includes/api/ApiUploadTest.php
@@ -51,7 +51,6 @@ class ApiUploadTest extends ApiTestCaseUpload {
 		$this->assertArrayHasKey( "login", $result );
 		$this->assertArrayHasKey( "result", $result['login'] );
 		$this->assertEquals( "Success", $result['login']['result'] );
-		$this->assertArrayHasKey( 'lgtoken', $result['login'] );
 
 		$this->assertNotEmpty( $session, 'API Login must return a session' );
 
@@ -69,7 +68,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
 			] );
 		} catch ( ApiUsageException $e ) {
 			$exception = true;
-			$this->assertEquals( 'The "token" parameter must be set', $e->getMessage() );
+			$this->assertContains( 'The "token" parameter must be set', $e->getMessage() );
 		}
 		$this->assertTrue( $exception, "Got exception" );
 	}
@@ -85,8 +84,10 @@ class ApiUploadTest extends ApiTestCaseUpload {
 			], $session, self::$users['uploader']->getUser() );
 		} catch ( ApiUsageException $e ) {
 			$exception = true;
-			$this->assertEquals( "One of the parameters filekey, file, url is required",
-				$e->getMessage() );
+			$this->assertEquals(
+				'One of the parameters "filekey", "file" and "url" is required.',
+				$e->getMessage()
+			);
 		}
 		$this->assertTrue( $exception, "Got exception" );
 	}