jenkins-bot has submitted this change and it was merged. Change subject: Remove 'UnitTestList' hook ......................................................................
Remove 'UnitTestList' hook No longer needed now that extension unittests are autodiscovered. Bug: T142120 Change-Id: I77099ef4e659d269450c0ddb1a44e009f5406d09 --- M extension.json M includes/CollaborationKit.php R tests/phpunit/CollaborationHubContentHandlerTest.php R tests/phpunit/CollaborationHubContentTest.php 4 files changed, 0 insertions(+), 26 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 69a0434..71f5912 100644 --- a/extension.json +++ b/extension.json @@ -34,9 +34,6 @@ "CreateCollaborationHub": "SpecialCreateCollaborationHub" }, "Hooks": { - "UnitTestsList": [ - "CollaborationKitHooks::onUnitTestsList" - ], "ParserFirstCallInit": [ "CollaborationKitHooks::onParserFirstCallInit" ], diff --git a/includes/CollaborationKit.php b/includes/CollaborationKit.php index 5d332ac..241af8e 100644 --- a/includes/CollaborationKit.php +++ b/includes/CollaborationKit.php @@ -3,29 +3,6 @@ // Hooks and crap class CollaborationKitHooks { - /** - * Register our tests with PHPUnit - * - * Shamelessly stolen from MassMessage - * - * @param &$files Array List of files for PHPUnit - */ - public static function onUnitTestsList( &$files ) { - $directoryIterator = new RecursiveDirectoryIterator( __DIR__ . '/../tests/' ); - - /** - * @var SplFileInfo $fileInfo - */ - $ourFiles = []; - foreach ( new RecursiveIteratorIterator( $directoryIterator ) as $fileInfo ) { - if ( substr( $fileInfo->getFilename(), -8 ) === 'Test.php' ) { - $ourFiles[] = $fileInfo->getPathname(); - } - } - - $files = array_merge( $files, $ourFiles ); - } - public static function onParserFirstCallInit( $parser ) { $parser->setFunctionHook( 'transcludelist', 'CollaborationListContent::transcludeHook' ); // Hack for transclusion. diff --git a/tests/CollaborationHubContentHandlerTest.php b/tests/phpunit/CollaborationHubContentHandlerTest.php similarity index 100% rename from tests/CollaborationHubContentHandlerTest.php rename to tests/phpunit/CollaborationHubContentHandlerTest.php diff --git a/tests/CollaborationHubContentTest.php b/tests/phpunit/CollaborationHubContentTest.php similarity index 100% rename from tests/CollaborationHubContentTest.php rename to tests/phpunit/CollaborationHubContentTest.php -- To view, visit https://gerrit.wikimedia.org/r/303307 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I77099ef4e659d269450c0ddb1a44e009f5406d09 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CollaborationKit Gerrit-Branch: master Gerrit-Owner: Reedy <re...@wikimedia.org> Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits