Also change $wgLanguageCode along with $wgContLang, this was breaking when arriving...

diff --git a/tests/phpunit/includes/ExtraParserTest.php b/tests/phpunit/includes/ExtraParserTest.php
index 5bc2221..54f2915 100644 (file)
--- a/tests/phpunit/includes/ExtraParserTest.php
+++ b/tests/phpunit/includes/ExtraParserTest.php
@@ -9,8 +9,10 @@ class ExtraParserTest extends MediaWikiTestCase {
                global $wgMemc;
                global $wgContLang;
                global $wgShowDBErrorBacktrace;
+               global $wgLanguageCode;
 
                $wgShowDBErrorBacktrace = true;
+               $wgLanguageCode = 'en';
                $wgContLang = new Language( 'en' );
                $wgMemc = new EmptyBagOStuff;
                

diff --git a/tests/phpunit/includes/GlobalTest.php b/tests/phpunit/includes/GlobalTest.php
index fdcc82a..5e6ae84 100644 (file)
--- a/tests/phpunit/includes/GlobalTest.php
+++ b/tests/phpunit/includes/GlobalTest.php
@@ -2,12 +2,13 @@
 
 class GlobalTest extends MediaWikiTestCase {
        function setUp() {
-               global $wgReadOnlyFile, $wgContLang, $wgLang, $wgUrlProtocols;
+               global $wgReadOnlyFile, $wgContLang, $wgLang, $wgUrlProtocols, $wgLanguageCode;
                $this->originals['wgReadOnlyFile'] = $wgReadOnlyFile;
                $this->originals['wgUrlProtocols'] = $wgUrlProtocols;
                $wgReadOnlyFile = tempnam( wfTempDir(), "mwtest_readonly" );
                $wgUrlProtocols[] = 'file://';
                unlink( $wgReadOnlyFile );
+               $wgLanguageCode = 'en';
                $wgContLang = $wgLang = Language::factory( 'en' );
        }