Merge "Prevent fatal PHP errors when PageRestriction::getTitle() returns null."

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

diff --git a/tests/phpunit/includes/content/JavaScriptContentTest.php b/tests/phpunit/includes/content/JavaScriptContentTest.php
index 823be6f..a4dd1fc 100644 (file)
--- a/tests/phpunit/includes/content/JavaScriptContentTest.php
+++ b/tests/phpunit/includes/content/JavaScriptContentTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * @group ContentHandler
  * @group Database
@@ -207,7 +209,7 @@ class JavaScriptContentTest extends TextContentTest {
         * @covers JavaScriptContent::matchMagicWord
         */
        public function testMatchMagicWord() {
-               $mw = MagicWord::get( "staticredirect" );
+               $mw = MediaWikiServices::getInstance()->getMagicWordFactory()->get( "staticredirect" );
 
                $content = $this->newContent( "#REDIRECT [[FOO]]\n__STATICREDIRECT__" );
                $this->assertFalse(
@@ -232,7 +234,7 @@ class JavaScriptContentTest extends TextContentTest {
                $content = new JavaScriptContent( $oldText );
                $newContent = $content->updateRedirect( $target );
 
-               $this->assertEquals( $expectedText, $newContent->getNativeData() );
+               $this->assertEquals( $expectedText, $newContent->getText() );
        }
 
        public static function provideUpdateRedirect() {
@@ -311,6 +313,11 @@ class JavaScriptContentTest extends TextContentTest {
                                'Gadget:FooBaz.js',
                                '/* #REDIRECT */mw.loader.load("//example.org/w/index.php?title=Gadget:FooBaz.js\u0026action=raw\u0026ctype=text/javascript");'
                        ],
+                       // Unicode
+                       [
+                               'User:😂/unicode.js',
+                               '/* #REDIRECT */mw.loader.load("//example.org/w/index.php?title=User:%F0%9F%98%82/unicode.js\u0026action=raw\u0026ctype=text/javascript");'
+                       ],
                        // No #REDIRECT comment
                        [
                                null,