diff --git a/extension.json b/extension.json index f8e07a01..c393863e 100644 --- a/extension.json +++ b/extension.json @@ -17,7 +17,7 @@ "descriptionmsg": "uls-desc", "license-name": "GPL-2.0-or-later OR MIT", "requires": { - "MediaWiki": ">= 1.32.0" + "MediaWiki": ">= 1.33.0" }, "Hooks": { "BeforePageDisplay": "UniversalLanguageSelectorHooks::addModules", @@ -28,7 +28,6 @@ "MakeGlobalVariablesScript": "UniversalLanguageSelectorHooks::addVariables", "PersonalUrls": "UniversalLanguageSelectorHooks::addPersonalBarTrigger", "ResourceLoaderGetConfigVars": "UniversalLanguageSelectorHooks::addConfig", - "ResourceLoaderTestModules": "UniversalLanguageSelectorHooks::addTestModules", "SkinTemplateOutputPageBeforeExec": "UniversalLanguageSelectorHooks::onSkinTemplateOutputPageBeforeExec", "UserGetLanguageObject": "UniversalLanguageSelectorHooks::getLanguage" }, @@ -472,6 +471,18 @@ "remoteExtPath": "UniversalLanguageSelector/lib" } }, + "QUnitTestModule": { + "localBasePath": "tests/qunit", + "remoteExtPath": "UniversalLanguageSelector/tests/qunit", + "scripts": [ + "ext.uls.tests.js" + ], + "dependencies": [ + "jquery.uls", + "ext.uls.init", + "ext.uls.preferences" + ] + }, "attributes": { "EventLogging": { "Schemas": { diff --git a/includes/UniversalLanguageSelectorHooks.php b/includes/UniversalLanguageSelectorHooks.php index bf48555b..07525e3a 100644 --- a/includes/UniversalLanguageSelectorHooks.php +++ b/includes/UniversalLanguageSelectorHooks.php @@ -165,21 +165,6 @@ class UniversalLanguageSelectorHooks { $out->addModules( 'ext.uls.setlang' ); } - /** - * @param array &$testModules array of javascript testing modules. 'qunit' is fed - * using tests/qunit/QUnitTestResources.php. - * @param ResourceLoader $resourceLoader - * Hook: ResourceLoaderTestModules - */ - public static function addTestModules( array &$testModules, ResourceLoader $resourceLoader ) { - $testModules['qunit']['ext.uls.tests'] = [ - 'scripts' => [ 'tests/qunit/ext.uls.tests.js' ], - 'dependencies' => [ 'jquery.uls', 'ext.uls.init', 'ext.uls.preferences' ], - 'localBasePath' => dirname( __DIR__ ), - 'remoteExtPath' => 'UniversalLanguageSelector', - ]; - } - /** * Add some tabs for navigation for users who do not use Ajax interface. * Hook: PersonalUrls