bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use QUnitTestModule instead of deprecated ResourceLoaderTestModules

Browse Source 
This increases the compatibility requirement of this extension to
MediaWiki 1.33+

Bug: T232875
Change-Id: I50e652697c9d6e2886d457885b1d7b04a45f376f
This commit is contained in:
James D. Forrester
2020-05-11 11:56:05 -07:00
committed by Reedy
parent 3e1b29588a
commit 18552a7142
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
extension.json
View File

@@ -17,7 +17,7 @@
"descriptionmsg": "uls-desc", "descriptionmsg": "uls-desc",
"license-name": "GPL-2.0-or-later OR MIT", "license-name": "GPL-2.0-or-later OR MIT",
"requires": { "requires": {
"MediaWiki": ">= 1.32.0" "MediaWiki": ">= 1.33.0"
}, },
"Hooks": { "Hooks": {
"BeforePageDisplay": "UniversalLanguageSelectorHooks::addModules", "BeforePageDisplay": "UniversalLanguageSelectorHooks::addModules",
@@ -28,7 +28,6 @@
"MakeGlobalVariablesScript": "UniversalLanguageSelectorHooks::addVariables", "MakeGlobalVariablesScript": "UniversalLanguageSelectorHooks::addVariables",
"PersonalUrls": "UniversalLanguageSelectorHooks::addPersonalBarTrigger", "PersonalUrls": "UniversalLanguageSelectorHooks::addPersonalBarTrigger",
"ResourceLoaderGetConfigVars": "UniversalLanguageSelectorHooks::addConfig", "ResourceLoaderGetConfigVars": "UniversalLanguageSelectorHooks::addConfig",
"ResourceLoaderTestModules": "UniversalLanguageSelectorHooks::addTestModules",
"SkinTemplateOutputPageBeforeExec": "UniversalLanguageSelectorHooks::onSkinTemplateOutputPageBeforeExec", "SkinTemplateOutputPageBeforeExec": "UniversalLanguageSelectorHooks::onSkinTemplateOutputPageBeforeExec",
"UserGetLanguageObject": "UniversalLanguageSelectorHooks::getLanguage" "UserGetLanguageObject": "UniversalLanguageSelectorHooks::getLanguage"
}, },
@@ -472,6 +471,18 @@
"remoteExtPath": "UniversalLanguageSelector/lib" "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": { "attributes": {
"EventLogging": { "EventLogging": {
"Schemas": { "Schemas": {

15
includes/UniversalLanguageSelectorHooks.php
View File

@@ -165,21 +165,6 @@ class UniversalLanguageSelectorHooks {
$out->addModules( 'ext.uls.setlang' ); $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. * Add some tabs for navigation for users who do not use Ajax interface.
* Hook: PersonalUrls * Hook: PersonalUrls