From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Jun 2015 07:31:04 +0200
Subject: Update to MediaWiki 1.25.1
---
tests/phpunit/includes/exception/ThrottledErrorTest.php | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
(limited to 'tests/phpunit/includes/exception/ThrottledErrorTest.php')
diff --git a/tests/phpunit/includes/exception/ThrottledErrorTest.php b/tests/phpunit/includes/exception/ThrottledErrorTest.php
index bdb143fa..a1cf84bc 100644
--- a/tests/phpunit/includes/exception/ThrottledErrorTest.php
+++ b/tests/phpunit/includes/exception/ThrottledErrorTest.php
@@ -6,23 +6,8 @@
*/
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() {
- global $wgOut;
- $wgOut = $this->getMockWgOut();
+ $this->setMwGlobals( 'wgOut', $this->getMockWgOut() );
try {
throw new ThrottledError();
} catch ( ThrottledError $e ) {
--
cgit v1.2.3-54-g00ecf