Remove unncessary code from NotifUserTest

setMwGlobals() already restores global state upon teardown, so this
isn't necessary.

Change-Id: Ia2a2d7a8d3aa3c83443718d5bbf7e7ebd40af472
This commit is contained in:
Kunal Mehta 2015-11-12 11:27:36 -08:00
parent 5114aa2c26
commit c6d53ad8ed

View file

@ -73,10 +73,6 @@ class MWEchoNotifUserTest extends MediaWikiTestCase {
} }
public function testGetEmailFormat() { public function testGetEmailFormat() {
global $wgAllowHTMLEmail;
$format = $wgAllowHTMLEmail;
$user = User::newFromId( 2 ); $user = User::newFromId( 2 );
$notifUser = MWEchoNotifUser::newFromUser( $user ); $notifUser = MWEchoNotifUser::newFromUser( $user );
@ -84,8 +80,6 @@ class MWEchoNotifUserTest extends MediaWikiTestCase {
$this->assertEquals( $notifUser->getEmailFormat(), $user->getOption( 'echo-email-format' ) ); $this->assertEquals( $notifUser->getEmailFormat(), $user->getOption( 'echo-email-format' ) );
$this->setMwGlobals( 'wgAllowHTMLEmail', false ); $this->setMwGlobals( 'wgAllowHTMLEmail', false );
$this->assertEquals( $notifUser->getEmailFormat(), EchoHooks::EMAIL_FORMAT_PLAIN_TEXT ); $this->assertEquals( $notifUser->getEmailFormat(), EchoHooks::EMAIL_FORMAT_PLAIN_TEXT );
$this->setMwGlobals( 'wgAllowHTMLEmail', $format );
} }
public function testMarkRead() { public function testMarkRead() {