From 30831464844bfec68d19d01377c2eb1d47334ffc Mon Sep 17 00:00:00 2001 From: aude Date: Mon, 1 Sep 2014 12:22:50 +0200 Subject: [PATCH] Use qqx language for OldChangesListTest Change-Id: Icda9d541ea0fc929ab8b9274bbe870eb6278d2ed --- .../includes/changes/OldChangesListTest.php | 20 ++++++++----------- .../changes/TestRecentChangesHelper.php | 3 +++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/tests/phpunit/includes/changes/OldChangesListTest.php b/tests/phpunit/includes/changes/OldChangesListTest.php index 3a36b9f302..2ea9f33ef3 100644 --- a/tests/phpunit/includes/changes/OldChangesListTest.php +++ b/tests/phpunit/includes/changes/OldChangesListTest.php @@ -29,7 +29,8 @@ class OldChangesListTest extends MediaWikiLangTestCase { parent::setUp(); $this->setMwGlobals( array( - 'wgArticlePath' => '/wiki/$1' + 'wgArticlePath' => '/wiki/$1', + 'wgLang' => Language::factory( 'qqx' ) ) ); } @@ -76,12 +77,9 @@ class OldChangesListTest extends MediaWikiLangTestCase { $line = $oldChangesList->recentChangesLine( $recentChange, false, 1 ); - $message = new Message( 'dellogpage' ); - $expectedLinkText = $message->inLanguage( 'en' )->text(); - $this->assertRegExp( '/href="\/wiki\/Special:Log\/delete/', $line, 'link has href attribute' ); $this->assertRegExp( '/title="Special:Log\/delete/', $line, 'link has title attribute' ); - $this->assertRegExp( "/$expectedLinkText/", $line, 'link text' ); + $this->assertRegExp( "/dellogpage/", $line, 'link text' ); } public function testRecentChangesLine_DiffHistLinks() { @@ -110,14 +108,14 @@ class OldChangesListTest extends MediaWikiLangTestCase { $line = $oldChangesList->recentChangesLine( $recentChange, false, 1 ); - $this->assertRegExp( - "/N<\/abbr>/", + $this->assertContains( + "(newpageletter)", $line, 'new page flag' ); - $this->assertRegExp( - "/b<\/abbr>/", + $this->assertContains( + "(boteditletter)", $line, 'bot flag' ); @@ -181,9 +179,7 @@ class OldChangesListTest extends MediaWikiLangTestCase { private function getContext() { $user = $this->getTestUser(); $context = $this->testRecentChangesHelper->getTestContext( $user ); - - $title = Title::newFromText( 'RecentChanges', NS_SPECIAL ); - $context->setTitle( $title ); + $context->setLanguage( Language::factory( 'qqx' ) ); return $context; } diff --git a/tests/phpunit/includes/changes/TestRecentChangesHelper.php b/tests/phpunit/includes/changes/TestRecentChangesHelper.php index 0da07750e0..ad64327426 100644 --- a/tests/phpunit/includes/changes/TestRecentChangesHelper.php +++ b/tests/phpunit/includes/changes/TestRecentChangesHelper.php @@ -129,6 +129,9 @@ class TestRecentChangesHelper { $context->setUser( $user ); + $title = Title::newFromText( 'RecentChanges', NS_SPECIAL ); + $context->setTitle( $title ); + return $context; } } -- 2.20.1