From: Thalia <thalia.e.chan@googlemail.com>
Date: Tue, 19 Feb 2019 20:16:21 +0000 (+0000)
Subject: Set BlockDisablesLogin false for Blocking group tests that assume this
X-Git-Tag: 1.34.0-rc.0~2767^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=f5809ea9882d22a6bc5577693a313891c9e1cd03;p=lhc%2Fweb%2Fwiklou.git

Set BlockDisablesLogin false for Blocking group tests that assume this

The global config $wgBlockDisablesLogin can override certain block flags
if true, causing some tests to fail. Set it to false for these tests.

Change-Id: I497ef07bd34a1e458fd9692ef4874474e61151c8
---

diff --git a/tests/phpunit/includes/BlockTest.php b/tests/phpunit/includes/BlockTest.php
index a1510809ac..f20481bde7 100644
--- a/tests/phpunit/includes/BlockTest.php
+++ b/tests/phpunit/includes/BlockTest.php
@@ -616,6 +616,9 @@ class BlockTest extends MediaWikiLangTestCase {
 	 * @covers Block::appliesToTitle
 	 */
 	public function testAppliesToTitleReturnsTrueOnSitewideBlock() {
+		$this->setMwGlobals( [
+			'wgBlockDisablesLogin' => false,
+		] );
 		$user = $this->getTestUser()->getUser();
 		$block = new Block( [
 			'expiry' => wfTimestamp( TS_MW, wfTimestamp() + ( 40 * 60 * 60 ) ),
@@ -642,6 +645,9 @@ class BlockTest extends MediaWikiLangTestCase {
 	 * @covers Block::appliesToTitle
 	 */
 	public function testAppliesToTitleOnPartialBlock() {
+		$this->setMwGlobals( [
+			'wgBlockDisablesLogin' => false,
+		] );
 		$user = $this->getTestUser()->getUser();
 		$block = new Block( [
 			'expiry' => wfTimestamp( TS_MW, wfTimestamp() + ( 40 * 60 * 60 ) ),
@@ -673,6 +679,9 @@ class BlockTest extends MediaWikiLangTestCase {
 	 * @covers Block::appliesToPage
 	 */
 	public function testAppliesToReturnsTrueOnSitewideBlock() {
+		$this->setMwGlobals( [
+			'wgBlockDisablesLogin' => false,
+		] );
 		$user = $this->getTestUser()->getUser();
 		$block = new Block( [
 			'expiry' => wfTimestamp( TS_MW, wfTimestamp() + ( 40 * 60 * 60 ) ),
@@ -697,6 +706,9 @@ class BlockTest extends MediaWikiLangTestCase {
 	 * @covers Block::appliesToPage
 	 */
 	public function testAppliesToPageOnPartialPageBlock() {
+		$this->setMwGlobals( [
+			'wgBlockDisablesLogin' => false,
+		] );
 		$user = $this->getTestUser()->getUser();
 		$block = new Block( [
 			'expiry' => wfTimestamp( TS_MW, wfTimestamp() + ( 40 * 60 * 60 ) ),
@@ -725,6 +737,9 @@ class BlockTest extends MediaWikiLangTestCase {
 	 * @covers Block::appliesToNamespace
 	 */
 	public function testAppliesToNamespaceOnPartialNamespaceBlock() {
+		$this->setMwGlobals( [
+			'wgBlockDisablesLogin' => false,
+		] );
 		$user = $this->getTestUser()->getUser();
 		$block = new Block( [
 			'expiry' => wfTimestamp( TS_MW, wfTimestamp() + ( 40 * 60 * 60 ) ),
@@ -749,6 +764,9 @@ class BlockTest extends MediaWikiLangTestCase {
 	 * @covers Block::prevents
 	 */
 	public function testBlockAllowsPurge() {
+		$this->setMwGlobals( [
+			'wgBlockDisablesLogin' => false,
+		] );
 		$block = new Block();
 		$this->assertFalse( $block->prevents( 'purge' ) );
 	}
diff --git a/tests/phpunit/includes/block/BlockRestrictionTest.php b/tests/phpunit/includes/block/BlockRestrictionTest.php
index 2d78018c4a..5bbd3d023d 100644
--- a/tests/phpunit/includes/block/BlockRestrictionTest.php
+++ b/tests/phpunit/includes/block/BlockRestrictionTest.php
@@ -25,6 +25,9 @@ class BlockRestrictionTest extends \MediaWikiLangTestCase {
 	 * @covers ::rowToRestriction
 	 */
 	public function testLoadMultipleRestrictions() {
+		$this->setMwGlobals( [
+			'wgBlockDisablesLogin' => false,
+		] );
 		$block = $this->insertBlock();
 
 		$pageFoo = $this->getExistingTestPage( 'Foo' );
diff --git a/tests/phpunit/includes/specials/SpecialBlockTest.php b/tests/phpunit/includes/specials/SpecialBlockTest.php
index a17f39dba4..0b3adc031f 100644
--- a/tests/phpunit/includes/specials/SpecialBlockTest.php
+++ b/tests/phpunit/includes/specials/SpecialBlockTest.php
@@ -401,6 +401,9 @@ class SpecialBlockTest extends SpecialPageTestBase {
 		$expectedResult,
 		$reason
 	) {
+		$this->setMwGlobals( [
+			'wgBlockDisablesLogin' => false,
+		] );
 		$this->setGroupPermissions( 'sysop', 'unblockself', true );
 		$this->setGroupPermissions( 'user', 'block', true );
 		// Getting errors about creating users in db in provider.