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 "Added letter Kra (ΔΈ) to special characters toolbar"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
exception
/
ThrottledErrorTest.php
diff --git
a/tests/phpunit/includes/exception/ThrottledErrorTest.php
b/tests/phpunit/includes/exception/ThrottledErrorTest.php
index
bdb143f
..
15f0896
100644
(file)
--- a/
tests/phpunit/includes/exception/ThrottledErrorTest.php
+++ b/
tests/phpunit/includes/exception/ThrottledErrorTest.php
@@
-2,27
+2,12
@@
/**
* @covers ThrottledError
/**
* @covers ThrottledError
- * @author Ad
am Shorland
+ * @author Ad
dshore
*/
class ThrottledErrorTest extends MediaWikiTestCase {
*/
class ThrottledErrorTest extends MediaWikiTestCase {
- protected $wgOut;
-
- protected function setUp() {
- parent::setUp();
- global $wgOut;
- $this->wgOut = clone $wgOut;
- }
-
- protected function tearDown() {
- parent::tearDown();
- global $wgOut;
- $wgOut = $this->wgOut;
- }
-
public function testExceptionSetsStatusCode() {
public function testExceptionSetsStatusCode() {
- global $wgOut;
- $wgOut = $this->getMockWgOut();
+ $this->setMwGlobals( 'wgOut', $this->getMockWgOut() );
try {
throw new ThrottledError();
} catch ( ThrottledError $e ) {
try {
throw new ThrottledError();
} catch ( ThrottledError $e ) {
@@
-32,7
+17,7
@@
class ThrottledErrorTest extends MediaWikiTestCase {
}
private function getMockWgOut() {
}
private function getMockWgOut() {
- $mock = $this->getMockBuilder(
'OutputPage'
)
+ $mock = $this->getMockBuilder(
OutputPage::class
)
->disableOriginalConstructor()
->getMock();
$mock->expects( $this->once() )
->disableOriginalConstructor()
->getMock();
$mock->expects( $this->once() )