jenkins-bot has submitted this change and it was merged.
Change subject: Don't rely on global SiteLookup in SpecialMergeItemsTest
......................................................................
Don't rely on global SiteLookup in SpecialMergeItemsTest
This fails for me locally…
Change-Id: Ib92319b50731b8b7925c1cba2e6b0d3170134bc7
---
M repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
b/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
index 4fd70ba..2f6024b 100644
--- a/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
@@ -8,6 +8,7 @@
use RawMessage;
use Status;
use User;
+use Wikibase\ChangeOp\MergeChangeOpsFactory;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\Repo\Interactors\ItemMergeException;
use Wikibase\Repo\Interactors\ItemMergeInteractor;
@@ -82,7 +83,11 @@
$idParser =
WikibaseRepo::getDefaultInstance()->getEntityIdParser();
$summaryFormatter =
WikibaseRepo::getDefaultInstance()->getSummaryFormatter();
- $changeOpsFactory =
WikibaseRepo::getDefaultInstance()->getChangeOpFactoryProvider()->getMergeChangeOpFactory();
+ $changeOpsFactory = new MergeChangeOpsFactory(
+
WikibaseRepo::getDefaultInstance()->getEntityConstraintProvider(),
+
WikibaseRepo::getDefaultInstance()->getChangeOpFactoryProvider(),
+ MockSiteStore::newFromTestSites()
+ );
$exceptionLocalizer = $this->getMock(
'Wikibase\Lib\Localizer\ExceptionLocalizer' );
$exceptionLocalizer->expects( $this->any() )
--
To view, visit https://gerrit.wikimedia.org/r/206738
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib92319b50731b8b7925c1cba2e6b0d3170134bc7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
