Merge branch 'master' into fix/pass-container-to-wait-for

Author: nathanforce

.all-contributorsrc

@@ -1291,6 +1291,16 @@
         "code",
         "test"
       ]
+    },
+    {
+      "login": "johnjesse",
+      "name": "johnjessewood",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/6839660?v=4",
+      "profile": "https://github.com/johnjesse",
+      "contributions": [
+        "bug",
+        "code"
+      ]
     }
   ],
   "repoHost": "https://github.com"

README.md

@@ -231,6 +231,10 @@ cases(
         <input id="username" />`,
       queryFn: 'queryAllByLabelText',
     },
+    queryAllByAriaLabelText: {
+      dom: `<div aria-label="User ${LRM}name"/>`,
+      queryFn: 'queryAllByLabelText',
+    },
     queryAllByPlaceholderText: {
       dom: `<input placeholder="User ${LRM}name" />`,
       queryFn: 'queryAllByPlaceholderText',

src/__tests__/text-matchers.js

@@ -31,8 +31,10 @@ function fuzzyMatches(
 
   const normalizedText = normalizer(textToMatch)
 
-  if (typeof matcher === 'string') {
-    return normalizedText.toLowerCase().includes(matcher.toLowerCase())
+  if (typeof matcher === 'string' || typeof matcher === 'number') {
+    return normalizedText
+      .toLowerCase()
+      .includes(matcher.toString().toLowerCase())
   } else if (typeof matcher === 'function') {
     return matcher(normalizedText, node)
   } else {

src/matches.ts

@@ -91,7 +91,12 @@ function queryAllByLabelText(
 
       return labelledElements
     }, [])
-    .concat(queryAllByAttribute('aria-label', container, text, {exact}))
+    .concat(
+      queryAllByAttribute('aria-label', container, text, {
+        exact,
+        normalizer: matchNormalizer,
+      }),
+    )
 
   return Array.from(new Set(matchingLabelledElements)).filter(element =>
     element.matches(selector),

src/queries/label-text.js

@@ -6,7 +6,7 @@ export type MatcherFunction = (
   content: string,
   element: Nullish<Element>,
 ) => boolean
-export type Matcher = MatcherFunction | RegExp | string
+export type Matcher = MatcherFunction | RegExp | string | number
 
 // Get autocomplete for ARIARole union types, while still supporting another string
 // Ref: https://github.com/microsoft/TypeScript/issues/29729#issuecomment-505826972

types/matches.d.ts

@@ -1,3 +1,7 @@
 {
-  "extends": "../tsconfig.json"
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {"@testing-library/dom": ["."]}
+  }
 }