Lifts suggestion printing up one level

Author: jacobparis

src/queries/role.js

@@ -9,7 +9,6 @@ import {
 } from '../role-helpers'
 import {wrapAllByQueryWithSuggestion} from '../query-helpers'
 import {checkContainerType} from '../helpers'
-import {prettyDOM} from '../pretty-dom'
 import {
   buildQueries,
   fuzzyMatches,
@@ -108,11 +107,8 @@ function queryAllByRole(
     })
 }
 
-const getMultipleError = ({elements}, role) => {
-  const suggestions = elements.map(element => prettyDOM(element)).join('\n')
-
-  return `Found multiple elements with the role "${role}"
-  ${suggestions}`
+const getMultipleError = (c, role) => {
+  return `Found multiple elements with the role "${role}"`
 }
 
 const getMissingError = (

src/query-helpers.js

@@ -1,3 +1,4 @@
+import {prettyDOM} from './pretty-dom'
 import {getSuggestedQuery} from './suggestions'
 import {fuzzyMatches, matches, makeNormalizer} from './matches'
 import {waitFor} from './wait-for'
@@ -45,8 +46,14 @@ function makeSingleQuery(allQuery, getMultipleError) {
   return (container, ...args) => {
     const els = allQuery(container, ...args)
     if (els.length > 1) {
+      const elementStrings = els.map(element => prettyDOM(element)).join('\n\n')
+
       throw getMultipleElementsFoundError(
-        getMultipleError({container, elements: els}, ...args),
+        `${getMultipleError(container, ...args)}
+
+Here are the matching elements:
+
+${elementStrings}`,
         container,
       )
     }