Merge branch 'main' into feat/logTestingPlaygroundReturnValue

Author: MatanBobi

.all-contributorsrc

@@ -1535,6 +1535,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "dolevoper",
+      "name": "Omer Dolev",
+      "avatar_url": "https://avatars.githubusercontent.com/u/53278705?v=4",
+      "profile": "https://github.com/dolevoper",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "repoHost": "https://github.com"

README.md

@@ -333,6 +333,7 @@ Thanks goes to these people ([emoji key][emojis]):
     <td align="center"><a href="https://github.com/Dennis273"><img src="https://avatars.githubusercontent.com/u/19815164?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dennis273</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=Dennis273" title="Code">💻</a></td>
     <td align="center"><a href="https://www.jacksonhardaker.dev"><img src="https://avatars.githubusercontent.com/u/7596320?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jackson Hardaker</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=jacksonhardaker" title="Tests">⚠️</a></td>
     <td align="center"><a href="https://www.robin-drexler.com/"><img src="https://avatars.githubusercontent.com/u/474248?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robin Drexler</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=robin-drexler" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/dolevoper"><img src="https://avatars.githubusercontent.com/u/53278705?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Omer Dolev</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=dolevoper" title="Code">💻</a></td>
   </tr>
 </table>
 

src/__tests__/role.js

@@ -363,6 +363,14 @@ test('has no useful error message in findBy', async () => {
   )
 })
 
+test('findBy error message for missing elements contains a name hint', async () => {
+  const {findByRole} = render(`<button>Click me</button>`)
+
+  await expect(findByRole('button', {name: 'Submit'})).rejects.toThrow(
+    'Unable to find role="button" and name "Submit"',
+  )
+})
+
 test('explicit role is most specific', () => {
   const {getByRole} = renderIntoDocument(
     `<button role="tab" aria-label="my-tab" />`,

src/queries/role.js

@@ -220,7 +220,7 @@ function makeRoleSelector(role, exact, customNormalizer) {
     .join(',')
 }
 
-const getMultipleError = (c, role, {name} = {}) => {
+const getNameHint = name => {
   let nameHint = ''
   if (name === undefined) {
     nameHint = ''
@@ -230,7 +230,11 @@ const getMultipleError = (c, role, {name} = {}) => {
     nameHint = ` and name \`${name}\``
   }
 
-  return `Found multiple elements with the role "${role}"${nameHint}`
+  return nameHint
+}
+
+const getMultipleError = (c, role, {name} = {}) => {
+  return `Found multiple elements with the role "${role}"${getNameHint(name)}`
 }
 
 const getMissingError = (
@@ -239,7 +243,7 @@ const getMissingError = (
   {hidden = getConfig().defaultHidden, name, description} = {},
 ) => {
   if (getConfig()._disableExpensiveErrorDiagnostics) {
-    return `Unable to find role="${role}"`
+    return `Unable to find role="${role}"${getNameHint(name)}`
   }
 
   let roles = ''