From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Tue, 12 Jan 2010 23:05:41 +0000 (+0000)
Subject: follow-up r60986: Revert earlier test change - philip showed me the error of my ways.
X-Git-Tag: 1.31.0-rc.0~38298
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=5e68007f3d29f0b8dda12fdc1974f60e26518b9a;p=lhc%2Fweb%2Fwiklou.git

follow-up r60986: Revert earlier test change - philip showed me the error of my ways.
---

diff --git a/tests/LanguageConverterTest.php b/tests/LanguageConverterTest.php
index 480de72532..8991b16a3a 100644
--- a/tests/LanguageConverterTest.php
+++ b/tests/LanguageConverterTest.php
@@ -81,11 +81,12 @@ class LanguageConverterTest extends PHPUnit_Framework_TestCase {
 		$this->assertEquals('tg-latn', $this->lc->getPreferredVariant(true,  true));
 
 		$wgRequest->setVal('variant', 'tg');
-		$wgUser->setOption('variant', 'tg-latn');
+		$wgUser->setOption('variant', 'tg-latn'); // The user's data is ignored
+		                                          // because the variant is set in the URL.
 		$this->lc = new TestConverter( $this->lang, 'tg',
 									   array( 'tg', 'tg-latn' ) );
-		$this->assertEquals('tg-latn', $this->lc->getPreferredVariant(true,  false));
-		$this->assertEquals('tg-latn', $this->lc->getPreferredVariant(true,  true));
+		$this->assertEquals('tg', $this->lc->getPreferredVariant(true,  false));
+		$this->assertEquals('tg', $this->lc->getPreferredVariant(true,  true));
 
 		$wgRequest->setVal('variant', null);
 		$wgDefaultLanguageVariant = 'tg-latn';