dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "rdbms: lower value of MAX_LAG_DEFAULT to 6"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
specials
/
SpecialBlockTest.php
diff --git
a/tests/phpunit/includes/specials/SpecialBlockTest.php
b/tests/phpunit/includes/specials/SpecialBlockTest.php
index
e2c0084
..
0643e0e
100644
(file)
--- a/
tests/phpunit/includes/specials/SpecialBlockTest.php
+++ b/
tests/phpunit/includes/specials/SpecialBlockTest.php
@@
-2,6
+2,7
@@
use MediaWiki\Block\BlockRestriction;
use MediaWiki\Block\Restriction\PageRestriction;
use MediaWiki\Block\BlockRestriction;
use MediaWiki\Block\Restriction\PageRestriction;
+use MediaWiki\Block\Restriction\NamespaceRestriction;
use Wikimedia\TestingAccessWrapper;
/**
use Wikimedia\TestingAccessWrapper;
/**
@@
-28,6
+29,7
@@
class SpecialBlockTest extends SpecialPageTestBase {
public function testGetFormFields() {
$this->setMwGlobals( [
'wgEnablePartialBlocks' => false,
public function testGetFormFields() {
$this->setMwGlobals( [
'wgEnablePartialBlocks' => false,
+ 'wgBlockAllowsUTEdit' => true,
] );
$page = $this->newSpecialPage();
$wrappedPage = TestingAccessWrapper::newFromObject( $page );
] );
$page = $this->newSpecialPage();
$wrappedPage = TestingAccessWrapper::newFromObject( $page );
@@
-45,6
+47,7
@@
class SpecialBlockTest extends SpecialPageTestBase {
$this->assertArrayNotHasKey( 'EditingRestriction', $fields );
$this->assertArrayNotHasKey( 'PageRestrictions', $fields );
$this->assertArrayNotHasKey( 'EditingRestriction', $fields );
$this->assertArrayNotHasKey( 'PageRestrictions', $fields );
+ $this->assertArrayNotHasKey( 'NamespaceRestrictions', $fields );
}
/**
}
/**
@@
-60,6
+63,7
@@
class SpecialBlockTest extends SpecialPageTestBase {
$this->assertArrayHasKey( 'EditingRestriction', $fields );
$this->assertArrayHasKey( 'PageRestrictions', $fields );
$this->assertArrayHasKey( 'EditingRestriction', $fields );
$this->assertArrayHasKey( 'PageRestrictions', $fields );
+ $this->assertArrayHasKey( 'NamespaceRestrictions', $fields );
}
/**
}
/**
@@
-68,6
+72,7
@@
class SpecialBlockTest extends SpecialPageTestBase {
public function testMaybeAlterFormDefaults() {
$this->setMwGlobals( [
'wgEnablePartialBlocks' => false,
public function testMaybeAlterFormDefaults() {
$this->setMwGlobals( [
'wgEnablePartialBlocks' => false,
+ 'wgBlockAllowsUTEdit' => true,
] );
$block = $this->insertBlock();
] );
$block = $this->insertBlock();
@@
-115,6
+120,7
@@
class SpecialBlockTest extends SpecialPageTestBase {
$block->setRestrictions( [
new PageRestriction( 0, $pageSaturn->getId() ),
new PageRestriction( 0, $pageMars->getId() ),
$block->setRestrictions( [
new PageRestriction( 0, $pageSaturn->getId() ),
new PageRestriction( 0, $pageMars->getId() ),
+ new NamespaceRestriction( 0, NS_TALK ),
] );
$block->insert();
] );
$block->insert();
@@
-228,7
+234,7
@@
class SpecialBlockTest extends SpecialPageTestBase {
/**
* @covers ::processForm()
*/
/**
* @covers ::processForm()
*/
- public function testProcessFormRestictions() {
+ public function testProcessFormRest
r
ictions() {
$this->setMwGlobals( [
'wgEnablePartialBlocks' => true,
] );
$this->setMwGlobals( [
'wgEnablePartialBlocks' => true,
] );
@@
-262,6
+268,7
@@
class SpecialBlockTest extends SpecialPageTestBase {
'Watch' => '0',
'EditingRestriction' => 'partial',
'PageRestrictions' => implode( "\n", $titles ),
'Watch' => '0',
'EditingRestriction' => 'partial',
'PageRestrictions' => implode( "\n", $titles ),
+ 'NamespaceRestrictions' => '',
];
$result = $page->processForm( $data, $context );
];
$result = $page->processForm( $data, $context );
@@
-315,6
+322,7
@@
class SpecialBlockTest extends SpecialPageTestBase {
'Watch' => '0',
'EditingRestriction' => 'partial',
'PageRestrictions' => implode( "\n", $titles ),
'Watch' => '0',
'EditingRestriction' => 'partial',
'PageRestrictions' => implode( "\n", $titles ),
+ 'NamespaceRestrictions' => '',
];
$result = $page->processForm( $data, $context );
];
$result = $page->processForm( $data, $context );