From 549e827efb162085a7c53b8f83a5f553524305c1 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Tue, 23 Apr 2013 15:27:41 +0200 Subject: [PATCH] Fix TimestampTest broken by 7e3386d4 - Call RequestContext::getMain()->setLanguage() since MWTimestamp::getHumanTimestamp() will call getLanguage() to get the Language object (and it not always English depending on the order the tests are called) - While I'm at it, use MediaWikiLangTestCase to avoid duplicating things Change-Id: I910287ccf093ef5681cd09445501dccc8d3f4d14 --- tests/phpunit/includes/TimestampTest.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/phpunit/includes/TimestampTest.php b/tests/phpunit/includes/TimestampTest.php index 2d550bc6b5..e1e196ae50 100644 --- a/tests/phpunit/includes/TimestampTest.php +++ b/tests/phpunit/includes/TimestampTest.php @@ -3,16 +3,12 @@ /** * Tests timestamp parsing and output. */ -class TimestampTest extends MediaWikiTestCase { +class TimestampTest extends MediaWikiLangTestCase { protected function setUp() { parent::setUp(); - $this->setMwGlobals( array( - 'wgLanguageCode' => 'en', - 'wgContLang' => Language::factory( 'en' ), - 'wgLang' => Language::factory( 'en' ), - ) ); + RequestContext::getMain()->setLanguage( Language::factory( 'en' ) ); } /** -- 2.20.1