Merge branch 'main' into fix-broken-specs

Author: eps1lon

.all-contributorsrc

@@ -1443,6 +1443,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "jacklaurencegaray",
+      "name": "Jack Laurence",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12763356?v=4",
+      "profile": "http://www.jacklaurence.net",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "repoHost": "https://github.com"

README.md

@@ -320,6 +320,9 @@ Thanks goes to these people ([emoji key][emojis]):
     <td align="center"><a href="http://www.hawkeye.dog"><img src="https://avatars.githubusercontent.com/u/7245931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kevin Fleischman</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=istateside" title="Code">💻</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=istateside" title="Tests">⚠️</a></td>
     <td align="center"><a href="http://dfdx.us"><img src="https://avatars.githubusercontent.com/u/3087358?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Beth Hitch</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=dfoverdx" title="Code">💻</a></td>
   </tr>
+  <tr>
+    <td align="center"><a href="http://www.jacklaurence.net"><img src="https://avatars.githubusercontent.com/u/12763356?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jack Laurence</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=jacklaurencegaray" title="Code">💻</a></td>
+  </tr>
 </table>
 
 <!-- markdownlint-restore -->

types/__tests__/type-tests.ts

@@ -68,6 +68,22 @@ export async function testQueryHelpers() {
           : includesAutomationId(content, automationId),
       options,
     )
+
+  const createIdRelatedErrorHandler =
+    (errorMessage: string, defaultErrorMessage: string) =>
+    <T>(container: Element | null, ...args: T[]) => {
+      const [key, value] = args
+      if (!container) {
+        return 'Container element not specified'
+      }
+      if (key && value) {
+        return errorMessage
+          .replace('[key]', String(key))
+          .replace('[value]', String(value))
+      }
+      return defaultErrorMessage
+    }
+
   const [
     queryByAutomationId,
     getAllByAutomationId,
@@ -76,8 +92,14 @@ export async function testQueryHelpers() {
     findByAutomationId,
   ] = buildQueries(
     queryAllByAutomationId,
-    () => 'Multiple Error',
-    () => 'Missing Error',
+    createIdRelatedErrorHandler(
+      `Found multiple with key [key] and value [value]`,
+      'Multiple error',
+    ),
+    createIdRelatedErrorHandler(
+      `Unable to find an element with the [key] attribute of: [value]`,
+      'Missing error',
+    ),
   )
   queryByAutomationId(element, 'id')
   getAllByAutomationId(element, 'id')
@@ -89,6 +111,11 @@ export async function testQueryHelpers() {
   await findByAutomationId(element, 'id', {})
   await findAllByAutomationId(element, 'id')
   await findByAutomationId(element, 'id')
+
+  await findAllByAutomationId(element, ['id', 'id'], {})
+  await findByAutomationId(element, ['id', 'id'], {})
+  await findAllByAutomationId(element, ['id', 'id'])
+  await findByAutomationId(element, ['id', 'id'])
 }
 
 export function testBoundFunctions() {

types/query-helpers.d.ts

@@ -69,6 +69,6 @@ export type BuiltQueryMethods<Arguments extends any[]> = [
 
 export function buildQueries<Arguments extends any[]>(
   queryAllBy: GetAllBy<Arguments>,
-  getMultipleError: GetErrorFunction,
-  getMissingError: GetErrorFunction,
+  getMultipleError: GetErrorFunction<Arguments>,
+  getMissingError: GetErrorFunction<Arguments>,
 ): BuiltQueryMethods<Arguments>