Merge "resources: Upgrade qunit from 2.9.3 to 2.10.0"

RELEASE-NOTES-1.35

@@ -243,7 +243,7 @@ For notes on 1.34.x and older releases, see HISTORY.
 * Updated monolog/monolog from 1.25.2 to 1.25.3 (dev-only).
 * Updated wikimedia/xmp-reader from 0.6.3 to 0.7.0.
   Fixes error log spam with too-large XMP data, and adds support for GPano tags.
-* Updated qunit from 2.9.1 to 2.9.3 (dev-only).
+* Updated qunit from 2.9.1 to 2.10.0 (dev-only).
 * Updated wikimedia/base-convert from v2.0.0 to v2.0.1.
 * Updated composer/semver from 1.5.0 to 1.5.1.
 * Updated wikimedia/remex-html from 2.1.0 to 2.2.0.

package-lock.json

@@ -6580,9 +6580,9 @@
       "dev": true
     },
     "qunit": {
-      "version": "2.9.3",
-      "resolved": "https://registry.npmjs.org/qunit/-/qunit-2.9.3.tgz",
-      "integrity": "sha512-RH4VYSaVsNRDthMFFboTJAJ8q4kJM5LvOqWponKUYPEAeOcmc/YFV1QsZ7ikknA3TjqliWFJYEV63vvVXaALmQ==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/qunit/-/qunit-2.10.0.tgz",
+      "integrity": "sha512-EP9Q9Kf45z4l/X02ZJtyTQU9DBc82pEWAncSNx7Weo/73BDpX71xqbsdDAQrtEeeilK70cib7CY/lniJV6Cwwg==",
       "dev": true,
       "requires": {
         "commander": "2.12.2",

package.json

@@ -37,7 +37,7 @@
     "karma-mocha-reporter": "2.2.5",
     "karma-qunit": "4.0.0",
     "postcss-less": "2.0.0",
-    "qunit": "2.9.3",
+    "qunit": "2.10.0",
     "stylelint-config-wikimedia": "0.9.0",
     "wdio-mediawiki": "file:tests/selenium/wdio-mediawiki",
     "webdriverio": "5.13.2"

resources/lib/foreign-resources.yaml

@@ -293,11 +293,11 @@ qunitjs:
   # Integrity from link modals at https://code.jquery.com/qunit/
   files:
     qunit.js:
-      src: http://code.jquery.com/qunit/qunit-2.9.3.js
-      integrity: sha256-ksCoz4aTeJ3G1WQoXFsLgVcRW8ZBm22E60eji6uuLJQ=
+      src: http://code.jquery.com/qunit/qunit-2.10.0.js
+      integrity: sha256-X1fQXHSYGxa4V2bqkEAQW0DQGSxJrKveasahr959o28=
     qunit.css:
-      src: https://code.jquery.com/qunit/qunit-2.9.3.css
-      integrity: sha256-aB6kcCmSu+FAtLeVPZwTAHcihr/yN3JpXWTXcz7n9Mg=
+      src: https://code.jquery.com/qunit/qunit-2.10.0.css
+      integrity: sha256-0qVb1rgTvRqgmXb5us49Z/TADxRfGlAWvjxUqrgCnYQ=
 
 sinonjs:
   type: file

resources/lib/qunitjs/qunit.css

@@ -1,12 +1,12 @@
 /*!
- * QUnit 2.9.3
+ * QUnit 2.10.0
  * https://qunitjs.com/
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2019-10-08T15:49Z
+ * Date: 2020-05-02T22:51Z
  */
 
 /** Font Family and Sizes */
@@ -105,6 +105,10 @@
 	height: 1.6em;
 }
 
+#qunit-toolbar-filters {
+	float: right;
+}
+
 .qunit-url-config,
 .qunit-filter,
 #qunit-modulefilter {
@@ -114,7 +118,6 @@
 
 .qunit-filter,
 #qunit-modulefilter {
-	float: right;
 	position: relative;
 	margin-left: 1em;
 }

resources/lib/qunitjs/qunit.js

@@ -1,12 +1,12 @@
 /*!
- * QUnit 2.9.3
+ * QUnit 2.10.0
  * https://qunitjs.com/
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2019-10-08T15:49Z
+ * Date: 2020-05-02T22:51Z
  */
 (function (global$1) {
   'use strict';
@@ -1120,6 +1120,15 @@
 
   var moduleStack = [];
 
+  function isParentModuleInQueue() {
+  	var modulesInQueue = config.modules.map(function (module) {
+  		return module.moduleId;
+  	});
+  	return moduleStack.some(function (module) {
+  		return modulesInQueue.includes(module.moduleId);
+  	});
+  }
+
   function createModule(name, testEnvironment, modifiers) {
   	var parentModule = moduleStack.length ? moduleStack.slice(-1)[0] : null;
   	var moduleName = parentModule !== null ? [parentModule.name, name].join(" > ") : name;
@@ -1209,7 +1218,7 @@
   }
 
   function module$1(name, options, executeNow) {
-  	if (focused) {
+  	if (focused && !isParentModuleInQueue()) {
   		return;
   	}
 
@@ -1217,14 +1226,12 @@
   }
 
   module$1.only = function () {
-  	if (focused) {
-  		return;
+  	if (!focused) {
+  		config.modules.length = 0;
+  		config.queue.length = 0;
   	}
 
-  	config.modules.length = 0;
-  	config.queue.length = 0;
-
-  	module$1.apply(undefined, arguments);
+  	processModule.apply(undefined, arguments);
 
   	focused = true;
   };
@@ -3547,13 +3554,11 @@
 
   // Will be exposed as QUnit.only
   function only(testName, callback) {
-  	if (focused$1) {
-  		return;
+  	if (!focused$1) {
+  		config.queue.length = 0;
+  		focused$1 = true;
   	}
 
-  	config.queue.length = 0;
-  	focused$1 = true;
-
   	var newTest = new Test({
   		testName: testName,
   		callback: callback
@@ -4276,7 +4281,7 @@
   QUnit.isLocal = !(defined.document && window$1.location.protocol !== "file:");
 
   // Expose the current QUnit version
-  QUnit.version = "2.9.3";
+  QUnit.version = "2.10.0";
 
   extend(QUnit, {
   	on: on,
@@ -5075,13 +5080,22 @@
   		return moduleFilter;
   	}
 
+  	function toolbarFilters() {
+  		var toolbarFilters = document.createElement("span");
+
+  		toolbarFilters.id = "qunit-toolbar-filters";
+  		toolbarFilters.appendChild(toolbarLooseFilter());
+  		toolbarFilters.appendChild(toolbarModuleFilter());
+
+  		return toolbarFilters;
+  	}
+
   	function appendToolbar() {
   		var toolbar = id("qunit-testrunner-toolbar");
 
   		if (toolbar) {
   			toolbar.appendChild(toolbarUrlConfigContainer());
-  			toolbar.appendChild(toolbarModuleFilter());
-  			toolbar.appendChild(toolbarLooseFilter());
+  			toolbar.appendChild(toolbarFilters());
   			toolbar.appendChild(document.createElement("div")).className = "clearfix";
   		}
   	}