Merge "Enable configuration to supply options for Special:Search form"

[lhc/web/wiklou.git] / tests / phpunit / includes / title / NamespaceInfoTest.php

diff --git a/tests/phpunit/includes/title/NamespaceInfoTest.php b/tests/phpunit/includes/title/NamespaceInfoTest.php
index 556c640..b1262a3 100644 (file)
--- a/tests/phpunit/includes/title/NamespaceInfoTest.php
+++ b/tests/phpunit/includes/title/NamespaceInfoTest.php
@@ -601,6 +601,7 @@ class NamespaceInfoTest extends MediaWikiTestCase {
         * getSubject/Talk/Associated
         * %{
         */
+
        /**
         * @dataProvider provideSubjectTalk
         * @covers NamespaceInfo::getSubject
@@ -880,6 +881,7 @@ class NamespaceInfoTest extends MediaWikiTestCase {
 
        // No canonical namespace names
        // %{
+
        /**
         * @covers NamespaceInfo::getCanonicalNamespaces
         */
@@ -982,6 +984,7 @@ class NamespaceInfoTest extends MediaWikiTestCase {
 
        // Hook namespaces
        // %{
+
        /**
         * @return array Expected canonical namespaces
         */
@@ -1047,6 +1050,7 @@ class NamespaceInfoTest extends MediaWikiTestCase {
 
        // Extra namespaces
        // %{
+
        /**
         * @return NamespaceInfo
         */
@@ -1102,6 +1106,7 @@ class NamespaceInfoTest extends MediaWikiTestCase {
 
        // Canonical namespace caching
        // %{
+
        /**
         * @covers NamespaceInfo::getCanonicalNamespaces
         */
@@ -1295,11 +1300,7 @@ class NamespaceInfoTest extends MediaWikiTestCase {
                        'No namespace restriction' => [ [ '', 'autoconfirmed', 'sysop' ], NS_TALK ],
                        'Restricted to autoconfirmed' => [ [ '', 'sysop' ], NS_MAIN ],
                        'Restricted to sysop' => [ [ '' ], NS_USER ],
-                       // @todo Bug -- 'sysop' protection should be allowed in this case. Someone who's
-                       // autoconfirmed and also privileged can edit this namespace, and would be blocked by
-                       // the sysop protection.
-                       'Restricted to someone in two groups' => [ [ '' ], 101 ],
-
+                       'Restricted to someone in two groups' => [ [ '', 'sysop' ], 101 ],
                        'No special permissions' => [ [ '' ], NS_TALK, $this->getMockUser() ],
                        'autoconfirmed' => [
                                [ '', 'autoconfirmed' ],