From 18552a71428f46d0ba6a955c6679b2f0965c0ca0 Mon Sep 17 00:00:00 2001
From: "James D. Forrester" <jforrester@wikimedia.org>
Date: Mon, 11 May 2020 11:56:05 -0700
Subject: [PATCH] Use QUnitTestModule instead of deprecated
 ResourceLoaderTestModules

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

Bug: T232875
Change-Id: I50e652697c9d6e2886d457885b1d7b04a45f376f
---
 extension.json                              | 15 +++++++++++++--
 includes/UniversalLanguageSelectorHooks.php | 15 ---------------
 2 files changed, 13 insertions(+), 17 deletions(-)

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