Merge "Fix separated login link so that create account and login are always next...

[lhc/web/wiklou.git] / tests / phpunit / includes / ArticleTablesTest.php

diff --git a/tests/phpunit/includes/ArticleTablesTest.php b/tests/phpunit/includes/ArticleTablesTest.php
index 28d6708..17cee6e 100644 (file)
--- a/tests/phpunit/includes/ArticleTablesTest.php
+++ b/tests/phpunit/includes/ArticleTablesTest.php
@@ -6,26 +6,25 @@
 class ArticleTablesTest extends MediaWikiLangTestCase {
 
        function testbug14404() {
-               global $wgUser, $wgContLang, $wgLanguageCode, $wgLang;
+               global $wgContLang, $wgLanguageCode, $wgLang;
 
-               $title = Title::newFromText("Bug 14404");
-               $article = new Article( $title );
-               $wgUser = new User();
-               $wgUser->mRights = array( 'createpage', 'edit', 'purge' );
+               $title = Title::newFromText( 'Bug 14404' );
+               $page = WikiPage::factory( $title );
+               $user = new User();
+               $user->mRights = array( 'createpage', 'edit', 'purge' );
                $wgLanguageCode = 'es';
                $wgContLang = Language::factory( 'es' );
 
                $wgLang = Language::factory( 'fr' );
-               $status = $article->doEdit( '{{:{{int:history}}}}', 'Test code for bug 14404', 0 );
-               $templates1 = $article->getUsedTemplates();
+               $status = $page->doEdit( '{{:{{int:history}}}}', 'Test code for bug 14404', 0, false, $user );
+               $templates1 = $title->getTemplateLinksFrom();
 
                $wgLang = Language::factory( 'de' );
-               $article->mParserOptions = null; // Let it pick the new user language
-               $article->mPreparedEdit = false; // In order to force the rerendering of the same wikitext
+               $page->mPreparedEdit = false; // In order to force the rerendering of the same wikitext
 
                // We need an edit, a purge is not enough to regenerate the tables
-               $status = $article->doEdit( '{{:{{int:history}}}}', 'Test code for bug 14404', EDIT_UPDATE );
-               $templates2 = $article->getUsedTemplates();
+               $status = $page->doEdit( '{{:{{int:history}}}}', 'Test code for bug 14404', EDIT_UPDATE, false, $user );
+               $templates2 = $title->getTemplateLinksFrom();
 
                $this->assertEquals( $templates1, $templates2 );
                $this->assertEquals( $templates1[0]->getFullText(), 'Historial' );