Merge "user: Unregister hooks that interfere with unit testing"

diff --git a/tests/phpunit/includes/user/PasswordResetTest.php b/tests/phpunit/includes/user/PasswordResetTest.php
index 53f02df..feae26a 100644 (file)
--- a/tests/phpunit/includes/user/PasswordResetTest.php
+++ b/tests/phpunit/includes/user/PasswordResetTest.php
@@ -5,7 +5,7 @@ use MediaWiki\Auth\AuthManager;
 /**
  * @group Database
  */
-class PasswordResetTest extends PHPUnit_Framework_TestCase {
+class PasswordResetTest extends MediaWikiTestCase {
        /**
         * @dataProvider provideIsAllowed
         */
@@ -150,6 +150,12 @@ class PasswordResetTest extends PHPUnit_Framework_TestCase {
                        'EnableEmail' => true,
                ] );
 
+               // Unregister the hooks for proper unit testing
+               $this->mergeMwGlobalArrayValue( 'wgHooks', [
+                       'mailPasswordInternal' => [],
+                       'SpecialPasswordResetOnSubmit' => [],
+               ] );
+
                $authManager = $this->getMockBuilder( AuthManager::class )->disableOriginalConstructor()
                        ->getMock();
                $authManager->expects( $this->any() )->method( 'allowsAuthenticationDataChange' )