From cfcb3920741701ecb3f0ac686386705bdc6ef962 Mon Sep 17 00:00:00 2001
From: dolevoper <omerdolev90@gmail.com>
Date: Mon, 4 Jul 2022 11:13:01 +0300
Subject: [PATCH 1/3] feat: add name hint to missing error in find by queries

---
 src/queries/role.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/queries/role.js b/src/queries/role.js
index 5edd1c3c..a46d8a2b 100644
--- a/src/queries/role.js
+++ b/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 = ''

From a8d7fc4df5b6839f0bdfa90d8f0d7b30b45f99af Mon Sep 17 00:00:00 2001
From: dolevoper <omerdolev90@gmail.com>
Date: Mon, 4 Jul 2022 11:38:33 +0300
Subject: [PATCH 2/3] test: add test for name hint in findBy query

---
 src/__tests__/role.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/__tests__/role.js b/src/__tests__/role.js
index 9c766d0a..70797745 100644
--- a/src/__tests__/role.js
+++ b/src/__tests__/role.js
@@ -363,6 +363,14 @@ test('has no useful error message in findBy', async () => {
   )
 })
 
+test('findBy 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" />`,

From 89a1ac2c4ed45a41b56b0d9a9e625862154f9a30 Mon Sep 17 00:00:00 2001
From: dolevoper <omerdolev90@gmail.com>
Date: Mon, 4 Jul 2022 11:41:09 +0300
Subject: [PATCH 3/3] test: fix test description

---
 src/__tests__/role.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/__tests__/role.js b/src/__tests__/role.js
index 70797745..fb573bcd 100644
--- a/src/__tests__/role.js
+++ b/src/__tests__/role.js
@@ -363,7 +363,7 @@ test('has no useful error message in findBy', async () => {
   )
 })
 
-test('findBy contains a name hint', 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(