X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fapi%2FApiOptionsTest.php;h=30ba1c1b66bbf7f7c536c18985a8581f39717647;hb=a88f1d6b58613cbfa5c24c97887197a41ce66908;hp=29c7dae50de637fca58881ee1c733cc34f577ca4;hpb=925c20a9ca669c67cc44f4468d0e0f3b33b94213;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/api/ApiOptionsTest.php b/tests/phpunit/includes/api/ApiOptionsTest.php
index 29c7dae50d..30ba1c1b66 100644
--- a/tests/phpunit/includes/api/ApiOptionsTest.php
+++ b/tests/phpunit/includes/api/ApiOptionsTest.php
@@ -61,6 +61,11 @@ class ApiOptionsTest extends MediaWikiLangTestCase {
 				[ $this, 'hookGetPreferences' ]
 			]
 		] );
+		$this->mergeMwGlobalArrayValue( 'wgDefaultUserOptions', [
+			'testradio' => 'option1',
+		] );
+		// Workaround for static caching in User::getDefaultOptions()
+		$this->setContentLang( Language::factory( 'qqq' ) );
 	}
 
 	public function hookGetPreferences( $user, &$preferences ) {
@@ -90,7 +95,11 @@ class ApiOptionsTest extends MediaWikiLangTestCase {
 			'default' => [],
 		];
 
-		return true;
+		$preferences['testradio'] = [
+			'type' => 'radio',
+			'options' => [ 'Option 1' => 'option1', 'Option 2' => 'option2' ],
+			'section' => 'test',
+		];
 	}
 
 	/**
@@ -106,6 +115,7 @@ class ApiOptionsTest extends MediaWikiLangTestCase {
 			'willBeNull' => 'registered',
 			'willBeEmpty' => 'registered',
 			'willBeHappy' => 'registered',
+			'testradio' => 'registered',
 			'testmultiselect-opt1' => 'registered-multiselect',
 			'testmultiselect-opt2' => 'registered-multiselect',
 			'testmultiselect-opt3' => 'registered-multiselect',
@@ -243,65 +253,6 @@ class ApiOptionsTest extends MediaWikiLangTestCase {
 		$this->assertEquals( self::$Success, $response );
 	}
 
-	public function testOptionWithValue() {
-		$this->mUserMock->expects( $this->never() )
-			->method( 'resetOptions' );
-
-		$this->mUserMock->expects( $this->once() )
-			->method( 'setOption' )
-			->with( $this->equalTo( 'name' ), $this->equalTo( 'value' ) );
-
-		$this->mUserMock->expects( $this->once() )
-			->method( 'saveSettings' );
-
-		$request = $this->getSampleRequest( [ 'optionname' => 'name', 'optionvalue' => 'value' ] );
-
-		$response = $this->executeQuery( $request );
-
-		$this->assertEquals( self::$Success, $response );
-	}
-
-	public function testOptionResetValue() {
-		$this->mUserMock->expects( $this->never() )
-			->method( 'resetOptions' );
-
-		$this->mUserMock->expects( $this->once() )
-			->method( 'setOption' )
-			->with( $this->equalTo( 'name' ), $this->identicalTo( null ) );
-
-		$this->mUserMock->expects( $this->once() )
-			->method( 'saveSettings' );
-
-		$request = $this->getSampleRequest( [ 'optionname' => 'name' ] );
-		$response = $this->executeQuery( $request );
-
-		$this->assertEquals( self::$Success, $response );
-	}
-
-	public function testChange() {
-		$this->mUserMock->expects( $this->never() )
-			->method( 'resetOptions' );
-
-		$this->mUserMock->expects( $this->exactly( 3 ) )
-			->method( 'setOption' )
-			->withConsecutive(
-				[ $this->equalTo( 'willBeNull' ), $this->identicalTo( null ) ],
-				[ $this->equalTo( 'willBeEmpty' ), $this->equalTo( '' ) ],
-				[ $this->equalTo( 'willBeHappy' ), $this->equalTo( 'Happy' ) ]
-			);
-
-		$this->mUserMock->expects( $this->once() )
-			->method( 'saveSettings' );
-
-		$request = $this->getSampleRequest( [
-			'change' => 'willBeNull|willBeEmpty=|willBeHappy=Happy'
-		] );
-
-		$response = $this->executeQuery( $request );
-
-		$this->assertEquals( self::$Success, $response );
-	}
-
 	public function testResetChangeOption() {
 		$this->mUserMock->expects( $this->once() )
 			->method( 'resetOptions' );
@@ -328,95 +279,121 @@ class ApiOptionsTest extends MediaWikiLangTestCase {
 		$this->assertEquals( self::$Success, $response );
 	}
 
-	public function testMultiSelect() {
+	/**
+	 * @dataProvider provideOptionManupulation
+	 * @param array $params
+	 * @param array $setOptions
+	 * @param array|null $result
+	 */
+	public function testOptionManupulation( array $params, array $setOptions, array $result = null,
+		$message = ''
+	) {
 		$this->mUserMock->expects( $this->never() )
 			->method( 'resetOptions' );
 
-		$this->mUserMock->expects( $this->exactly( 4 ) )
+		$this->mUserMock->expects( $this->exactly( count( $setOptions ) ) )
 			->method( 'setOption' )
-			->withConsecutive(
-				[ $this->equalTo( 'testmultiselect-opt1' ), $this->identicalTo( true ) ],
-				[ $this->equalTo( 'testmultiselect-opt2' ), $this->identicalTo( null ) ],
-				[ $this->equalTo( 'testmultiselect-opt3' ), $this->identicalTo( false ) ],
-				[ $this->equalTo( 'testmultiselect-opt4' ), $this->identicalTo( false ) ]
-			);
-
-		$this->mUserMock->expects( $this->once() )
-			->method( 'saveSettings' );
-
-		$request = $this->getSampleRequest( [
-			'change' => 'testmultiselect-opt1=1|testmultiselect-opt2|'
-				. 'testmultiselect-opt3=|testmultiselect-opt4=0'
-		] );
-
-		$response = $this->executeQuery( $request );
-
-		$this->assertEquals( self::$Success, $response );
-	}
-
-	public function testSpecialOption() {
-		$this->mUserMock->expects( $this->never() )
-			->method( 'resetOptions' );
-
-		$this->mUserMock->expects( $this->never() )
-			->method( 'saveSettings' );
-
-		$request = $this->getSampleRequest( [
-			'change' => 'special=1'
-		] );
-
-		$response = $this->executeQuery( $request );
-
-		$this->assertEquals( [
-			'options' => 'success',
-			'warnings' => [
-				'options' => [
-					'warnings' => "Validation error for \"special\": cannot be set by this module."
-				]
-			]
-		], $response );
-	}
-
-	public function testUnknownOption() {
-		$this->mUserMock->expects( $this->never() )
-			->method( 'resetOptions' );
-
-		$this->mUserMock->expects( $this->never() )
-			->method( 'saveSettings' );
-
-		$request = $this->getSampleRequest( [
-			'change' => 'unknownOption=1'
-		] );
+			->withConsecutive( ...$setOptions );
+
+		if ( $setOptions ) {
+			$this->mUserMock->expects( $this->once() )
+				->method( 'saveSettings' );
+		} else {
+			$this->mUserMock->expects( $this->never() )
+				->method( 'saveSettings' );
+		}
 
+		$request = $this->getSampleRequest( $params );
 		$response = $this->executeQuery( $request );
 
-		$this->assertEquals( [
-			'options' => 'success',
-			'warnings' => [
-				'options' => [
-					'warnings' => "Validation error for \"unknownOption\": not a valid preference."
-				]
-			]
-		], $response );
+		if ( !$result ) {
+			$result = self::$Success;
+		}
+		$this->assertEquals( $result, $response, $message );
 	}
 
-	public function testUserjsOption() {
-		$this->mUserMock->expects( $this->never() )
-			->method( 'resetOptions' );
-
-		$this->mUserMock->expects( $this->once() )
-			->method( 'setOption' )
-			->with( $this->equalTo( 'userjs-option' ), $this->equalTo( '1' ) );
-
-		$this->mUserMock->expects( $this->once() )
-			->method( 'saveSettings' );
-
-		$request = $this->getSampleRequest( [
-			'change' => 'userjs-option=1'
-		] );
-
-		$response = $this->executeQuery( $request );
-
-		$this->assertEquals( self::$Success, $response );
+	public function provideOptionManupulation() {
+		return [
+			[
+				[ 'change' => 'userjs-option=1' ],
+				[ [ 'userjs-option', '1' ] ],
+				null,
+				'Setting userjs options',
+			],
+			[
+				[ 'change' => 'willBeNull|willBeEmpty=|willBeHappy=Happy' ],
+				[
+					[ 'willBeNull', null ],
+					[ 'willBeEmpty', '' ],
+					[ 'willBeHappy', 'Happy' ],
+				],
+				null,
+				'Basic option setting',
+			],
+			[
+				[ 'change' => 'testradio=option2' ],
+				[ [ 'testradio', 'option2' ] ],
+				null,
+				'Changing radio options',
+			],
+			[
+				[ 'change' => 'testradio' ],
+				[ [ 'testradio', null ] ],
+				null,
+				'Resetting radio options',
+			],
+			[
+				[ 'change' => 'unknownOption=1' ],
+				[],
+				[
+					'options' => 'success',
+					'warnings' => [
+						'options' => [
+							'warnings' => "Validation error for \"unknownOption\": not a valid preference."
+						],
+					],
+				],
+				'Unrecognized options should be rejected',
+			],
+			[
+				[ 'change' => 'special=1' ],
+				[],
+				[
+					'options' => 'success',
+					'warnings' => [
+						'options' => [
+							'warnings' => "Validation error for \"special\": cannot be set by this module."
+						]
+					]
+				],
+				'Refuse setting special options',
+			],
+			[
+				[
+					'change' => 'testmultiselect-opt1=1|testmultiselect-opt2|'
+						. 'testmultiselect-opt3=|testmultiselect-opt4=0'
+				],
+				[
+					[ 'testmultiselect-opt1', true ],
+					[ 'testmultiselect-opt2', null ],
+					[ 'testmultiselect-opt3', false ],
+					[ 'testmultiselect-opt4', false ],
+				],
+				null,
+				'Setting multiselect options',
+			],
+			[
+				[ 'optionname' => 'name', 'optionvalue' => 'value' ],
+				[ [ 'name', 'value' ] ],
+				null,
+				'Setting options via optionname/optionvalue'
+			],
+			[
+				[ 'optionname' => 'name' ],
+				[ [ 'name', null ] ],
+				null,
+				'Resetting options via optionname without optionvalue',
+			],
+		];
 	}
 }