dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Remove very, very old disabled test cases and todos"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
auth
/
ConfirmLinkSecondaryAuthenticationProviderTest.php
diff --git
a/tests/phpunit/includes/auth/ConfirmLinkSecondaryAuthenticationProviderTest.php
b/tests/phpunit/includes/auth/ConfirmLinkSecondaryAuthenticationProviderTest.php
index
580ef6c
..
9222843
100644
(file)
--- a/
tests/phpunit/includes/auth/ConfirmLinkSecondaryAuthenticationProviderTest.php
+++ b/
tests/phpunit/includes/auth/ConfirmLinkSecondaryAuthenticationProviderTest.php
@@
-2,20
+2,13
@@
namespace MediaWiki\Auth;
namespace MediaWiki\Auth;
+use Wikimedia\TestingAccessWrapper;
+
/**
* @group AuthManager
* @covers MediaWiki\Auth\ConfirmLinkSecondaryAuthenticationProvider
*/
class ConfirmLinkSecondaryAuthenticationProviderTest extends \MediaWikiTestCase {
/**
* @group AuthManager
* @covers MediaWiki\Auth\ConfirmLinkSecondaryAuthenticationProvider
*/
class ConfirmLinkSecondaryAuthenticationProviderTest extends \MediaWikiTestCase {
- protected function setUp() {
- global $wgDisableAuthManager;
-
- parent::setUp();
- if ( $wgDisableAuthManager ) {
- $this->markTestSkipped( '$wgDisableAuthManager is set' );
- }
- }
-
/**
* @dataProvider provideGetAuthenticationRequests
* @param string $action
/**
* @dataProvider provideGetAuthenticationRequests
* @param string $action
@@
-135,7
+128,7
@@
class ConfirmLinkSecondaryAuthenticationProviderTest extends \MediaWikiTestCase
->will( $this->returnValue( "BadReq" ) );
$user = \User::newFromName( 'UTSysop' );
->will( $this->returnValue( "BadReq" ) );
$user = \User::newFromName( 'UTSysop' );
- $provider =
\
TestingAccessWrapper::newFromObject(
+ $provider = TestingAccessWrapper::newFromObject(
new ConfirmLinkSecondaryAuthenticationProvider
);
$request = new \FauxRequest();
new ConfirmLinkSecondaryAuthenticationProvider
);
$request = new \FauxRequest();
@@
-180,7
+173,7
@@
class ConfirmLinkSecondaryAuthenticationProviderTest extends \MediaWikiTestCase
$r->action = AuthManager::ACTION_CHANGE;
$r->username = $user->getName();
}
$r->action = AuthManager::ACTION_CHANGE;
$r->username = $user->getName();
}
- $this->assertEquals( $expectReqs,
\
TestingAccessWrapper::newFromObject( $req )->linkRequests );
+ $this->assertEquals( $expectReqs, TestingAccessWrapper::newFromObject( $req )->linkRequests );
}
public function testContinueLinkAttempt() {
}
public function testContinueLinkAttempt() {
@@
-199,7
+192,7
@@
class ConfirmLinkSecondaryAuthenticationProviderTest extends \MediaWikiTestCase
->will( $this->returnValue( $obj ) );
$this->assertSame(
$obj,
->will( $this->returnValue( $obj ) );
$this->assertSame(
$obj,
-
\
TestingAccessWrapper::newFromObject( $mock )->continueLinkAttempt( $user, 'state', $reqs )
+ TestingAccessWrapper::newFromObject( $mock )->continueLinkAttempt( $user, 'state', $reqs )
);
// Now test the actual functioning
);
// Now test the actual functioning
@@
-233,7
+226,7
@@
class ConfirmLinkSecondaryAuthenticationProviderTest extends \MediaWikiTestCase
$request = new \FauxRequest();
$manager = new AuthManager( $request, $config );
$provider->setManager( $manager );
$request = new \FauxRequest();
$manager = new AuthManager( $request, $config );
$provider->setManager( $manager );
- $provider =
\
TestingAccessWrapper::newFromObject( $provider );
+ $provider = TestingAccessWrapper::newFromObject( $provider );
$req = new ConfirmLinkAuthenticationRequest( $reqs );
$req = new ConfirmLinkAuthenticationRequest( $reqs );