Merge "resourceloader: Only output ResourceLoaderDynamicStyles when needed"

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

diff --git a/tests/phpunit/includes/RevisionDbTestBase.php b/tests/phpunit/includes/RevisionDbTestBase.php
index 96e2766..2d141e6 100644 (file)
--- a/tests/phpunit/includes/RevisionDbTestBase.php
+++ b/tests/phpunit/includes/RevisionDbTestBase.php
@@ -1,4 +1,5 @@
 <?php
+
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\RevisionStore;
@@ -182,7 +183,8 @@ abstract class RevisionDbTestBase extends MediaWikiTestCase {
                        ( $model === null || $model === CONTENT_MODEL_WIKITEXT )
                ) {
                        $ns = $this->getDefaultWikitextNS();
-                       $titleString = MWNamespace::getCanonicalName( $ns ) . ':' . $titleString;
+                       $titleString = MediaWikiServices::getInstance()->getNamespaceInfo()->
+                               getCanonicalName( $ns ) . ':' . $titleString;
                }
 
                $title = Title::newFromText( $titleString );
@@ -1537,8 +1539,7 @@ abstract class RevisionDbTestBase extends MediaWikiTestCase {
        public function testUserCanBitfield( $bitField, $field, $userGroups, $title, $expected ) {
                $title = Title::newFromText( $title );
 
-               $this->setMwGlobals(
-                       'wgGroupPermissions',
+               $this->setGroupPermissions(
                        [
                                'sysop' => [
                                        'deletedtext' => true,
@@ -1590,8 +1591,7 @@ abstract class RevisionDbTestBase extends MediaWikiTestCase {
         * @covers Revision::userCan
         */
        public function testUserCan( $bitField, $field, $userGroups, $expected ) {
-               $this->setMwGlobals(
-                       'wgGroupPermissions',
+               $this->setGroupPermissions(
                        [
                                'sysop' => [
                                        'deletedtext' => true,