diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
tree | f1fdd326034e05177596851be6a7127615d81498 /tests/phpunit/includes/exception/ErrorPageErrorTest.php | |
parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'tests/phpunit/includes/exception/ErrorPageErrorTest.php')
-rw-r--r-- | tests/phpunit/includes/exception/ErrorPageErrorTest.php | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/tests/phpunit/includes/exception/ErrorPageErrorTest.php b/tests/phpunit/includes/exception/ErrorPageErrorTest.php index 13dcf33b..9c4e4a0b 100644 --- a/tests/phpunit/includes/exception/ErrorPageErrorTest.php +++ b/tests/phpunit/includes/exception/ErrorPageErrorTest.php @@ -6,20 +6,6 @@ */ class ErrorPageErrorTest extends MediaWikiTestCase { - private $wgOut; - - protected function setUp() { - parent::setUp(); - global $wgOut; - $this->wgOut = clone $wgOut; - } - - protected function tearDown() { - global $wgOut; - $wgOut = $this->wgOut; - parent::tearDown(); - } - private function getMockMessage() { $mockMessage = $this->getMockBuilder( 'Message' ) ->disableOriginalConstructor() @@ -48,20 +34,18 @@ class ErrorPageErrorTest extends MediaWikiTestCase { $title = 'Foo'; $params = array( 'Baz' ); - global $wgOut; - $wgOut = $this->getMockBuilder( 'OutputPage' ) + $mock = $this->getMockBuilder( 'OutputPage' ) ->disableOriginalConstructor() ->getMock(); - $wgOut->expects( $this->once() ) + $mock->expects( $this->once() ) ->method( 'showErrorPage' ) ->with( $title, $mockMessage, $params ); - $wgOut->expects( $this->once() ) + $mock->expects( $this->once() ) ->method( 'output' ); + $this->setMwGlobals( 'wgOut', $mock ); $e = new ErrorPageError( $title, $mockMessage, $params ); $e->report(); } - - } |