HTML Reporter: Fix <label> to wrap <select> for multi-value urlCo…

…nfig item

Cherry-picked from 80a1695 (3.0.0-dev):
> Details and screenshot at #1773.

Also includes a partial cherry-pick from 57c2dbc to improve the
`test/reporter-urlparams.js` file with a menu case, to ease manual
testing of this behavior.

src/html-reporter/html.js

@@ -138,7 +138,7 @@ const stats = {
       } else {
         urlConfigHtml += "<label for='qunit-urlconfig-" + escaped +
           "' title='" + escapedTooltip + "'>" + escapeText(val.label) +
-          ": </label><select id='qunit-urlconfig-" + escaped +
+          ": <select id='qunit-urlconfig-" + escaped +
           "' name='" + escaped + "' title='" + escapedTooltip + "'><option></option>";
 
         if (Array.isArray(val.value)) {
@@ -166,7 +166,7 @@ const stats = {
           urlConfigHtml += "<option value='" + escaped +
             "' selected='selected' disabled='disabled'>" + escaped + '</option>';
         }
-        urlConfigHtml += '</select>';
+        urlConfigHtml += '</select></label>';
       }
     }
 

test/reporter-urlparams.js

@@ -2,10 +2,23 @@
 if (!location.search) {
   location.replace('?implicit&explicit=yes&array=A&array=B&escaped%20name&toString=string&' +
     'module=urlParams+module&filter=urlParams%20module&notrycatch&' +
-    'custom&customArray=a&customArray=b');
+    'custom&customArray=a&customArray=b&customMenu=b&customMenuUnknown=c');
 }
 
-QUnit.config.urlConfig.push('custom', 'customArray');
+QUnit.config.urlConfig.push(
+  'custom',
+  'customArray',
+  {
+    id: 'customMenu',
+    label: 'Menu',
+    value: ['a', 'b']
+  },
+  {
+    id: 'customMenuUnknown',
+    label: 'Menu unknown',
+    value: ['a', 'b']
+  }
+);
 
 // Don't change this module name without also changing the module parameter when loading this suite
 QUnit.module('urlParams module', function () {