jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/313654 )
Change subject: Remove UnitTestsList hook subscriber
......................................................................
Remove UnitTestsList hook subscriber
Bug: T142121
Change-Id: Iac91c86fc66ef99bbc838b7458e8efcdcd2bcfb8
---
M BounceHandlerHooks.php
M extension.json
R tests/phpunit/ApiBounceHandlerTest.php
R tests/phpunit/ProcessBounceWithRegexTest.php
R tests/phpunit/PruneOldBounceRecordsTest.php
R tests/phpunit/UnSubscribeUserTest.php
R tests/phpunit/VERPEncodeDecodeTest.php
R tests/phpunit/bounce_emails/email1
R tests/phpunit/bounce_emails/email2
R tests/phpunit/bounce_emails/emailStatus1
R tests/phpunit/bounce_emails/emailStatus2
R tests/phpunit/bounce_emails/emailStatus3
R tests/phpunit/bounce_emails/oracle7
13 files changed, 0 insertions(+), 31 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/BounceHandlerHooks.php b/BounceHandlerHooks.php
index 225f373..2b80d6b 100644
--- a/BounceHandlerHooks.php
+++ b/BounceHandlerHooks.php
@@ -63,34 +63,6 @@
}
/**
- * Hook to add PHPUnit test cases.
- * @see https://www.mediawiki.org/wiki/Manual:Hooks/UnitTestsList
- *
- * @param array &$files
- *
- * @return bool
- */
- public static function registerUnitTests( array &$files ) {
- // @codeCoverageIgnoreStart
- $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 );
-
- return true;
- // @codeCoverageIgnoreEnd
- }
-
- /**
* Add tables to Database
*
* @param DatabaseUpdater $updater
diff --git a/extension.json b/extension.json
index 728ad9b..80cef27 100644
--- a/extension.json
+++ b/extension.json
@@ -54,9 +54,6 @@
"UserMailerChangeReturnPath": [
"BounceHandlerHooks::onVERPAddressGenerate"
],
- "UnitTestsList": [
- "BounceHandlerHooks::registerUnitTests"
- ],
"LoadExtensionSchemaUpdates": [
"BounceHandlerHooks::loadExtensionSchemaUpdates"
],
diff --git a/tests/ApiBounceHandlerTest.php
b/tests/phpunit/ApiBounceHandlerTest.php
similarity index 100%
rename from tests/ApiBounceHandlerTest.php
rename to tests/phpunit/ApiBounceHandlerTest.php
diff --git a/tests/ProcessBounceWithRegexTest.php
b/tests/phpunit/ProcessBounceWithRegexTest.php
similarity index 100%
rename from tests/ProcessBounceWithRegexTest.php
rename to tests/phpunit/ProcessBounceWithRegexTest.php
diff --git a/tests/PruneOldBounceRecordsTest.php
b/tests/phpunit/PruneOldBounceRecordsTest.php
similarity index 100%
rename from tests/PruneOldBounceRecordsTest.php
rename to tests/phpunit/PruneOldBounceRecordsTest.php
diff --git a/tests/UnSubscribeUserTest.php
b/tests/phpunit/UnSubscribeUserTest.php
similarity index 100%
rename from tests/UnSubscribeUserTest.php
rename to tests/phpunit/UnSubscribeUserTest.php
diff --git a/tests/VERPEncodeDecodeTest.php
b/tests/phpunit/VERPEncodeDecodeTest.php
similarity index 100%
rename from tests/VERPEncodeDecodeTest.php
rename to tests/phpunit/VERPEncodeDecodeTest.php
diff --git a/tests/bounce_emails/email1 b/tests/phpunit/bounce_emails/email1
similarity index 100%
rename from tests/bounce_emails/email1
rename to tests/phpunit/bounce_emails/email1
diff --git a/tests/bounce_emails/email2 b/tests/phpunit/bounce_emails/email2
similarity index 100%
rename from tests/bounce_emails/email2
rename to tests/phpunit/bounce_emails/email2
diff --git a/tests/bounce_emails/emailStatus1
b/tests/phpunit/bounce_emails/emailStatus1
similarity index 100%
rename from tests/bounce_emails/emailStatus1
rename to tests/phpunit/bounce_emails/emailStatus1
diff --git a/tests/bounce_emails/emailStatus2
b/tests/phpunit/bounce_emails/emailStatus2
similarity index 100%
rename from tests/bounce_emails/emailStatus2
rename to tests/phpunit/bounce_emails/emailStatus2
diff --git a/tests/bounce_emails/emailStatus3
b/tests/phpunit/bounce_emails/emailStatus3
similarity index 100%
rename from tests/bounce_emails/emailStatus3
rename to tests/phpunit/bounce_emails/emailStatus3
diff --git a/tests/bounce_emails/oracle7 b/tests/phpunit/bounce_emails/oracle7
similarity index 100%
rename from tests/bounce_emails/oracle7
rename to tests/phpunit/bounce_emails/oracle7
--
To view, visit https://gerrit.wikimedia.org/r/313654
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iac91c86fc66ef99bbc838b7458e8efcdcd2bcfb8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BounceHandler
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
