From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 11 Sep 2018 20:50:06 +0000 (+0000)
Subject: Merge "test: disable hook when testing default preferences"
X-Git-Tag: 1.34.0-rc.0~4123
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=ec144bdf18cea555602cca7d5fdf0c4ad7968704;hp=c25bee0d0ddc7693a9299f5f3aa260846bc36bca;p=lhc%2Fweb%2Fwiklou.git

Merge "test: disable hook when testing default preferences"
---

diff --git a/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php b/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php
index 43c678e928..2eec5ce238 100644
--- a/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php
+++ b/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php
@@ -63,6 +63,8 @@ class DefaultPreferencesFactoryTest extends MediaWikiTestCase {
 	 * @covers MediaWiki\Preferences\DefaultPreferencesFactory::getForm()
 	 */
 	public function testGetForm() {
+		$this->setTemporaryHook( 'GetPreferences', null );
+
 		$testUser = $this->getTestUser();
 		$form = $this->getPreferencesFactory()->getForm( $testUser->getUser(), $this->context );
 		$this->assertInstanceOf( PreferencesFormLegacy::class, $form );