jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/379301 )
Change subject: Add @medium for api unit tests
......................................................................
Add @medium for api unit tests
ApiTestCase needs that
Move the TestCase to autoloader and remove the require_once
Change-Id: I4351675bde0d172972b87ae4f0a8f3b67b5a8749
---
M EtherEditor.php
M EtherEditorHooks.php
M tests/phpunit/api/CreateNewPadFromPageTest.php
M tests/phpunit/api/DeleteEtherPadTest.php
M tests/phpunit/api/EtherEditorApiTestCase.php
M tests/phpunit/api/EtherPadAuthTest.php
M tests/phpunit/api/ForkEtherPadTest.php
M tests/phpunit/api/GetContribsTest.php
M tests/phpunit/api/GetCurrentUsersTest.php
M tests/phpunit/api/GetEtherPadTextTest.php
M tests/phpunit/api/GetOtherEtherpadsTest.php
M tests/phpunit/api/KickFromPadTest.php
12 files changed, 15 insertions(+), 15 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
Zoranzoki21: Looks good to me, but someone else must approve
diff --git a/EtherEditor.php b/EtherEditor.php
index 99089f5..b759c52 100644
--- a/EtherEditor.php
+++ b/EtherEditor.php
@@ -37,6 +37,7 @@
'GetOtherEtherpads' => '/api/GetOtherEtherpads',
'CreateNewPadFromPage' => '/api/CreateNewPadFromPage',
'SpecialEtherEditor' => '/includes/special/SpecialEtherEditor',
+ 'EtherEditorApiTestCase' =>
'/tests/phpunit/api/EtherEditorApiTestCase',
) as $module => $path ) {
$wgAutoloadClasses[$module] = $dir . $path . '.php';
}
diff --git a/EtherEditorHooks.php b/EtherEditorHooks.php
index bfad40c..9c32725 100644
--- a/EtherEditorHooks.php
+++ b/EtherEditorHooks.php
@@ -217,7 +217,6 @@
public static function registerUnitTests( &$files ) {
$testDir = dirname( __FILE__ ) . '/tests/phpunit/';
$files[] = $testDir . 'EtherEditorTest.php';
- $files[] = $testDir . 'api/EtherEditorApiTestCase.php';
$files[] = $testDir . 'api/GetEtherPadTextTest.php';
$files[] = $testDir . 'api/EtherPadAuthTest.php';
$files[] = $testDir . 'api/ForkEtherPadTest.php';
diff --git a/tests/phpunit/api/CreateNewPadFromPageTest.php
b/tests/phpunit/api/CreateNewPadFromPageTest.php
index 3434556..a7c2b73 100644
--- a/tests/phpunit/api/CreateNewPadFromPageTest.php
+++ b/tests/phpunit/api/CreateNewPadFromPageTest.php
@@ -7,14 +7,13 @@
* @group API
* @group Database
* @group EtherEditor
+ * @group medium
*
* @since 0.3.0
*
* @license GNU GPL v2+
* @author Mark Holmquist <[email protected]>
*/
-
-require_once( 'EtherEditorApiTestCase.php' );
class CreateNewPadFromPageTest extends EtherEditorApiTestCase {
function assertWeGetPad() {
diff --git a/tests/phpunit/api/DeleteEtherPadTest.php
b/tests/phpunit/api/DeleteEtherPadTest.php
index 0f8bf10..0314f3e 100644
--- a/tests/phpunit/api/DeleteEtherPadTest.php
+++ b/tests/phpunit/api/DeleteEtherPadTest.php
@@ -7,14 +7,13 @@
* @group API
* @group Database
* @group EtherEditor
+ * @group medium
*
* @since 0.2.5
*
* @license GNU GPL v2+
* @author Mark Holmquist <[email protected]>
*/
-
-require_once( 'EtherEditorApiTestCase.php' );
class DeleteEtherPadTest extends EtherEditorApiTestCase {
function doRequest( $dbId ) {
diff --git a/tests/phpunit/api/EtherEditorApiTestCase.php
b/tests/phpunit/api/EtherEditorApiTestCase.php
index f22960e..4b2744d 100644
--- a/tests/phpunit/api/EtherEditorApiTestCase.php
+++ b/tests/phpunit/api/EtherEditorApiTestCase.php
@@ -4,6 +4,11 @@
*
* @file EtherEditorApiTestCase.php
*
+ * @group API
+ * @group Database
+ * @group EtherEditor
+ * @group medium
+ *
* @since 0.2.5
*
* @license GNU GPL v2+
diff --git a/tests/phpunit/api/EtherPadAuthTest.php
b/tests/phpunit/api/EtherPadAuthTest.php
index 1154d56..ef088bc 100644
--- a/tests/phpunit/api/EtherPadAuthTest.php
+++ b/tests/phpunit/api/EtherPadAuthTest.php
@@ -7,14 +7,13 @@
* @group API
* @group Database
* @group EtherEditor
+ * @group medium
*
* @since 0.2.5
*
* @license GNU GPL v2+
* @author Mark Holmquist <[email protected]>
*/
-
-require_once( 'EtherEditorApiTestCase.php' );
class EtherPadAuthTest extends EtherEditorApiTestCase {
function setUp() {
diff --git a/tests/phpunit/api/ForkEtherPadTest.php
b/tests/phpunit/api/ForkEtherPadTest.php
index 7567f93..a368f5b 100644
--- a/tests/phpunit/api/ForkEtherPadTest.php
+++ b/tests/phpunit/api/ForkEtherPadTest.php
@@ -7,14 +7,13 @@
* @group API
* @group Database
* @group EtherEditor
+ * @group medium
*
* @since 0.2.5
*
* @license GNU GPL v2+
* @author Mark Holmquist <[email protected]>
*/
-
-require_once( 'EtherEditorApiTestCase.php' );
class ForkEtherPadTest extends EtherEditorApiTestCase {
function testForkOccursWithRightText() {
diff --git a/tests/phpunit/api/GetContribsTest.php
b/tests/phpunit/api/GetContribsTest.php
index b8657bf..d03a254 100644
--- a/tests/phpunit/api/GetContribsTest.php
+++ b/tests/phpunit/api/GetContribsTest.php
@@ -7,14 +7,13 @@
* @group API
* @group Database
* @group EtherEditor
+ * @group medium
*
* @since 0.2.5
*
* @license GNU GPL v2+
* @author Mark Holmquist <[email protected]>
*/
-
-require_once( 'EtherEditorApiTestCase.php' );
class GetContribsTest extends EtherEditorApiTestCase {
function testContribsGet() {
diff --git a/tests/phpunit/api/GetCurrentUsersTest.php
b/tests/phpunit/api/GetCurrentUsersTest.php
index 22a491c..3a023a8 100644
--- a/tests/phpunit/api/GetCurrentUsersTest.php
+++ b/tests/phpunit/api/GetCurrentUsersTest.php
@@ -7,14 +7,13 @@
* @group API
* @group Database
* @group EtherEditor
+ * @group medium
*
* @since 0.4.0
*
* @license GNU GPL v2+
* @author Mark Holmquist <[email protected]>
*/
-
-require_once( 'EtherEditorApiTestCase.php' );
class GetCurrentUsersTest extends EtherEditorApiTestCase {
function testEmptyUsersGet() {
diff --git a/tests/phpunit/api/GetEtherPadTextTest.php
b/tests/phpunit/api/GetEtherPadTextTest.php
index 0f023aa..d099fe0 100644
--- a/tests/phpunit/api/GetEtherPadTextTest.php
+++ b/tests/phpunit/api/GetEtherPadTextTest.php
@@ -7,6 +7,7 @@
* @group API
* @group Database
* @group EtherEditor
+ * @group medium
*
* @since 0.2.5
*
diff --git a/tests/phpunit/api/GetOtherEtherpadsTest.php
b/tests/phpunit/api/GetOtherEtherpadsTest.php
index 005ad7b..5f95934 100644
--- a/tests/phpunit/api/GetOtherEtherpadsTest.php
+++ b/tests/phpunit/api/GetOtherEtherpadsTest.php
@@ -7,14 +7,13 @@
* @group API
* @group Database
* @group EtherEditor
+ * @group medium
*
* @since 0.3.0
*
* @license GNU GPL v2+
* @author Mark Holmquist <[email protected]>
*/
-
-require_once( 'EtherEditorApiTestCase.php' );
class GetOtherEtherpadsTest extends EtherEditorApiTestCase {
function setUp() {
diff --git a/tests/phpunit/api/KickFromPadTest.php
b/tests/phpunit/api/KickFromPadTest.php
index 6dbece4..b590c22 100644
--- a/tests/phpunit/api/KickFromPadTest.php
+++ b/tests/phpunit/api/KickFromPadTest.php
@@ -7,6 +7,7 @@
* @group API
* @group Database
* @group EtherEditor
+ * @group medium
*
* @since 0.2.5
*
--
To view, visit https://gerrit.wikimedia.org/r/379301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4351675bde0d172972b87ae4f0a8f3b67b5a8749
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EtherEditor
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Zoranzoki21 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
