jenkins-bot has submitted this change and it was merged.
Change subject: Use test sites in ActionTestCase
......................................................................
Use test sites in ActionTestCase
In Client+Repo wikis these are needed for the client
hooks.
Change-Id: Iebc4e3f8d15a25ef2c2c4ec657fc014cb7fed5fc
---
M repo/tests/phpunit/includes/actions/ActionTestCase.php
M repo/tests/phpunit/includes/actions/ViewEntityActionTest.php
2 files changed, 7 insertions(+), 3 deletions(-)
Approvals:
Addshore: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/tests/phpunit/includes/actions/ActionTestCase.php
b/repo/tests/phpunit/includes/actions/ActionTestCase.php
index 5220f07..dac930a 100644
--- a/repo/tests/phpunit/includes/actions/ActionTestCase.php
+++ b/repo/tests/phpunit/includes/actions/ActionTestCase.php
@@ -12,13 +12,12 @@
use MWException;
use OutputPage;
use RequestContext;
-use Status;
use Title;
use User;
-use WebRequest;
use Wikibase\Item;
use Wikibase\ItemContent;
use WikiPage;
+use TestSites;
/**
* @licence GNU GPL v2+
@@ -41,6 +40,12 @@
public function setUp() {
parent::setUp();
+ static $setUp = false;
+ if ( !$setUp ) {
+ TestSites::insertIntoDb();
+ $setUp = true;
+ }
+
$lang = Language::factory( $this->language );
$user = new User();
$user->setName( "ActionTestUser" );
diff --git a/repo/tests/phpunit/includes/actions/ViewEntityActionTest.php
b/repo/tests/phpunit/includes/actions/ViewEntityActionTest.php
index f14e592..56e0f5d 100644
--- a/repo/tests/phpunit/includes/actions/ViewEntityActionTest.php
+++ b/repo/tests/phpunit/includes/actions/ViewEntityActionTest.php
@@ -5,7 +5,6 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\Item;
use Wikibase\ItemContent;
-use Wikibase\EntityId;
use Wikibase\Repo\WikibaseRepo;
use WikiPage;
--
To view, visit https://gerrit.wikimedia.org/r/106683
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iebc4e3f8d15a25ef2c2c4ec657fc014cb7fed5fc
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
