Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix incomplete test case in CorsUtilsTest

Browse source 
There was never anything actually executed in this test.

This patch also removes a little bit of unused code and inlines
trivial test setup code.

Change-Id: I7dd019cac383313913e06adbea22bb6540162280
This commit is contained in:
Thiemo Kreuz 2022-08-05 12:37:28 +02:00 committed by Thiemo Kreuz (WMDE)
parent ae8c437491
commit dcbfb538d8
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
tests/phpunit/unit/includes/Rest/CorsUtilsTest.php
View file

@ -33,8 +33,6 @@ class CorsUtilsTest extends \MediaWikiUnitTestCase {
* @dataProvider provideAuthorizeAllowOrigin
*/
public function testAuthorizeAllowOrigin( bool $isRegistered, bool $needsWriteAccess, string $origin ) {
$user = new UserIdentityValue( (int)$isRegistered, __CLASS__ );
$cors = new CorsUtils(
$this->createServiceOptions( [
'CrossSiteAJAXdomains' => [
@ -42,7 +40,7 @@ class CorsUtilsTest extends \MediaWikiUnitTestCase {
],
] ),
$this->createNoOpMock( ResponseFactory::class ),
$user
new UserIdentityValue( (int)$isRegistered, __CLASS__ )
);
$request = $this->createMock( RequestInterface::class );
@ -100,12 +98,10 @@ class CorsUtilsTest extends \MediaWikiUnitTestCase {
}
public function testAuthorizeDisallowOrigin() {
$user = new UserIdentityValue( 0, __CLASS__ );
$cors = new CorsUtils(
$this->createServiceOptions(),
$this->createMock( ResponseFactory::class ),
$user
new UserIdentityValue( 0, __CLASS__ )
);
$request = $this->createMock( RequestInterface::class );
@ -138,10 +134,14 @@ class CorsUtilsTest extends \MediaWikiUnitTestCase {
new UserIdentityValue( 0, __CLASS__ )
);
$request = $this->createMock( RequestInterface::class );
$response = $this->createNoOpMock( ResponseInterface::class );
$this->assertTrue( true, 'Tests that no methods are called on $response, assertion for making phpunit happy' );
$result = $cors->modifyResponse(
$this->createMock( RequestInterface::class ),
$response
);
$this->assertSame( $response, $result );
}
public function testModifyResponseAllowOrigin() {
@ -153,8 +153,6 @@ class CorsUtilsTest extends \MediaWikiUnitTestCase {
new UserIdentityValue( 0, __CLASS__ )
);
$request = $this->createMock( RequestInterface::class );
$response = new Response();
$result = $cors->modifyResponse(
@ -174,15 +172,13 @@ class CorsUtilsTest extends \MediaWikiUnitTestCase {
* @param string $isRegistered
*/
public function testModifyResponseAllowTrustedOriginCookieAuth( string $requestMethod, bool $isRegistered ) {
$user = new UserIdentityValue( (int)$isRegistered, __CLASS__ );
$cors = new CorsUtils(
$this->createServiceOptions( [
'AllowCrossOrigin' => true,
'RestAllowCrossOriginCookieAuth' => true,
] ),
$this->createNoOpMock( ResponseFactory::class ),
$user
new UserIdentityValue( (int)$isRegistered, __CLASS__ )
);
$request = $this->createMock( RequestInterface::class );
@ -231,15 +227,13 @@ class CorsUtilsTest extends \MediaWikiUnitTestCase {
string $requestMethod,
bool $isRegistered
) {
$user = new UserIdentityValue( (int)$isRegistered, __CLASS__ );
$cors = new CorsUtils(
$this->createServiceOptions( [
'AllowCrossOrigin' => true,
'RestAllowCrossOriginCookieAuth' => true,
] ),
$this->createNoOpMock( ResponseFactory::class ),
$user
new UserIdentityValue( (int)$isRegistered, __CLASS__ )
);
$request = $this->createMock( RequestInterface::class );