From 7c30ba9afadb597022cfaa94d375f1ff1e4baaeb Mon Sep 17 00:00:00 2001 From: aude Date: Fri, 25 Jul 2014 18:39:07 +0200 Subject: [PATCH] Add $logAction param for test recent changes helper to allow testing with various types of log actions Change-Id: Idc78c964a68e98239265aaaa9e7913d477a3298f --- tests/phpunit/includes/changes/OldChangesListTest.php | 6 +++--- tests/phpunit/includes/changes/RCCacheEntryFactoryTest.php | 1 + tests/phpunit/includes/changes/TestRecentChangesHelper.php | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/phpunit/includes/changes/OldChangesListTest.php b/tests/phpunit/includes/changes/OldChangesListTest.php index 9783ae3ca4..722535601f 100644 --- a/tests/phpunit/includes/changes/OldChangesListTest.php +++ b/tests/phpunit/includes/changes/OldChangesListTest.php @@ -68,7 +68,7 @@ class OldChangesListTest extends MediaWikiLangTestCase { public function testRecentChangesLine_LogTitle() { $oldChangesList = $this->getOldChangesList(); - $recentChange = $this->getLogChange( 'delete' ); + $recentChange = $this->getLogChange( 'delete', 'delete' ); $line = $oldChangesList->recentChangesLine( $recentChange, false, 1 ); @@ -110,11 +110,11 @@ class OldChangesListTest extends MediaWikiLangTestCase { return $recentChange; } - private function getLogChange( $logType ) { + private function getLogChange( $logType, $logAction ) { $user = $this->getTestUser(); $recentChange = $this->testRecentChangesHelper->makeLogRecentChange( - $logType, $user, 'Abc', '20131103212153', 0, 0 + $logType, $logAction, $user, 'Abc', '20131103212153', 0, 0 ); return $recentChange; diff --git a/tests/phpunit/includes/changes/RCCacheEntryFactoryTest.php b/tests/phpunit/includes/changes/RCCacheEntryFactoryTest.php index c3b8ce68fd..ee1a4d0e0f 100644 --- a/tests/phpunit/includes/changes/RCCacheEntryFactoryTest.php +++ b/tests/phpunit/includes/changes/RCCacheEntryFactoryTest.php @@ -123,6 +123,7 @@ class RCCacheEntryFactoryTest extends MediaWikiLangTestCase { $this->getContext(), $this->getMessages(), $this->testRecentChangesHelper->makeLogRecentChange( + 'delete', 'delete', $this->getTestUser(), 'Abc', diff --git a/tests/phpunit/includes/changes/TestRecentChangesHelper.php b/tests/phpunit/includes/changes/TestRecentChangesHelper.php index bb6ebecf48..0da07750e0 100644 --- a/tests/phpunit/includes/changes/TestRecentChangesHelper.php +++ b/tests/phpunit/includes/changes/TestRecentChangesHelper.php @@ -26,7 +26,7 @@ class TestRecentChangesHelper { return $this->makeRecentChange( $attribs, $counter, $watchingUsers ); } - public function makeLogRecentChange( $logType, User $user, $titleText, $timestamp, $counter, + public function makeLogRecentChange( $logType, $logAction, User $user, $titleText, $timestamp, $counter, $watchingUsers ) { $attribs = array_merge( @@ -42,7 +42,7 @@ class TestRecentChangesHelper { 'rc_type' => 3, 'rc_logid' => 25, 'rc_log_type' => $logType, - 'rc_log_action' => $logType, + 'rc_log_action' => $logAction, 'rc_source' => 'mw.log' ) ); -- 2.20.1