X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fapi%2FApiCreateAccountTest.php;h=35905c55644672c7420e132250976b59a8492a51;hb=94ba53f67731b0553a6178841d9506e384f74496;hp=a7232457b6788e729a0d3788779db174665ba5fd;hpb=f4e03271ef84e806fa2323f954674631ca9257c5;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/api/ApiCreateAccountTest.php b/tests/phpunit/includes/api/ApiCreateAccountTest.php
index a7232457b6..35905c5564 100644
--- a/tests/phpunit/includes/api/ApiCreateAccountTest.php
+++ b/tests/phpunit/includes/api/ApiCreateAccountTest.php
@@ -10,7 +10,6 @@
 class ApiCreateAccountTest extends ApiTestCase {
 	protected function setUp() {
 		parent::setUp();
-		LoginForm::setCreateaccountToken();
 		$this->setMwGlobals( array( 'wgEnableEmail' => true ) );
 	}
 
@@ -29,7 +28,7 @@ class ApiCreateAccountTest extends ApiTestCase {
 			$this->markTestIncomplete( 'This test needs $wgServer to be set in LocalSettings.php' );
 		}
 
-		$password = User::randomPassword();
+		$password = PasswordFactory::generateRandomPasswordString();
 
 		$ret = $this->doApiRequest( array(
 			'action' => 'createaccount',
@@ -45,7 +44,7 @@ class ApiCreateAccountTest extends ApiTestCase {
 
 		// Should first ask for token.
 		$a = $result['createaccount'];
-		$this->assertEquals( 'needtoken', $a['result'] );
+		$this->assertEquals( 'NeedToken', $a['result'] );
 		$token = $a['token'];
 
 		// Finally create the account
@@ -63,7 +62,7 @@ class ApiCreateAccountTest extends ApiTestCase {
 
 		$result = $ret[0];
 		$this->assertNotInternalType( 'bool', $result );
-		$this->assertEquals( 'success', $result['createaccount']['result'] );
+		$this->assertEquals( 'Success', $result['createaccount']['result'] );
 
 		// Try logging in with the new user.
 		$ret = $this->doApiRequest( array(
@@ -114,7 +113,7 @@ class ApiCreateAccountTest extends ApiTestCase {
 	public function testNoName() {
 		$this->doApiRequest( array(
 			'action' => 'createaccount',
-			'token' => LoginForm::getCreateaccountToken(),
+			'token' => LoginForm::getCreateaccountToken()->toString(),
 			'password' => 'password',
 		) );
 	}
@@ -127,7 +126,7 @@ class ApiCreateAccountTest extends ApiTestCase {
 		$this->doApiRequest( array(
 			'action' => 'createaccount',
 			'name' => 'testName',
-			'token' => LoginForm::getCreateaccountToken(),
+			'token' => LoginForm::getCreateaccountToken()->toString(),
 		) );
 	}
 
@@ -139,7 +138,7 @@ class ApiCreateAccountTest extends ApiTestCase {
 		$this->doApiRequest( array(
 			'action' => 'createaccount',
 			'name' => 'Apitestsysop',
-			'token' => LoginForm::getCreateaccountToken(),
+			'token' => LoginForm::getCreateaccountToken()->toString(),
 			'password' => 'password',
 			'email' => 'test@domain.test',
 		) );
@@ -153,7 +152,7 @@ class ApiCreateAccountTest extends ApiTestCase {
 		$this->doApiRequest( array(
 			'action' => 'createaccount',
 			'name' => 'Test User',
-			'token' => LoginForm::getCreateaccountToken(),
+			'token' => LoginForm::getCreateaccountToken()->toString(),
 			'password' => 'password',
 			'email' => 'invalid',
 		) );