From: Timo Tijhof Date: Sun, 25 Aug 2019 18:01:48 +0000 (+0100) Subject: resourceloader: Add coverage for internal Context::getReqBase() X-Git-Tag: 1.34.0-rc.0~584^2 X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=ebee3194736bebc06b22770f52602d0154244929 resourceloader: Add coverage for internal Context::getReqBase() Change-Id: I068000f55f2100a6791470896d7f1050bdcb19a4 --- diff --git a/includes/resourceloader/ResourceLoaderContext.php b/includes/resourceloader/ResourceLoaderContext.php index 94e8a3ea88..c3948cbdca 100644 --- a/includes/resourceloader/ResourceLoaderContext.php +++ b/includes/resourceloader/ResourceLoaderContext.php @@ -76,8 +76,8 @@ class ResourceLoaderContext implements MessageLocalizer { // Various parameters $this->user = $request->getRawVal( 'user' ); $this->debug = $request->getRawVal( 'debug' ) === 'true'; - $this->only = $request->getRawVal( 'only', null ); - $this->version = $request->getRawVal( 'version', null ); + $this->only = $request->getRawVal( 'only' ); + $this->version = $request->getRawVal( 'version' ); $this->raw = $request->getFuzzyBool( 'raw' ); // Image requests diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderContextTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderContextTest.php index f6fd82408d..c748e2cf6e 100644 --- a/tests/phpunit/includes/resourceloader/ResourceLoaderContextTest.php +++ b/tests/phpunit/includes/resourceloader/ResourceLoaderContextTest.php @@ -35,6 +35,7 @@ class ResourceLoaderContextTest extends PHPUnit\Framework\TestCase { // Misc $this->assertEquals( 'ltr', $ctx->getDirection() ); $this->assertEquals( 'qqx|fallback||||||||', $ctx->getHash() ); + $this->assertSame( [], $ctx->getReqBase() ); $this->assertInstanceOf( User::class, $ctx->getUserObj() ); } @@ -75,6 +76,7 @@ class ResourceLoaderContextTest extends PHPUnit\Framework\TestCase { // Misc $this->assertEquals( 'ltr', $ctx->getDirection() ); $this->assertEquals( 'zh|fallback|||styles|||||', $ctx->getHash() ); + $this->assertSame( [ 'lang' => 'zh' ], $ctx->getReqBase() ); } public static function provideDirection() {