diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2013-03-01 23:11:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2013-03-01 23:11:06 +0000 |
| commit | ea77ca659d8a4d15ed34ef8383a6830055d9e15c (patch) | |
| tree | 96b9d732b0c0f84e9e141900fe7cf22a0b4ef376 /tests/phpunit | |
| parent | 1b288c914751c627cf3f66275e34616c4040a4cb (diff) | |
| parent | d962a0be6412caacf84811d89801fdce071ea8c2 (diff) | |
| download | mediawikicore-ea77ca659d8a4d15ed34ef8383a6830055d9e15c.tar.gz mediawikicore-ea77ca659d8a4d15ed34ef8383a6830055d9e15c.zip | |
Merge "testInvalidEmail() passes now without local config"
Diffstat (limited to 'tests/phpunit')
| -rw-r--r-- | tests/phpunit/includes/api/ApiAccountCreationTest.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/phpunit/includes/api/ApiAccountCreationTest.php b/tests/phpunit/includes/api/ApiAccountCreationTest.php index f37e2799da6a..94082e5affb4 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', |