move config around a bit

Author: kentcdodds

src/__tests__/__snapshots__/get-by-errors.js.snap

@@ -1,5 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`getByLabelText query will throw the custom error returned by config.customGetElementError 1`] = `"My custom error: Unable to find a label with the text of: TEST QUERY"`;
+exports[`getByLabelText query will throw the custom error returned by config.getElementError 1`] = `"My custom error: Unable to find a label with the text of: TEST QUERY"`;
 
-exports[`getByText query will throw the custom error returned by config.customGetElementError 1`] = `"My custom error: Unable to find an element with the text: TEST QUERY. This could be because the text is broken up by multiple elements. In this case, you can provide a function for your text matcher to make your matcher more flexible."`;
+exports[`getByText query will throw the custom error returned by config.getElementError 1`] = `"My custom error: Unable to find an element with the text: TEST QUERY. This could be because the text is broken up by multiple elements. In this case, you can provide a function for your text matcher to make your matcher more flexible."`;

src/__tests__/get-by-errors.js

@@ -47,15 +47,15 @@ cases(
 )
 
 test.each([['getByText'], ['getByLabelText']])(
-  '%s query will throw the custom error returned by config.customGetElementError',
+  '%s query will throw the custom error returned by config.getElementError',
   query => {
-    const customGetElementError = jest.fn(
+    const getElementError = jest.fn(
       (message, _container) => new Error(`My custom error: ${message}`),
     )
-    configure({customGetElementError})
+    configure({getElementError})
     document.body.innerHTML = '<div>Hello</div>'
     expect(() => screen[query]('TEST QUERY')).toThrowErrorMatchingSnapshot()
-    expect(customGetElementError).toBeCalledTimes(1)
+    expect(getElementError).toBeCalledTimes(1)
   },
 )
 

src/config.js

@@ -1,3 +1,5 @@
+import {prettyDOM} from './pretty-dom'
+
 // It would be cleaner for this to live inside './queries', but
 // other parts of the code assume that all exports from
 // './queries' are query functions.
@@ -16,7 +18,11 @@ let config = {
   defaultHidden: false,
 
   // called when getBy* queries fail. (message, container) => Error
-  customGetElementError: null,
+  getElementError(message, container) {
+    return new Error(
+      [message, prettyDOM(container)].filter(Boolean).join('\n\n'),
+    )
+  },
 }
 
 export function configure(newConfig) {

src/queries/label-text.js

@@ -1,8 +1,8 @@
+import {getConfig} from '../config'
 import {
   fuzzyMatches,
   matches,
   makeNormalizer,
-  getElementError,
   queryAllByAttribute,
   makeFindQuery,
   makeSingleQuery,
@@ -104,12 +104,12 @@ function getAllByLabelText(container, text, ...rest) {
   if (!els.length) {
     const labels = queryAllLabelsByText(container, text, ...rest)
     if (labels.length) {
-      throw getElementError(
+      throw getConfig().getElementError(
         `Found a label with the text of: ${text}, however no form control was found associated to that label. Make sure you're using the "for" attribute or "aria-labelledby" attribute correctly.`,
         container,
       )
     } else {
-      throw getElementError(
+      throw getConfig().getElementError(
         `Unable to find a label with the text of: ${text}`,
         container,
       )

src/query-helpers.js

@@ -1,18 +1,9 @@
-import {prettyDOM} from './pretty-dom'
 import {fuzzyMatches, matches, makeNormalizer} from './matches'
 import {waitForElement} from './wait-for-element'
 import {getConfig} from './config'
 
-function getElementError(message, container) {
-  const customGetElementError = getConfig().customGetElementError
-  if (customGetElementError) {
-    return customGetElementError(message, container)
-  }
-  return new Error([message, prettyDOM(container)].filter(Boolean).join('\n\n'))
-}
-
 function getMultipleElementsFoundError(message, container) {
-  return getElementError(
+  return getConfig().getElementError(
     `${message}\n\n(If this is intentional, then use the \`*AllBy*\` variant of the query (like \`queryAllByText\`, \`getAllByText\`, or \`findAllByText\`)).`,
     container,
   )
@@ -64,7 +55,10 @@ function makeGetAllQuery(allQuery, getMissingError) {
   return (container, ...args) => {
     const els = allQuery(container, ...args)
     if (!els.length) {
-      throw getElementError(getMissingError(container, ...args), container)
+      throw getConfig().getElementError(
+        getMissingError(container, ...args),
+        container,
+      )
     }
     return els
   }
@@ -91,7 +85,6 @@ function buildQueries(queryAllBy, getMultipleError, getMissingError) {
 }
 
 export {
-  getElementError,
   getMultipleElementsFoundError,
   queryAllByAttribute,
   queryByAttribute,