X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fuser%2FUserTest.php;h=2721c18e9f96c689fdef4fd8f2c2280e7b1a53e6;hb=4bd87fba840a3fa2ba8c6dbcfa7f005f6708c0fa;hp=b58d71cfa180f6919783b5e8b0b5d677e61647b0;hpb=1854f53ff10f01b01217d5c821678d39bdafbbec;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/user/UserTest.php b/tests/phpunit/includes/user/UserTest.php
index b58d71cfa1..2721c18e9f 100644
--- a/tests/phpunit/includes/user/UserTest.php
+++ b/tests/phpunit/includes/user/UserTest.php
@@ -217,6 +217,8 @@ class UserTest extends MediaWikiTestCase {
 			[ 'Ab/cd', false, 'Contains slash' ],
 			[ 'Ab cd', true, 'Whitespace' ],
 			[ '192.168.1.1', false, 'IP' ],
+			[ '116.17.184.5/32', false, 'IP range' ],
+			[ '::e:f:2001/96', false, 'IPv6 range' ],
 			[ 'User:Abcd', false, 'Reserved Namespace' ],
 			[ '12abcd232', true, 'Starts with Numbers' ],
 			[ '?abcd', true, 'Start with ? mark' ],
@@ -598,7 +600,13 @@ class UserTest extends MediaWikiTestCase {
 			'wgSecretKey' => MWCryptRand::generateHex( 64, true ),
 		] );
 
+		// Unregister the hooks for proper unit testing
+		$this->mergeMwGlobalArrayValue( 'wgHooks', [
+			'PerformRetroactiveAutoblock' => []
+		] );
+
 		// 1. Log in a test user, and block them.
+		$userBlocker = $this->getTestSysop()->getUser();
 		$user1tmp = $this->getTestUser()->getUser();
 		$request1 = new FauxRequest();
 		$request1->getSession()->setUser( $user1tmp );
@@ -608,7 +616,9 @@ class UserTest extends MediaWikiTestCase {
 			'expiry' => wfTimestamp( TS_MW, $expiryFiveHours ),
 		] );
 		$block->setTarget( $user1tmp );
-		$block->insert();
+		$block->setBlocker( $userBlocker );
+		$res = $block->insert();
+		$this->assertTrue( (bool)$res['id'], 'Failed to insert block' );
 		$user1 = User::newFromSession( $request1 );
 		$user1->mBlock = $block;
 		$user1->load();
@@ -637,7 +647,8 @@ class UserTest extends MediaWikiTestCase {
 		$this->assertTrue( $user2->isAnon() );
 		$this->assertFalse( $user2->isLoggedIn() );
 		$this->assertTrue( $user2->isBlocked() );
-		$this->assertEquals( true, $user2->getBlock()->isAutoblocking() ); // Non-strict type-check.
+		// Non-strict type-check.
+		$this->assertEquals( true, $user2->getBlock()->isAutoblocking(), 'Autoblock does not work' );
 		// Can't directly compare the objects becuase of member type differences.
 		// One day this will work: $this->assertEquals( $block, $user2->getBlock() );
 		$this->assertEquals( $block->getId(), $user2->getBlock()->getId() );
@@ -670,13 +681,21 @@ class UserTest extends MediaWikiTestCase {
 			'wgSecretKey' => MWCryptRand::generateHex( 64, true ),
 		] );
 
+		// Unregister the hooks for proper unit testing
+		$this->mergeMwGlobalArrayValue( 'wgHooks', [
+			'PerformRetroactiveAutoblock' => []
+		] );
+
 		// 1. Log in a test user, and block them.
+		$userBlocker = $this->getTestSysop()->getUser();
 		$testUser = $this->getTestUser()->getUser();
 		$request1 = new FauxRequest();
 		$request1->getSession()->setUser( $testUser );
 		$block = new Block( [ 'enableAutoblock' => true ] );
 		$block->setTarget( $testUser );
-		$block->insert();
+		$block->setBlocker( $userBlocker );
+		$res = $block->insert();
+		$this->assertTrue( (bool)$res['id'], 'Failed to insert block' );
 		$user = User::newFromSession( $request1 );
 		$user->mBlock = $block;
 		$user->load();
@@ -706,13 +725,22 @@ class UserTest extends MediaWikiTestCase {
 			'wgCookiePrefix' => 'wm_infinite_block',
 			'wgSecretKey' => MWCryptRand::generateHex( 64, true ),
 		] );
+
+		// Unregister the hooks for proper unit testing
+		$this->mergeMwGlobalArrayValue( 'wgHooks', [
+			'PerformRetroactiveAutoblock' => []
+		] );
+
 		// 1. Log in a test user, and block them indefinitely.
+		$userBlocker = $this->getTestSysop()->getUser();
 		$user1Tmp = $this->getTestUser()->getUser();
 		$request1 = new FauxRequest();
 		$request1->getSession()->setUser( $user1Tmp );
 		$block = new Block( [ 'enableAutoblock' => true, 'expiry' => 'infinity' ] );
 		$block->setTarget( $user1Tmp );
-		$block->insert();
+		$block->setBlocker( $userBlocker );
+		$res = $block->insert();
+		$this->assertTrue( (bool)$res['id'], 'Failed to insert block' );
 		$user1 = User::newFromSession( $request1 );
 		$user1->mBlock = $block;
 		$user1->load();
@@ -793,13 +821,21 @@ class UserTest extends MediaWikiTestCase {
 			'wgSecretKey' => MWCryptRand::generateHex( 64, true ),
 		] );
 
+		// Unregister the hooks for proper unit testing
+		$this->mergeMwGlobalArrayValue( 'wgHooks', [
+			'PerformRetroactiveAutoblock' => []
+		] );
+
 		// 1. Log in a blocked test user.
+		$userBlocker = $this->getTestSysop()->getUser();
 		$user1tmp = $this->getTestUser()->getUser();
 		$request1 = new FauxRequest();
 		$request1->getSession()->setUser( $user1tmp );
 		$block = new Block( [ 'enableAutoblock' => true ] );
 		$block->setTarget( $user1tmp );
-		$block->insert();
+		$block->setBlocker( $userBlocker );
+		$res = $block->insert();
+		$this->assertTrue( (bool)$res['id'], 'Failed to insert block' );
 		$user1 = User::newFromSession( $request1 );
 		$user1->mBlock = $block;
 		$user1->load();
@@ -830,13 +866,21 @@ class UserTest extends MediaWikiTestCase {
 			'wgSecretKey' => null,
 		] );
 
+		// Unregister the hooks for proper unit testing
+		$this->mergeMwGlobalArrayValue( 'wgHooks', [
+			'PerformRetroactiveAutoblock' => []
+		] );
+
 		// 1. Log in a blocked test user.
+		$userBlocker = $this->getTestSysop()->getUser();
 		$user1tmp = $this->getTestUser()->getUser();
 		$request1 = new FauxRequest();
 		$request1->getSession()->setUser( $user1tmp );
 		$block = new Block( [ 'enableAutoblock' => true ] );
 		$block->setTarget( $user1tmp );
-		$block->insert();
+		$block->setBlocker( $userBlocker );
+		$res = $block->insert();
+		$this->assertTrue( (bool)$res['id'], 'Failed to insert block' );
 		$user1 = User::newFromSession( $request1 );
 		$user1->mBlock = $block;
 		$user1->load();