Merge "resourceloader: Simplify load.mock.php by removing includes dependency"

diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
index 0bc558a..4e9f539 100644 (file)
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
@@ -261,7 +261,7 @@ class ResourceLoaderTest extends ResourceLoaderTestCase {
                                'jquery.foo,bar|jquery.ui.baz,quux',
                        ],
                        [
-                               'Regression fixed in r88706 with dotless names',
+                               'Regression fixed in r87497 (7fee86c38e) with dotless names',
                                [ 'foo', 'bar', 'baz' ],
                                'foo,bar,baz',
                        ],

diff --git a/tests/qunit/data/load.mock.php b/tests/qunit/data/load.mock.php
index 671bdf1..23fb4c9 100644 (file)
--- a/tests/qunit/data/load.mock.php
+++ b/tests/qunit/data/load.mock.php
@@ -24,9 +24,6 @@
  */
 header( 'Content-Type: text/javascript; charset=utf-8' );
 
-require_once __DIR__ . '/../../../includes/json/FormatJson.php';
-require_once __DIR__ . '/../../../includes/Xml.php';
-
 $moduleImplementations = [
        'testUsesMissing' => "
 mw.loader.implement( 'testUsesMissing', function () {
@@ -66,7 +63,7 @@ if ( isset( $_GET['modules'] ) ) {
                if ( isset( $moduleImplementations[$module] ) ) {
                        $response .= $moduleImplementations[$module];
                } else {
-                       $response .= Xml::encodeJsCall( 'mw.loader.state', [ $module, 'missing' ], true );
+                       $response .= 'mw.loader.state(' . json_encode( $module ) . ', "missing" );' . "\n";
                }
        }
 }