From: aude <aude.wiki@gmail.com>
Date: Fri, 25 Jul 2014 16:39:07 +0000 (+0200)
Subject: Add $logAction param for test recent changes helper
X-Git-Tag: 1.31.0-rc.0~14235
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=7c30ba9afadb597022cfaa94d375f1ff1e4baaeb;p=lhc%2Fweb%2Fwiklou.git

Add $logAction param for test recent changes helper

to allow testing with various types of log actions

Change-Id: Idc78c964a68e98239265aaaa9e7913d477a3298f
---

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'
 			)
 		);