X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fapi%2FApiOptionsTest.php;h=7e45f4da123ce740876eb98f6204a8d915a915d9;hb=d84c3dde5af90c5c3497d18e427a5c2a38ac6ca8;hp=ef70626120fe3e1793f46cc9b60b742681f69b62;hpb=49748181dd56ec97e7ba7c13e684a16abceb3cc0;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/api/ApiOptionsTest.php b/tests/phpunit/includes/api/ApiOptionsTest.php
index ef70626120..7e45f4da12 100644
--- a/tests/phpunit/includes/api/ApiOptionsTest.php
+++ b/tests/phpunit/includes/api/ApiOptionsTest.php
@@ -278,26 +278,13 @@ class ApiOptionsTest extends MediaWikiLangTestCase {
 		$this->mUserMock->expects( $this->never() )
 			->method( 'resetOptions' );
 
-		$this->mUserMock->expects( $this->at( 2 ) )
-			->method( 'getOptions' );
-
-		$this->mUserMock->expects( $this->at( 5 ) )
+		$this->mUserMock->expects( $this->exactly( 3 ) )
 			->method( 'setOption' )
-			->with( $this->equalTo( 'willBeNull' ), $this->identicalTo( null ) );
-
-		$this->mUserMock->expects( $this->at( 6 ) )
-			->method( 'getOptions' );
-
-		$this->mUserMock->expects( $this->at( 7 ) )
-			->method( 'setOption' )
-			->with( $this->equalTo( 'willBeEmpty' ), $this->equalTo( '' ) );
-
-		$this->mUserMock->expects( $this->at( 8 ) )
-			->method( 'getOptions' );
-
-		$this->mUserMock->expects( $this->at( 9 ) )
-			->method( 'setOption' )
-			->with( $this->equalTo( 'willBeHappy' ), $this->equalTo( 'Happy' ) );
+			->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' );
@@ -315,19 +302,12 @@ class ApiOptionsTest extends MediaWikiLangTestCase {
 		$this->mUserMock->expects( $this->once() )
 			->method( 'resetOptions' );
 
-		$this->mUserMock->expects( $this->at( 5 ) )
-			->method( 'getOptions' );
-
-		$this->mUserMock->expects( $this->at( 6 ) )
-			->method( 'setOption' )
-			->with( $this->equalTo( 'willBeHappy' ), $this->equalTo( 'Happy' ) );
-
-		$this->mUserMock->expects( $this->at( 7 ) )
-			->method( 'getOptions' );
-
-		$this->mUserMock->expects( $this->at( 8 ) )
+		$this->mUserMock->expects( $this->exactly( 2 ) )
 			->method( 'setOption' )
-			->with( $this->equalTo( 'name' ), $this->equalTo( 'value' ) );
+			->withConsecutive(
+				[ $this->equalTo( 'willBeHappy' ), $this->equalTo( 'Happy' ) ],
+				[ $this->equalTo( 'name' ), $this->equalTo( 'value' ) ]
+			);
 
 		$this->mUserMock->expects( $this->once() )
 			->method( 'saveSettings' );
@@ -348,21 +328,14 @@ class ApiOptionsTest extends MediaWikiLangTestCase {
 		$this->mUserMock->expects( $this->never() )
 			->method( 'resetOptions' );
 
-		$this->mUserMock->expects( $this->at( 4 ) )
-			->method( 'setOption' )
-			->with( $this->equalTo( 'testmultiselect-opt1' ), $this->identicalTo( true ) );
-
-		$this->mUserMock->expects( $this->at( 5 ) )
-			->method( 'setOption' )
-			->with( $this->equalTo( 'testmultiselect-opt2' ), $this->identicalTo( null ) );
-
-		$this->mUserMock->expects( $this->at( 6 ) )
-			->method( 'setOption' )
-			->with( $this->equalTo( 'testmultiselect-opt3' ), $this->identicalTo( false ) );
-
-		$this->mUserMock->expects( $this->at( 7 ) )
+		$this->mUserMock->expects( $this->exactly( 4 ) )
 			->method( 'setOption' )
-			->with( $this->equalTo( 'testmultiselect-opt4' ), $this->identicalTo( false ) );
+			->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' );