jenkins-bot has submitted this change and it was merged. Change subject: testInvalidEmail() passes now without local config ......................................................................
testInvalidEmail() passes now without local config ApiAccountCreationTest::testInvalidEmail() no longer needs LocalSettings to have $wgEnableEmail = true; Change-Id: I97803be116fda8194e46fe0021c7b32d7b703b1d --- M tests/phpunit/includes/api/ApiAccountCreationTest.php 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: Parent5446: Looks good to me, approved Umherirrender: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/tests/phpunit/includes/api/ApiAccountCreationTest.php b/tests/phpunit/includes/api/ApiAccountCreationTest.php index f37e279..94082e5 100644 --- a/tests/phpunit/includes/api/ApiAccountCreationTest.php +++ b/tests/phpunit/includes/api/ApiAccountCreationTest.php @@ -9,6 +9,7 @@ function setUp() { parent::setUp(); LoginForm::setCreateaccountToken(); + $this->setMwGlobals( array( 'wgEnableEmail' => true ) ); } /** @@ -141,10 +142,6 @@ * @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', -- To view, visit https://gerrit.wikimedia.org/r/48251 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I97803be116fda8194e46fe0021c7b32d7b703b1d Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Platonides <platoni...@gmail.com> Gerrit-Reviewer: Hazard-SJ <hazard...@yahoo.com> Gerrit-Reviewer: Parent5446 <tylerro...@gmail.com> Gerrit-Reviewer: Siebrand <siebr...@wikimedia.org> Gerrit-Reviewer: Umherirrender <umherirrender_de...@web.de> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits