X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fapi%2FApiQuerySiteinfoTest.php;h=7f5ee0ca3c8a075293022e938ad0d20715d0f8d3;hb=d42d1dbabd7dc81b454cfad8bbbe787cdd3cdf9f;hp=282188d26467561bf0cff98a4932b777b95fcfcc;hpb=fef19e24d7ffa1da54d999eb06e4e777f638dc71;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/api/ApiQuerySiteinfoTest.php b/tests/phpunit/includes/api/ApiQuerySiteinfoTest.php
index 282188d264..7f5ee0ca3c 100644
--- a/tests/phpunit/includes/api/ApiQuerySiteinfoTest.php
+++ b/tests/phpunit/includes/api/ApiQuerySiteinfoTest.php
@@ -79,15 +79,46 @@ class ApiQuerySiteinfoTest extends ApiTestCase {
 		$this->assertSame( 'Need more donations', $data['readonlyreason'] );
 	}
 
-	public function testNamespaces() {
-		$this->setMwGlobals( 'wgExtraNamespaces', [ '138' => 'Testing' ] );
+	public function testNamespacesBasic() {
+		$this->assertSame(
+			array_keys( MediaWikiServices::getInstance()->getContentLanguage()->getFormattedNamespaces() ),
+			array_keys( $this->doQuery( 'namespaces' ) )
+		);
+	}
 
+	public function testNamespacesExtraNS() {
+		$this->setMwGlobals( 'wgExtraNamespaces', [ '138' => 'Testing' ] );
 		$this->assertSame(
 			array_keys( MediaWikiServices::getInstance()->getContentLanguage()->getFormattedNamespaces() ),
 			array_keys( $this->doQuery( 'namespaces' ) )
 		);
 	}
 
+	public function testNamespacesProtection() {
+		$this->setMwGlobals(
+			'wgNamespaceProtection',
+			[
+				'0' => '',
+				'2' => [ '' ],
+				'4' => 'editsemiprotected',
+				'8' => [
+					'editinterface',
+					'noratelimit'
+				],
+				'14' => [
+					'move-categorypages',
+					''
+				]
+			]
+		);
+		$data = $this->doQuery( 'namespaces' );
+		$this->assertArrayNotHasKey( 'namespaceprotection', $data['0'] );
+		$this->assertArrayNotHasKey( 'namespaceprotection', $data['2'] );
+		$this->assertSame( 'editsemiprotected', $data['4']['namespaceprotection'] );
+		$this->assertSame( 'editinterface|noratelimit', $data['8']['namespaceprotection'] );
+		$this->assertSame( 'move-categorypages', $data['14']['namespaceprotection'] );
+	}
+
 	public function testNamespaceAliases() {
 		global $wgNamespaceAliases;
 
@@ -210,15 +241,16 @@ class ApiQuerySiteinfoTest extends ApiTestCase {
 			$this->setExpectedApiException( 'apierror-siteinfo-includealldenied' );
 		}
 
-		$mockLB = $this->getMockBuilder( LoadBalancer::class )
-			->disableOriginalConstructor()
-			->setMethods( [ 'getMaxLag', 'getLagTimes', 'getServerName', '__destruct' ] )
-			->getMock();
+		$mockLB = $this->createMock( LoadBalancer::class );
 		$mockLB->method( 'getMaxLag' )->willReturn( [ null, 7, 1 ] );
 		$mockLB->method( 'getLagTimes' )->willReturn( [ 5, 7 ] );
 		$mockLB->method( 'getServerName' )->will( $this->returnValueMap( [
 			[ 0, 'apple' ], [ 1, 'carrot' ]
 		] ) );
+		$mockLB->method( 'getLocalDomainID' )->willReturn( 'testdomain' );
+		$mockLB->expects( $this->never() )->method( $this->anythingBut(
+			'getMaxLag', 'getLagTimes', 'getServerName', 'getLocalDomainID', '__destruct'
+		) );
 		$this->setService( 'DBLoadBalancer', $mockLB );
 
 		$this->setMwGlobals( 'wgShowHostnames', $showHostnames );
@@ -633,17 +665,13 @@ class ApiQuerySiteinfoTest extends ApiTestCase {
 	}
 
 	public function testContinuation() {
-		// We make lots and lots of URL protocols that are each 100 bytes
+		// Use $wgUrlProtocols to forge the size of the API query
 		global $wgAPIMaxResultSize, $wgUrlProtocols;
 
-		$this->setMwGlobals( 'wgUrlProtocols', [] );
-
-		// Just under the limit
-		$chunks = $wgAPIMaxResultSize / 100 - 1;
+		$protocol = 'foo://';
 
-		for ( $i = 0; $i < $chunks; $i++ ) {
-			$wgUrlProtocols[] = substr( str_repeat( "$i ", 50 ), 0, 100 );
-		}
+		$this->setMwGlobals( 'wgUrlProtocols', [ $protocol ] );
+		$this->setMwGlobals( 'wgAPIMaxResultSize', strlen( $protocol ) );
 
 		$res = $this->doApiRequest( [
 			'action' => 'query',