testilo 3.9.0 → 3.9.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testilo",
-  "version": "3.9.0",
+  "version": "3.9.3",
   "description": "Client that scores and digests Testaro reports",
   "main": "index.js",
   "scripts": {

package/procs/score/sp15a.js

@@ -10,8 +10,8 @@
   This proc applies specified weights to the component scores before summing them. An issue reported
   by a test is given a score. That score is determined by:
     Whether the issue is reported as an error or a warning.
-    How important the issue is, if the test package is “pre-weighted” (axe, tenon, and testaro)
-    Whether the test belongs to a group or is a “solo” test.
+    How important the issue is, if the test package is pre-weighted (axe, tenon, and testaro)
+    Whether the test belongs to a group or is a solo test.
     How heavily the group is weighted, if the test package is not pre-weighted and the test belongs
       to a group
 
@@ -27,7 +27,7 @@
   Browser logging produces a log score, and the prevention of tests produces a prevention score.
   They, too, are added to the total score.
 
-  Each grouped test has a “quality” property, typically set to 1. The value of this property can be
+  Each grouped test has a quality property, typically set to 1. The value of this property can be
   modified when the test is found to be higher or lower in quality than usual.
 */
 
@@ -58,8 +58,25 @@ const otherPackages = ['alfa', 'axe', 'continuum', 'htmlcs', 'ibm', 'nuVal', 'te
 const preWeightedPackages = ['axe', 'tenon', 'testaro'];
 const testMatchers = {
   nuVal: [
+    /^CSS: background-image: .+ is not a background-image value.*$/,
+    /^CSS: background: .+ is not a color value.*$/,
+    /^CSS: cursor: .+ is not a cursor value.*$/,
+    /^CSS: transform: .+ is not a transform value.*$/,
+    /^Bad value  for attribute id on element .+: An ID must not be the empty string.+$/,
+    /^Duplicate ID .+$|^The first occurrence of ID .* was here.*$/,
+    /^Start tag .+ seen but an element of the same type was already open.*$/,
+    /^End tag .+ violates nesting rules.*$/,
+    /^Attribute .+ is not serializable as XML 1\.0.*$/,
+    /^Attribute .+ not allowed on element meta at this point.*$/,
     /^Attribute .+ not allowed on element .+ at this point.*$/,
-    /^CSS: “background-image”: .+ is not a “background-image” value.*$/
+    /^Bad value .+ for attribute .+ on element meta.*$/,
+    /^Bad value .+ for attribute .+ on element .+$/,
+    /^Bad value .+ for the attribute .+$/,
+    /^Attribute .+ not allowed here.*$/,
+    /^The .+ role is unnecessary for element .+$/,
+    /^CSS: .+: Property .+ doesn't exist.*$/,
+    /^CSS: .+: only 0 can be a length. You must put a unit after your number.*$/,
+    /^Element .+ not allowed as child of element .+ in this context.*$/
   ]
 };
 const groups = {
@@ -67,7 +84,7 @@ const groups = {
     weight: 0,
     packages: {
       nuVal: {
-        'Element “mediaelementwrapper” not allowed as child of element “div” in this context. (Suppressing further errors from this subtree.)': {
+        'Element mediaelementwrapper not allowed as child of element div in this context. (Suppressing further errors from this subtree.)': {
           quality: 0,
           what: 'Bug in nuVal'
         }
@@ -114,6 +131,12 @@ const groups = {
           quality: 1,
           what: 'Element id attribute value is not unique within the document'
         }
+      },
+      nuVal: {
+        '^Duplicate ID .+$|^The first occurrence of ID .* was here.*$': {
+          quality: 1,
+          what: 'Duplicate id'
+        }
       }
     }
   },
@@ -328,7 +351,7 @@ const groups = {
         }
       },
       nuVal: {
-        'An “img” element must have an “alt” attribute, except under certain conditions. For details, consult guidance on providing text alternatives for images.': {
+        'An img element must have an alt attribute, except under certain conditions. For details, consult guidance on providing text alternatives for images.': {
           quality: 1,
           what: 'img element has no alt attribute'
         }
@@ -371,18 +394,29 @@ const groups = {
     weight: 4,
     packages: {
       nuVal: {
-        'Element “img” is missing required attribute “src”.': {
+        'Element img is missing required attribute src.': {
           quality: 1,
           what: 'img element has no src attribute'
         }
       }
     }
   },
+  backgroundBad: {
+    weight: 4,
+    packages: {
+      nuVal: {
+        '^CSS: background: .+ is not a color value.*$': {
+          quality: 1,
+          what: 'CSS background color is misdefined'
+        }
+      }
+    }
+  },
   backgroundImageBad: {
     weight: 4,
     packages: {
       nuVal: {
-        '^CSS: “background-image”: .+ is not a “background-image” value.*$': {
+        '^CSS: background-image: .+ is not a background-image value.*$': {
           quality: 1,
           what: 'CSS background image is misdefined'
         }
@@ -780,7 +814,7 @@ const groups = {
     weight: 1,
     packages: {
       nuVal: {
-        'Possible misuse of “aria-label”. (If you disagree with this warning, file an issue report or send e-mail to www-validator@w3.org.)': {
+        'Possible misuse of aria-label. (If you disagree with this warning, file an issue report or send e-mail to www-validator@w3.org.)': {
           quality: 1,
           what: 'aria-label attribute may be misused'
         }
@@ -867,7 +901,7 @@ const groups = {
         }
       },
       nuVal: {
-        'The “aria-labelledby” attribute must point to an element in the same document.': {
+        'The aria-labelledby attribute must point to an element in the same document.': {
           quality: 1,
           what: 'aria-labelledby attribute references an element not in the document'
         }
@@ -1154,7 +1188,7 @@ const groups = {
     weight: 4,
     packages: {
       nuVal: {
-        'Attribute “alt” not allowed on element “button” at this point.': {
+        'Attribute alt not allowed on element button at this point.': {
           quality: 1,
           what: 'button element has an alt attribute'
         }
@@ -1456,7 +1490,7 @@ const groups = {
     weight: 4,
     packages: {
       nuVal: {
-        'Element “title” not allowed as child of element “body” in this context. (Suppressing further errors from this subtree.)': {
+        'Element title not allowed as child of element body in this context. (Suppressing further errors from this subtree.)': {
           quality: 1,
           what: 'title element is a child of the body element'
         }
@@ -1473,7 +1507,7 @@ const groups = {
     weight: 4,
     packages: {
       nuVal: {
-        'A “link” element must not appear as a descendant of a “body” element unless the “link” element has an “itemprop” attribute or has a “rel” attribute whose value contains “dns-prefetch”, “modulepreload”, “pingback”, “preconnect”, “prefetch”, “preload”, “prerender”, or “stylesheet”.': {
+        'A link element must not appear as a descendant of a body element unless the link element has an itemprop attribute or has a rel attribute whose value contains dns-prefetch, modulepreload, pingback, preconnect, prefetch, preload, prerender, or stylesheet.': {
           quality: 1,
           what: 'link element with a body ancestor has no itemprop or valid rel attribute'
         }
@@ -1484,37 +1518,33 @@ const groups = {
     weight: 3,
     packages: {
       nuVal: {
-        'Attribute “name” not allowed on element “meta” at this point.': {
+        '^Attribute .+ not allowed on element meta at this point.*$': {
           quality: 1,
-          what: 'name attribute is not allowed on a meta element here'
+          what: 'Attribute is not allowed on a meta element here'
         },
-        'Attribute “rel” not allowed on element “meta” at this point.': {
-          quality: 1,
-          what: 'rel attribute is not allowed on a meta element here'
-        },
-        'Attribute “href” not allowed on element “meta” at this point.': {
-          quality: 1,
-          what: 'href attribute is not allowed on a meta element here'
-        },
-        'Element “meta” is missing one or more of the following attributes: “charset”, “content”, “http-equiv”, “itemprop”, “name”, “property”.': {
+        'Element meta is missing one or more of the following attributes: charset, content, http-equiv, itemprop, name, property.': {
           quality: 1,
           what: 'meta element is missing a charset, content, http-equiv, itemprop, name, or property attribute'
         },
-        'A document must not include more than one “meta” element with its “name” attribute set to the value “description”.': {
+        'A document must not include more than one meta element with its name attribute set to the value description.': {
           quality: 1,
           what: 'meta element with name="description" is not the only one'
         },
-        'Attribute “http-equiv” not allowed on element “meta” at this point.': {
-          quality: 1,
-          what: 'http-equiv attribute is not allowed on a meta element here'
-        },
-        'A “meta” element with an “http-equiv” attribute whose value is “X-UA-Compatible” must have a “content” attribute with the value “IE=edge”.': {
+        'A meta element with an http-equiv attribute whose value is X-UA-Compatible must have a content attribute with the value IE=edge.': {
           quality: 1,
           what: 'meta element with http-equiv="X-UA-Compatible" has no content="IE=edge"'
         },
-        'Element “meta” is missing one or more of the following attributes: “itemprop”, “property”.': {
+        'Element meta is missing one or more of the following attributes: itemprop, property.': {
           quality: 1,
           what: 'meta element is missing an itemprop or property attribute'
+        },
+        'A charset attribute on a meta element found after the first 1024 bytes.': {
+          quality: 1,
+          what: 'charset attribute on a meta element appears after 1024 bytes'
+        },
+        '^Bad value .+ for attribute .+ on element meta.*$': {
+          quality: 1,
+          what: 'attribute of a meta element has an invalid value'
         }
       }
     }
@@ -1523,7 +1553,7 @@ const groups = {
     weight: 4,
     packages: {
       nuVal: {
-        'Element “script” must not have attribute “defer” unless attribute “src” is also specified.': {
+        'Element script must not have attribute defer unless attribute src is also specified.': {
           quality: 1,
           what: 'script element has a defer attribute without a src attribute'
         }
@@ -1534,7 +1564,7 @@ const groups = {
     weight: 4,
     packages: {
       nuVal: {
-        'The “itemtype” attribute must not be specified on elements that do not have an “itemscope” attribute specified.': {
+        'The itemtype attribute must not be specified on elements that do not have an itemscope attribute specified.': {
           quality: 1,
           what: 'Element has an itemtype attribute without an itemscope attribute'
         }
@@ -1652,7 +1682,7 @@ const groups = {
         }
       },
       nuVal: {
-        'Bad value “dialog” for attribute “role” on element “li”.': {
+        'Bad value dialog for attribute role on element li.': {
           quality: 1,
           what: 'dialog role is not valid for an li element'
         }
@@ -1675,21 +1705,9 @@ const groups = {
         }
       },
       nuVal: {
-        'The “banner” role is unnecessary for element “header”.': {
-          quality: 1,
-          what: 'banner role is redundant for a header element'
-        },
-        'The “contentinfo” role is unnecessary for element “footer”.': {
-          quality: 1,
-          what: 'contentinfo role is redundant for a footer element'
-        },
-        'The “main” role is unnecessary for element “main”.': {
-          quality: 1,
-          what: 'main role is redundant for a main element'
-        },
-        'The “navigation” role is unnecessary for element “nav”.': {
+        '^The .+ role is unnecessary for element .+$': {
           quality: 1,
-          what: 'navigation role is redundant for a nav element'
+          what: 'explicit role is redundant for its element'
         }
       }
     }
@@ -1710,7 +1728,7 @@ const groups = {
         }
       },
       nuVal: {
-        'Element “a” is missing required attribute “aria-valuenow”.': {
+        'Element a is missing required attribute aria-valuenow.': {
           quality: 1,
           what: 'a element has no aria-valuenow attribute'
         }
@@ -1850,6 +1868,12 @@ const groups = {
           quality: 1,
           what: 'ARIA property value is invalid'
         }
+      },
+      nuVal: {
+        'The aria-hidden attribute must not be specified on the noscript element.': {
+          quality: 1,
+          what: 'noscript element has an aria-hidden attribute'
+        }
       }
     }
   },
@@ -2032,7 +2056,7 @@ const groups = {
     weight: 4,
     packages: {
       nuVal: {
-        'Bad value “” for attribute “id” on element “a”: An ID must not be the empty string.': {
+        '^Bad value  for attribute id on element .+: An ID must not be the empty string.+$': {
           quality: 1,
           what: 'id attribute has an empty value'
         }
@@ -2066,6 +2090,12 @@ const groups = {
           what: 'Heading element provides no descriptive text'
         }
       },
+      nuVal: {
+        'Empty heading.': {
+          quality: 1,
+          what: 'Empty heading'
+        }
+      },
       wave: {
         'e:heading_empty': {
           quality: 1,
@@ -2089,11 +2119,11 @@ const groups = {
     weight: 1,
     packages: {
       nuVal: {
-        'The “type” attribute is unnecessary for JavaScript resources.': {
+        'The type attribute is unnecessary for JavaScript resources.': {
           quality: 1,
           what: 'type attribute is unnecessary for a JavaScript resource'
         },
-        'The “type” attribute for the “style” element is not needed and should be omitted.': {
+        'The type attribute for the style element is not needed and should be omitted.': {
           quality: 1,
           what: 'type attribute is unnecessary for a style element'
         }
@@ -2185,8 +2215,14 @@ const groups = {
     }
   },
   docType: {
-    weight: 1,
+    weight: 3,
     packages: {
+      nuVal: {
+        'Start tag seen without seeing a doctype first. Expected <!DOCTYPE html>.': {
+          quality: 1,
+          what: 'Page does not start with <!DOCTYPE html>'
+        }
+      },
       testaro: {
         docType: {
           quality: 1,
@@ -2229,7 +2265,7 @@ const groups = {
         }
       },
       nuVal: {
-        'Element “head” is missing a required instance of child element “title”.': {
+        'Element head is missing a required instance of child element title.': {
           quality: 1,
           what: 'head element has no child title element'
         }
@@ -2263,6 +2299,12 @@ const groups = {
           what: 'Heading level is incorrect'
         }
       },
+      nuVal: {
+        'Consider using the h1 element as a top-level heading only (all h1 elements are treated as top-level headings by many screen readers and other tools).': {
+          quality: 1,
+          what: 'Page contains more than 1 h1 element'
+        }
+      },
       tenon: {
         155: {
           quality: 1,
@@ -2328,11 +2370,26 @@ const groups = {
       }
     }
   },
+  articleHeadingless: {
+    weight: 1,
+    packages: {
+      nuVal: {
+        'Article lacks heading. Consider using h2-h6 elements to add identifying headings to all articles.': {
+          quality: 1,
+          what: 'article has no heading'
+        }
+      }
+    }
+  },
   sectionHeadingless: {
     weight: 1,
     packages: {
       nuVal: {
-        'Section lacks heading. Consider using “h2”-“h6” elements to add identifying headings to all sections.': {
+        'Section lacks heading. Consider using h2-h6 elements to add identifying headings to all sections.': {
+          quality: 1,
+          what: 'section has no heading'
+        },
+        'Section lacks heading. Consider using h2-h6 elements to add identifying headings to all sections, or else use a div element instead for any cases where no heading is needed.': {
           quality: 1,
           what: 'section has no heading'
         }
@@ -2499,7 +2556,7 @@ const groups = {
         }
       },
       nuVal: {
-        'Element “li” not allowed as child of element “div” in this context. (Suppressing further errors from this subtree.)': {
+        'Element li not allowed as child of element div in this context. (Suppressing further errors from this subtree.)': {
           quality: 1,
           what: 'li element is a child of a div element'
         }
@@ -3455,7 +3512,7 @@ const groups = {
     weight: 2,
     packages: {
       nuVal: {
-        'Potentially bad value “allow-scripts allow-same-origin” for attribute “sandbox” on element “iframe”: Setting both “allow-scripts” and “allow-same-origin” is not recommended, because it effectively enables an embedded page to break out of all sandboxing.': {
+        'Potentially bad value allow-scripts allow-same-origin for attribute sandbox on element iframe: Setting both allow-scripts and allow-same-origin is not recommended, because it effectively enables an embedded page to break out of all sandboxing.': {
           quality: 1,
           what: 'iframe element has vulnerable sandbox="allow-scripts allow-same-origin"'
         }
@@ -3535,6 +3592,22 @@ const groups = {
         '^Attribute .+ not allowed on element .+ at this point.*$': {
           quality: 1,
           what: 'attribute not allowed on this element'
+        },
+        '^Bad value .+ for attribute .+ on element .+$': {
+          quality: 1,
+          what: 'attribute on this element has an invalid value'
+        },
+        '^Bad value .+ for the attribute .+$': {
+          quality: 1,
+          what: 'attribute has an invalid value'
+        },
+        '^Attribute .+ not allowed here.*$': {
+          quality: 1,
+          what: 'Attribute not allowed here'
+        },
+        '^Attribute .+ is not serializable as XML 1\\.0.*$': {
+          quality: 1,
+          what: 'Attribute is invalidly nonserializable'
         }
       }
     }
@@ -3653,7 +3726,7 @@ const groups = {
     weight: 4,
     packages: {
       nuVal: {
-        'Element “div” not allowed as child of element “button” in this context. (Suppressing further errors from this subtree.)': {
+        'Element div not allowed as child of element button in this context. (Suppressing further errors from this subtree.)': {
           quality: 1,
           what: 'div element has a button element as its parent'
         }
@@ -3664,7 +3737,7 @@ const groups = {
     weight: 4,
     packages: {
       nuVal: {
-        'Element “p” not allowed as child of element “strong” in this context. (Suppressing further errors from this subtree.)': {
+        'Element p not allowed as child of element strong in this context. (Suppressing further errors from this subtree.)': {
           quality: 1,
           what: 'p element has a strong element as its parent'
         }
@@ -3675,19 +3748,19 @@ const groups = {
     weight: 4,
     packages: {
       nuVal: {
-        'Element “style” not allowed as child of element “body” in this context. (Suppressing further errors from this subtree.)': {
+        'Element style not allowed as child of element body in this context. (Suppressing further errors from this subtree.)': {
           quality: 1,
           what: 'style element not allowed as a child of the body element'
         },
-        'Element “style” not allowed as child of element “div” in this context. (Suppressing further errors from this subtree.)': {
+        'Element style not allowed as child of element div in this context. (Suppressing further errors from this subtree.)': {
           quality: 1,
           what: 'style element not allowed as a child of this div element'
         },
-        'Element “style” not allowed as child of element “main” in this context. (Suppressing further errors from this subtree.)': {
+        'Element style not allowed as child of element main in this context. (Suppressing further errors from this subtree.)': {
           quality: 1,
           what: 'style element not allowed as a child of this main element'
         },
-        'Element “style” not allowed as child of element “footer” in this context. (Suppressing further errors from this subtree.)': {
+        'Element style not allowed as child of element footer in this context. (Suppressing further errors from this subtree.)': {
           quality: 1,
           what: 'style element not allowed as a child of this footer element'
         }
@@ -3953,21 +4026,41 @@ const groups = {
         }
       },
       nuVal: {
-        'The “charset” attribute on the “script” element is obsolete.': {
+        'The charset attribute on the script element is obsolete.': {
           quality: 1,
           what: 'charset attribute is obsolete on a script element'
         },
-        'The only allowed value for the “charset” attribute for the “script” element is “utf-8”. (But the attribute is not needed and should be omitted altogether.)': {
+        'The only allowed value for the charset attribute for the script element is utf-8. (But the attribute is not needed and should be omitted altogether.)': {
           quality: 1,
           what: 'charset attribute has a value other than utf-8 and is unnecessary'
         },
-        'The “frameborder” attribute on the “iframe” element is obsolete. Use CSS instead.': {
+        'The language attribute on the script element is obsolete. You can safely omit it.': {
+          quality: 1,
+          what: 'language attribute is obsolete on a script element'
+        },
+        'The language attribute on the script element is obsolete. Use the type attribute instead.': {
+          quality: 1,
+          what: 'language attribute is obsolete on a script element'
+        },
+        'Using the meta element to specify the document-wide default language is obsolete. Consider specifying the language on the root element instead.': {
+          quality: 1,
+          what: 'language declaration in a meta element is obsolete'
+        },
+        'The frameborder attribute on the iframe element is obsolete. Use CSS instead.': {
           quality: 1,
           what: 'frameborder attribute is obsolete'
         },
-        'The “name” attribute is obsolete. Consider putting an “id” attribute on the nearest container instead.': {
+        'The name attribute is obsolete. Consider putting an id attribute on the nearest container instead.': {
           quality: 1,
           what: 'name attribute is obsolete'
+        },
+        'The allowtransparency attribute on the iframe element is obsolete. Use CSS instead.': {
+          quality: 1,
+          what: 'allowtransparency attribute on an iframe element is obsolete'
+        },
+        'The scrolling attribute on the iframe element is obsolete. Use CSS instead.': {
+          quality: 1,
+          what: 'scrolling attribute on an iframe element is obsolete'
         }
       },
       wave: {
@@ -3982,33 +4075,61 @@ const groups = {
     weight: 3,
     packages: {
       nuVal: {
-        'CSS: “-webkit-box-flex”: Parse Error.': {
+        'CSS: -webkit-box-flex: Parse Error.': {
           quality: 1,
           what: 'Invalid -webkit-box-flex in CSS'
         },
-        'CSS: “-webkit-flex”: Parse Error.': {
+        'CSS: -webkit-flex: Parse Error.': {
           quality: 1,
           what: 'Invalid -webkit-flex in CSS'
         },
-        'CSS: “-ms-flex”: Parse Error.': {
+        'CSS: -ms-flex: Parse Error.': {
           quality: 1,
           what: 'Invalid -ms-flex in CSS'
         },
-        'CSS: “-moz-box-flex”: Parse Error.': {
+        'CSS: -moz-box-flex: Parse Error.': {
           quality: 1,
           what: 'Invalid -moz-box-flex in CSS'
         },
-        'CSS: “flex”: Parse Error.': {
+        'CSS: flex: Parse Error.': {
           quality: 1,
           what: 'Invalid flex in CSS'
         },
-        'Stray end tag “head”.': {
+        '^CSS: cursor: .+ is not a cursor value.*$': {
+          quality: 1,
+          what: 'Invalid cursor in CSS'
+        },
+        '^CSS: transform: .+ is not a transform value.*$': {
+          quality: 1,
+          what: 'Invalid transform in CSS'
+        },
+        '^CSS: .+: Property .+ doesn\'t exist.*$': {
+          quality: 1,
+          what: 'Invalid property in CSS'
+        },
+        '^CSS: .+: only 0 can be a length. You must put a unit after your number.*$': {
+          quality: 1,
+          what: 'Length in CSS is nonzero but has no unit'
+        },
+        'CSS: Parse Error.': {
+          quality: 1,
+          what: 'Invalid CSS'
+        },
+        'Stray end tag head.': {
           quality: 1,
           what: 'Invalid closing head tag'
         },
-        'Start tag “body” seen but an element of the same type was already open.': {
+        '^Start tag .+ seen but an element of the same type was already open.*$': {
+          quality: 1,
+          what: 'Element is invalidly a descendant of another such element'
+        },
+        '^End tag .+ violates nesting rules.*$': {
+          quality: 1,
+          what: 'End tag violates nesting rules'
+        },
+        '^Element .+ not allowed as child of element .+ in this context.*$': {
           quality: 1,
-          what: 'body element is a descendant of a body element'
+          what: 'Element not allowed as a child of its parent here'
         }
       }
     }
@@ -4024,6 +4145,17 @@ const groups = {
       }
     }
   },
+  fatalError: {
+    weight: 50,
+    packages: {
+      nuVal: {
+        'Cannot recover after last error. Any further errors will be ignored.': {
+          quality: 1,
+          what: 'Testing was interrupted by a fatal error'
+        }
+      }
+    }
+  }
 };
 
 // VARIABLES
@@ -4086,7 +4218,7 @@ exports.scorer = async report => {
               if (verdict && rule) {
                 const {ruleID} = rule;
                 if (ruleID) {
-                  // Add 4 per failure, 1 per warning (“cantTell”).
+                  // Add 4 per failure, 1 per warning (cantTell).
                   addDetail(which, ruleID, verdict === 'failed' ? 4 : 1);
                 }
               }
@@ -4171,7 +4303,7 @@ exports.scorer = async report => {
               items.forEach(issue => {
                 const {ruleId, level} = issue;
                 if (ruleId && level) {
-                  // Add 4 per violation, 1 per warning (“recommendation”).
+                  // Add 4 per violation, 1 per warning (recommendation).
                   addDetail(which, ruleId, level === 'violation' ? 4 : 1);
                 }
               });
@@ -4217,7 +4349,7 @@ exports.scorer = async report => {
                   testIDs.forEach(testID => {
                     const {count} = items[testID];
                     if (count) {
-                      // Add 4 per error, 3 per contrast error, 1 per warning (“alert”).
+                      // Add 4 per error, 3 per contrast error, 1 per warning (alert).
                       addDetail(
                         which, `${issueClass[0]}:${testID}`, count * classScores[issueClass]
                       );
@@ -4433,19 +4565,21 @@ exports.scorer = async report => {
       // For each package with any scores:
       Object.keys(packageDetails).forEach(packageName => {
         const matchers = testMatchers[packageName];
+        let testClass = '';
         // For each test with any scores in the package:
         Object.keys(packageDetails[packageName]).forEach(testID => {
-          // If the package has varying test names:
-          if (matchers) {
-            // If the test name belongs to a class:
-            const testCode = matchers.find(matcher => matcher.test(testID));
-            if (testCode) {
-              // Change the test name to the name of its class.
-              testID = testCode.source;
+          // Determine whether the test is in a group.
+          let groupName = testGroups[packageName][testID];
+          // If not:
+          if (! groupName) {
+            // Determine whether the package has test classes and the class is in a group.
+            testClass = matchers && matchers.find(matcher => matcher.test(testID));
+            if (testClass) {
+              testID = testClass.source;
+              groupName = testGroups[packageName][testID];
             }
           }
-          // If the test is in a group:
-          const groupName = testGroups[packageName][testID];
+          // If the test or its class is in a group:
           if (groupName) {
             // Determine the preweighted or group-weighted score.
             if (! groupDetails.groups[groupName]) {
@@ -4467,6 +4601,10 @@ exports.scorer = async report => {
               score: roundedScore,
               what: groups[groupName].packages[packageName][testID].what
             };
+          }
+          // Otherwise, if the package has varying test names and the test belongs to a class:
+          else if (matchers && (testCode = matchers.find(matcher => matcher.test(testID)))) {
+
           }
           // Otherwise, i.e. if the test is solo:
           else {