jenkins-bot has submitted this change and it was merged.
Change subject: Repair thanks tests
......................................................................
Repair thanks tests
Change-Id: Ia0b34ece38ae219e5ee2c49b3d98490a503f536b
---
M tests/ApiFlowThankIntegrationTest.php
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/ApiFlowThankIntegrationTest.php
b/tests/ApiFlowThankIntegrationTest.php
index 5c7d91f..8db4c63 100644
--- a/tests/ApiFlowThankIntegrationTest.php
+++ b/tests/ApiFlowThankIntegrationTest.php
@@ -45,7 +45,7 @@
), array(), 1 );
// Set up mock classes in Container.
- $mockLoader = $this->getMockBuilder(
'\Flow\Data\RootPostLoader' )
+ $mockLoader = $this->getMockBuilder(
'\Flow\Repository\RootPostLoader' )
->disableOriginalConstructor()
->getMock();
$that = $this;
@@ -165,7 +165,8 @@
$uuidRevision = UUID::create();
$user = User::newFromName( 'UTSysop' );
- list( $userId, $userIp ) = PostRevision::userFields( $user );
+ $userId = $user->getId();
+ $userIp = null;
return $row + array(
// flow_revision
@@ -173,6 +174,7 @@
'rev_type' => 'post',
'rev_user_id' => $userId,
'rev_user_ip' => $userIp,
+ 'rev_user_wiki' => wfWikiId(),
'rev_parent_id' => null,
'rev_flags' => 'html',
'rev_content' => 'test content',
@@ -180,11 +182,13 @@
'rev_mod_state' => AbstractRevision::MODERATED_NONE,
'rev_mod_user_id' => null,
'rev_mod_user_ip' => null,
+ 'rev_mod_user_wiki' => null,
'rev_mod_timestamp' => null,
'rev_mod_reason' => null,
'rev_last_edit_id' => null,
'rev_edit_user_id' => null,
'rev_edit_user_ip' => null,
+ 'rev_edit_user_wiki' => null,
// flow_tree_revision
'tree_rev_descendant_id' => $uuidPost->getBinary(),
@@ -193,6 +197,7 @@
'tree_orig_create_time' => wfTimestampNow(),
'tree_orig_user_id' => $userId,
'tree_orig_user_ip' => $userIp,
+ 'tree_orig_user_wiki' => wfWikiId(),
'tree_parent_id' => null,
);
}
--
To view, visit https://gerrit.wikimedia.org/r/160813
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0b34ece38ae219e5ee2c49b3d98490a503f536b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
