diff options
Diffstat (limited to 'tests/phpunit/unit')
3 files changed, 14 insertions, 9 deletions
diff --git a/tests/phpunit/unit/includes/editpage/Constraint/UserRateLimitConstraintTest.php b/tests/phpunit/unit/includes/editpage/Constraint/UserRateLimitConstraintTest.php index c562bb877a3d..b832aa7ee5e5 100644 --- a/tests/phpunit/unit/includes/editpage/Constraint/UserRateLimitConstraintTest.php +++ b/tests/phpunit/unit/includes/editpage/Constraint/UserRateLimitConstraintTest.php @@ -42,14 +42,19 @@ class UserRateLimitConstraintTest extends MediaWikiUnitTestCase { */ private function getRateLimiter( $fail ) { $mock = $this->createNoOpMock( RateLimiter::class, [ 'limit' ] ); + $expectedArgs = [ + [ 'edit', 1, false ], + [ 'linkpurge', 0, false ], + [ 'editcontentmodel', 1, $fail ] + ]; $mock->expects( $this->exactly( 3 ) ) ->method( 'limit' ) - ->withConsecutive( - [ $this->anything(), 'edit', 1 ], - [ $this->anything(), 'linkpurge', 0 ], - [ $this->anything(), 'editcontentmodel', 1 ] - ) - ->willReturnOnConsecutiveCalls( false, false, $fail ); + ->willReturnCallback( function ( $_, $action, $incrBy ) use ( &$expectedArgs ) { + $curExpectedArgs = array_shift( $expectedArgs ); + $this->assertSame( $curExpectedArgs[0], $action ); + $this->assertSame( $curExpectedArgs[1], $incrBy ); + return $curExpectedArgs[2]; + } ); return $mock; } diff --git a/tests/phpunit/unit/includes/libs/Stats/StatsEmitterTest.php b/tests/phpunit/unit/includes/libs/Stats/StatsEmitterTest.php index b58579ba3b10..fc84ff333bf4 100644 --- a/tests/phpunit/unit/includes/libs/Stats/StatsEmitterTest.php +++ b/tests/phpunit/unit/includes/libs/Stats/StatsEmitterTest.php @@ -36,8 +36,8 @@ class StatsEmitterTest extends TestCase { // transport $transport = $this->createMock( UDPTransport::class ); $transport->expects( $this->once() )->method( "emit" ) - ->withConsecutive( - [ "mediawiki.test.bar:1|c\nmediawiki.test.bar:1|c\nmediawiki.test.foo:3.14|ms\nmediawiki.test.stats_buffered_total:3|c\n" ] + ->with( + "mediawiki.test.bar:1|c\nmediawiki.test.bar:1|c\nmediawiki.test.foo:3.14|ms\nmediawiki.test.stats_buffered_total:3|c\n" ); $emitter = $emitter->withTransport( $transport ); diff --git a/tests/phpunit/unit/includes/rcfeed/RCFeedTest.php b/tests/phpunit/unit/includes/rcfeed/RCFeedTest.php index 6e48ca88a213..d94dd4e2a265 100644 --- a/tests/phpunit/unit/includes/rcfeed/RCFeedTest.php +++ b/tests/phpunit/unit/includes/rcfeed/RCFeedTest.php @@ -21,7 +21,7 @@ class RCFeedTest extends MediaWikiUnitTestCase { } public function testFactoryCustomUri() { - $mockClass = $this->getMockClass( RCFeed::class ); + $mockClass = get_class( $this->createMock( RCFeed::class ) ); $GLOBALS['wgRCEngines'] = [ 'test' => $mockClass ]; $this->hideDeprecated( '$wgRCFeeds without class' ); |