jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/352561 )
Change subject: Remove check for MediaWikiTestCase::getTestSysop method
......................................................................
Remove check for MediaWikiTestCase::getTestSysop method
This should now always exist...
Change-Id: I17fb5d44798f71aea45c72fc384ca11444d61dc3
---
M repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
1 file changed, 1 insertion(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Thiemo Mättig (WMDE): Looks good to me, approved
diff --git
a/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
b/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
index 1bd278d..d273119 100644
--- a/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
+++ b/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
@@ -340,11 +340,7 @@
'Q2' => $toData,
) );
- if ( method_exists( $this, 'getTestSysop' ) ) {
- $user = $this->getTestSysop()->getUser();
- } else {
- $user = User::newFromName( 'UTSysop' );
- }
+ $user = $this->getTestSysop()->getUser();
$user->addWatch( $entityTitleLookup->getTitleForId( $fromId ) );
$interactor->mergeItems( $fromId, $toId, $ignoreConflicts,
'CustomSummary' );
--
To view, visit https://gerrit.wikimedia.org/r/352561
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I17fb5d44798f71aea45c72fc384ca11444d61dc3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
