From d962a0be6412caacf84811d89801fdce071ea8c2 Mon Sep 17 00:00:00 2001
From: Platonides <platonides@gmail.com>
Date: Sat, 9 Feb 2013 19:57:03 +0100
Subject: [PATCH] testInvalidEmail() passes now without local config

ApiAccountCreationTest::testInvalidEmail() no longer
needs LocalSettings to have $wgEnableEmail = true;

Change-Id: I97803be116fda8194e46fe0021c7b32d7b703b1d
---
 tests/phpunit/includes/api/ApiAccountCreationTest.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/phpunit/includes/api/ApiAccountCreationTest.php b/tests/phpunit/includes/api/ApiAccountCreationTest.php
index f37e2799da..94082e5aff 100644
--- a/tests/phpunit/includes/api/ApiAccountCreationTest.php
+++ b/tests/phpunit/includes/api/ApiAccountCreationTest.php
@@ -9,6 +9,7 @@ class ApiCreateAccountTest extends ApiTestCase {
 	function setUp() {
 		parent::setUp();
 		LoginForm::setCreateaccountToken();
+		$this->setMwGlobals( array( 'wgEnableEmail' => true ) );
 	}
 
 	/**
@@ -141,10 +142,6 @@ class ApiCreateAccountTest extends ApiTestCase {
 	 * @expectedException UsageException
 	 */
 	function testInvalidEmail() {
-		global $wgEnableEmail;
-		if ( !$wgEnableEmail ) {
-			$this->markTestSkipped( 'email is not enabled, so createaccount does not check it' );
-		}
 		$this->doApiRequest( array(
 			'action' => 'createaccount',
 			'name' => 'Test User',
-- 
2.20.1