Merge "Fix support for TestSwarm on SpecialJavaScriptTest/qunit"

diff --combined includes/DefaultSettings.php
index 1ca2aba,e3dbfa6..8402d69
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -2581,6 -2581,13 +2581,6 @@@ $wgResourceLoaderMaxage = array
        ),
  );
  
 -/**
 - * Whether to embed private modules inline with HTML output or to bypass
 - * caching and check the user parameter against $wgUser to prevent
 - * unauthorized access to private modules.
 - */
 -$wgResourceLoaderInlinePrivateModules = true;
 -
  /**
   * The default debug mode (on/off) for of ResourceLoader requests. This will still
   * be overridden when the debug URL parameter is used.
@@@ -4233,7 -4240,17 +4233,17 @@@ $wgEnableJavaScriptTest = false
   */
  $wgJavaScriptTestConfig = array(
        'qunit' => array(
+               // Page where documentation can be found relevant to the QUnit test suite being ran.
+               // Used in the intro paragraph on [[Special:JavaScriptTest/qunit]] for the
+               // documentation link in the "javascripttest-qunit-intro" message.
                'documentation' => '//www.mediawiki.org/wiki/Manual:JavaScript_unit_testing',
+               // If you are submitting the QUnit test suite to a TestSwarm instance,
+               // point this to the "inject.js" script of that instance. This is was registers
+               // the QUnit hooks to extract the test results and push them back up into the
+               // TestSwarm database.
+               // @example 'http://localhost/testswarm/js/inject.js'
+               // @example '//integration.mediawiki.org/testswarm/js/inject.js'
+               'testswarm-injectjs' => false,
        ),
  );