jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378882 )
Change subject: fix phpunit tests
......................................................................
fix phpunit tests
* BSApiCategoryStoreTest
* BSApiCategoryTreeStoreTest
* BSApiInterwikiStoreTest
Change-Id: Ia0c456e88fb3b27fcb39cb724dbc12bc572fdaf9
---
M tests/phpunit/api/BSApiCategoryStoreTest.php
M tests/phpunit/api/BSApiCategoryTreeStoreTest.php
M tests/phpunit/api/BSApiInterwikiStoreTest.php
3 files changed, 7 insertions(+), 12 deletions(-)
Approvals:
Mglaser: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/api/BSApiCategoryStoreTest.php
b/tests/phpunit/api/BSApiCategoryStoreTest.php
index d8e4973..124a206 100644
--- a/tests/phpunit/api/BSApiCategoryStoreTest.php
+++ b/tests/phpunit/api/BSApiCategoryStoreTest.php
@@ -3,9 +3,9 @@
/**
* The base fixture has changed since MW 1.27. Therefore the test is marked
* broken until BlueSpice updates its compatibility.
- * @group Broken
* @group medium
* @group api
+ * @group Database
* @group BlueSpice
* @group BlueSpiceFoundation
*/
@@ -58,10 +58,7 @@
'cl_to' => "Dummy test"
) );
- $oDbw->insert( 'page', array(
- 'page_title' => "Dummy test 2",
- 'page_namespace' => NS_CATEGORY
- ) );
+ $this->insertPage( "Dummy test 2", "Text Dummy test 2",
NS_CATEGORY );
}
protected function createStoreFixtureData() {
diff --git a/tests/phpunit/api/BSApiCategoryTreeStoreTest.php
b/tests/phpunit/api/BSApiCategoryTreeStoreTest.php
index f9a7f15..4e5e889 100644
--- a/tests/phpunit/api/BSApiCategoryTreeStoreTest.php
+++ b/tests/phpunit/api/BSApiCategoryTreeStoreTest.php
@@ -3,9 +3,9 @@
/**
* The base fixture has changed since MW 1.27. Therefore the test is marked
* broken until BlueSpice updates its compatibility.
- * @group Broken
* @group medium
* @group api
+ * @group Database
* @group BlueSpice
* @group BlueSpiceFoundation
*/
@@ -46,10 +46,7 @@
'cl_to' => "Dummy test"
) );
- $oDbw->insert( 'page', array(
- 'page_title' => "Dummy test 2",
- 'page_namespace' => NS_CATEGORY
- ) );
+ $this->insertPage( "Dummy test 2", "Text Dummy test 2",
NS_CATEGORY );
}
protected function createStoreFixtureData() {
diff --git a/tests/phpunit/api/BSApiInterwikiStoreTest.php
b/tests/phpunit/api/BSApiInterwikiStoreTest.php
index 016b48a..7ed7cc9 100644
--- a/tests/phpunit/api/BSApiInterwikiStoreTest.php
+++ b/tests/phpunit/api/BSApiInterwikiStoreTest.php
@@ -3,11 +3,12 @@
/**
* There was a change in adressing IW links in MW > 1.27. BlueSpice is testing
* with MW 1.27, so adding the group "Broken" until we update our compatibility
- * @group Broken
* @group medium
* @group api
+ * @group Database
* @group BlueSpice
* @group BlueSpiceFoundation
+ * @group Daniel
*/
class BSApiInterwikiStoreTest extends BSApiExtJSStoreTestBase {
protected $iFixtureTotal = 3;
@@ -36,7 +37,7 @@
}
protected function createStoreFixtureData() {
- $oDbw = wfGetDB( DB_MASTER );
+ $oDbw = $this->db;
$oDbw->insert( 'interwiki', array(
'iw_prefix' => "Dummy",
'iw_url' => "http://wiki.dummy.org/$1";,
--
To view, visit https://gerrit.wikimedia.org/r/378882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0c456e88fb3b27fcb39cb724dbc12bc572fdaf9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt <daniel.vo...@hallowelt.com>
Gerrit-Reviewer: Ljonka <l.verhovs...@gmail.com>
Gerrit-Reviewer: Mglaser <gla...@hallowelt.biz>
Gerrit-Reviewer: Pwirth <wi...@hallowelt.biz>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
