Merge branch 'master' into pr/getLabel-concat-value

Author: delca85

.all-contributorsrc

@@ -995,6 +995,16 @@
       "contributions": [
         "ideas"
       ]
+    },
+    {
+      "login": "Jnforja",
+      "name": "João Forja",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/7002157?v=4",
+      "profile": "https://joaoforja.com/",
+      "contributions": [
+        "code",
+        "test"
+      ]
     }
   ],
   "repoHost": "https://github.com"

README.md

@@ -261,6 +261,7 @@ Thanks goes to these people ([emoji key][emojis]):
     <td align="center"><a href="https://github.com/appleJax"><img src="https://avatars1.githubusercontent.com/u/13618860?v=4" width="100px;" alt=""/><br /><sub><b>Kevin Brewer</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=appleJax" title="Code">💻</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=appleJax" title="Tests">⚠️</a></td>
     <td align="center"><a href="https://github.com/benmonro"><img src="https://avatars3.githubusercontent.com/u/399236?v=4" width="100px;" alt=""/><br /><sub><b>Ben Monro</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=benmonro" title="Code">💻</a> <a href="#ideas-benmonro" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=benmonro" title="Tests">⚠️</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=benmonro" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/smeijer"><img src="https://avatars1.githubusercontent.com/u/1196524?v=4" width="100px;" alt=""/><br /><sub><b>Stephan Meijer</b></sub></a><br /><a href="#ideas-smeijer" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://joaoforja.com/"><img src="https://avatars2.githubusercontent.com/u/7002157?v=4" width="100px;" alt=""/><br /><sub><b>João Forja</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=Jnforja" title="Code">💻</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=Jnforja" title="Tests">⚠️</a></td>
   </tr>
 </table>
 

package.json

@@ -40,7 +40,7 @@
   "dependencies": {
     "@babel/runtime": "^7.10.2",
     "aria-query": "^4.0.2",
-    "dom-accessibility-api": "^0.4.4",
+    "dom-accessibility-api": "^0.4.5",
     "pretty-format": "^25.5.0"
   },
   "devDependencies": {

src/__tests__/base-queries-warn-on-invalid-container.js

@@ -0,0 +1,127 @@
+import {
+  getByLabelText,
+  getAllByLabelText,
+  queryAllByLabelText,
+  queryByLabelText,
+  findByLabelText,
+  findAllByLabelText,
+  getByPlaceholderText,
+  getAllByPlaceholderText,
+  queryAllByPlaceholderText,
+  queryByPlaceholderText,
+  findByPlaceholderText,
+  findAllByPlaceholderText,
+  getByText,
+  getAllByText,
+  queryAllByText,
+  queryByText,
+  findByText,
+  findAllByText,
+  getByAltText,
+  getAllByAltText,
+  queryAllByAltText,
+  queryByAltText,
+  findByAltText,
+  findAllByAltText,
+  getByTitle,
+  getAllByTitle,
+  queryAllByTitle,
+  queryByTitle,
+  findByTitle,
+  findAllByTitle,
+  getByDisplayValue,
+  getAllByDisplayValue,
+  queryAllByDisplayValue,
+  queryByDisplayValue,
+  findByDisplayValue,
+  findAllByDisplayValue,
+  getByRole,
+  getAllByRole,
+  queryAllByRole,
+  queryByRole,
+  findByRole,
+  findAllByRole,
+  getByTestId,
+  getAllByTestId,
+  queryAllByTestId,
+  queryByTestId,
+  findByTestId,
+  findAllByTestId,
+} from '..'
+
+describe('synchronous queries throw on invalid container type', () => {
+  test.each([
+    ['getByLabelText', getByLabelText],
+    ['getAllByLabelText', getAllByLabelText],
+    ['queryByLabelText', queryByLabelText],
+    ['queryAllByLabelText', queryAllByLabelText],
+    ['getByPlaceholderText', getByPlaceholderText],
+    ['getAllByPlaceholderText', getAllByPlaceholderText],
+    ['queryByPlaceholderText', queryByPlaceholderText],
+    ['queryAllByPlaceholderText', queryAllByPlaceholderText],
+    ['getByText', getByText],
+    ['getAllByText', getAllByText],
+    ['queryByText', queryByText],
+    ['queryAllByText', queryAllByText],
+    ['getByAltText', getByAltText],
+    ['getAllByAltText', getAllByAltText],
+    ['queryByAltText', queryByAltText],
+    ['queryAllByAltText', queryAllByAltText],
+    ['getByTitle', getByTitle],
+    ['getAllByTitle', getAllByTitle],
+    ['queryByTitle', queryByTitle],
+    ['queryAllByTitle', queryAllByTitle],
+    ['getByDisplayValue', getByDisplayValue],
+    ['getAllByDisplayValue', getAllByDisplayValue],
+    ['queryByDisplayValue', queryByDisplayValue],
+    ['queryAllByDisplayValue', queryAllByDisplayValue],
+    ['getByRole', getByRole],
+    ['getAllByRole', getAllByRole],
+    ['queryByRole', queryByRole],
+    ['queryAllByRole', queryAllByRole],
+    ['getByTestId', getByTestId],
+    ['getAllByTestId', getAllByTestId],
+    ['queryByTestId', queryByTestId],
+    ['queryAllByTestId', queryAllByTestId],
+  ])('%s', (_queryName, query) => {
+    expect(() =>
+      query('invalid type for container', 'irrelevant text'),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Expected container to be an Element, a Document or a DocumentFragment but got string."`,
+    )
+  })
+})
+
+describe('asynchronous queries throw on invalid container type', () => {
+  test.each([
+    ['findByLabelText', findByLabelText],
+    ['findAllByLabelText', findAllByLabelText],
+    ['findByPlaceholderText', findByPlaceholderText],
+    ['findAllByPlaceholderText', findAllByPlaceholderText],
+    ['findByText', findByText],
+    ['findAllByText', findAllByText],
+    ['findByAltText', findByAltText],
+    ['findAllByAltText', findAllByAltText],
+    ['findByTitle', findByTitle],
+    ['findAllByTitle', findAllByTitle],
+    ['findByDisplayValue', findByDisplayValue],
+    ['findAllByDisplayValue', findAllByDisplayValue],
+    ['findByRole', findByRole],
+    ['findAllByRole', findAllByRole],
+    ['findByTestId', findByTestId],
+    ['findAllByTestId', findAllByTestId],
+  ])('%s', (_queryName, query) => {
+    const queryOptions = {}
+    const waitOptions = {timeout: 1}
+    return expect(
+      query(
+        'invalid type for container',
+        'irrelevant text',
+        queryOptions,
+        waitOptions,
+      ),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `"Expected container to be an Element, a Document or a DocumentFragment but got string."`,
+    )
+  })
+})

src/__tests__/helpers.js

@@ -1,5 +1,30 @@
-import {getDocument} from '../helpers'
+import {getDocument, checkContainerType} from '../helpers'
 
 test('returns global document if exists', () => {
   expect(getDocument()).toBe(document)
 })
+
+describe('query container validation throws when validation fails', () => {
+  test('undefined as container', () => {
+    expect(() =>
+      checkContainerType(undefined),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Expected container to be an Element, a Document or a DocumentFragment but got undefined."`,
+    )
+  })
+  test('null as container', () => {
+    expect(() => checkContainerType(null)).toThrowErrorMatchingInlineSnapshot(
+      `"Expected container to be an Element, a Document or a DocumentFragment but got null."`,
+    )
+  })
+  test('array as container', () => {
+    expect(() => checkContainerType([])).toThrowErrorMatchingInlineSnapshot(
+      `"Expected container to be an Element, a Document or a DocumentFragment but got Array."`,
+    )
+  })
+  test('object as container', () => {
+    expect(() => checkContainerType({})).toThrowErrorMatchingInlineSnapshot(
+      `"Expected container to be an Element, a Document or a DocumentFragment but got Object."`,
+    )
+  })
+})

src/helpers.js

@@ -65,11 +65,33 @@ function getWindowFromNode(node) {
   }
 }
 
+function checkContainerType(container) {
+  if (
+    !container ||
+    !(typeof container.querySelector === 'function') ||
+    !(typeof container.querySelectorAll === 'function')
+  ) {
+    throw new TypeError(
+      `Expected container to be an Element, a Document or a DocumentFragment but got ${getTypeName(
+        container,
+      )}.`,
+    )
+  }
+
+  function getTypeName(object) {
+    if (typeof object === 'object') {
+      return object === null ? 'null' : object.constructor.name
+    }
+    return typeof object
+  }
+}
+
 export {
   getWindowFromNode,
   getDocument,
   clearTimeoutFn as clearTimeout,
   setImmediateFn as setImmediate,
   setTimeoutFn as setTimeout,
   runWithRealTimers,
+  checkContainerType,
 }

src/queries/alt-text.js

@@ -1,11 +1,13 @@
-import {matches, fuzzyMatches, makeNormalizer, buildQueries} from './all-utils'
 import {wrapAllByQueryWithSuggestion} from '../query-helpers'
+import {checkContainerType} from '../helpers'
+import {matches, fuzzyMatches, makeNormalizer, buildQueries} from './all-utils'
 
 function queryAllByAltText(
   container,
   alt,
   {exact = true, collapseWhitespace, trim, normalizer} = {},
 ) {
+  checkContainerType(container)
   const matcher = exact ? matches : fuzzyMatches
   const matchNormalizer = makeNormalizer({collapseWhitespace, trim, normalizer})
   return Array.from(container.querySelectorAll('img,input,area')).filter(node =>

src/queries/display-value.js

@@ -1,17 +1,19 @@
+import {wrapAllByQueryWithSuggestion} from '../query-helpers'
+import {checkContainerType} from '../helpers'
 import {
   getNodeText,
   matches,
   fuzzyMatches,
   makeNormalizer,
   buildQueries,
 } from './all-utils'
-import {wrapAllByQueryWithSuggestion} from '../query-helpers'
 
 function queryAllByDisplayValue(
   container,
   value,
   {exact = true, collapseWhitespace, trim, normalizer} = {},
 ) {
+  checkContainerType(container)
   const matcher = exact ? matches : fuzzyMatches
   const matchNormalizer = makeNormalizer({collapseWhitespace, trim, normalizer})
   return Array.from(container.querySelectorAll(`input,textarea,select`)).filter(

src/queries/label-text.js

@@ -1,4 +1,5 @@
 import {getConfig} from '../config'
+import {checkContainerType} from '../helpers'
 import {
   fuzzyMatches,
   matches,
@@ -52,6 +53,8 @@ function queryAllByLabelText(
     concat = false,
   } = {},
 ) {
+  checkContainerType(container)
+
   const matchNormalizer = makeNormalizer({collapseWhitespace, trim, normalizer})
   const labels = queryAllLabelsByText(container, text, {
     exact,

src/queries/placeholder-text.js

@@ -1,7 +1,9 @@
-import {queryAllByAttribute, buildQueries} from './all-utils'
 import {wrapAllByQueryWithSuggestion} from '../query-helpers'
+import {checkContainerType} from '../helpers'
+import {queryAllByAttribute, buildQueries} from './all-utils'
 
 function queryAllByPlaceholderText(...args) {
+  checkContainerType(...args)
   return queryAllByAttribute('placeholder', ...args)
 }
 const getMultipleError = (c, text) =>

src/queries/role.js

@@ -7,14 +7,15 @@ import {
   isInaccessible,
   isSubtreeInaccessible,
 } from '../role-helpers'
+import {wrapAllByQueryWithSuggestion} from '../query-helpers'
+import {checkContainerType} from '../helpers'
 import {
   buildQueries,
   fuzzyMatches,
   getConfig,
   makeNormalizer,
   matches,
 } from './all-utils'
-import {wrapAllByQueryWithSuggestion} from '../query-helpers'
 
 function queryAllByRole(
   container,
@@ -30,6 +31,7 @@ function queryAllByRole(
     selected,
   } = {},
 ) {
+  checkContainerType(container)
   const matcher = exact ? matches : fuzzyMatches
   const matchNormalizer = makeNormalizer({collapseWhitespace, trim, normalizer})
 

src/queries/test-id.js

@@ -1,9 +1,11 @@
-import {queryAllByAttribute, getConfig, buildQueries} from './all-utils'
+import {checkContainerType} from '../helpers'
 import {wrapAllByQueryWithSuggestion} from '../query-helpers'
+import {queryAllByAttribute, getConfig, buildQueries} from './all-utils'
 
 const getTestIdAttribute = () => getConfig().testIdAttribute
 
 function queryAllByTestId(...args) {
+  checkContainerType(...args)
   return queryAllByAttribute(getTestIdAttribute(), ...args)
 }
 

src/queries/text.js

@@ -1,4 +1,5 @@
 import {wrapAllByQueryWithSuggestion} from '../query-helpers'
+import {checkContainerType} from '../helpers'
 import {DEFAULT_IGNORE_TAGS} from '../config'
 import {
   fuzzyMatches,
@@ -20,6 +21,7 @@ function queryAllByText(
     normalizer,
   } = {},
 ) {
+  checkContainerType(container)
   const matcher = exact ? matches : fuzzyMatches
   const matchNormalizer = makeNormalizer({collapseWhitespace, trim, normalizer})
   let baseArray = []

src/queries/title.js

@@ -1,17 +1,19 @@
+import {wrapAllByQueryWithSuggestion} from '../query-helpers'
+import {checkContainerType} from '../helpers'
 import {
   fuzzyMatches,
   matches,
   makeNormalizer,
   getNodeText,
   buildQueries,
 } from './all-utils'
-import {wrapAllByQueryWithSuggestion} from '../query-helpers'
 
 function queryAllByTitle(
   container,
   text,
   {exact = true, collapseWhitespace, trim, normalizer} = {},
 ) {
+  checkContainerType(container)
   const matcher = exact ? matches : fuzzyMatches
   const matchNormalizer = makeNormalizer({collapseWhitespace, trim, normalizer})
   return Array.from(container.querySelectorAll('[title], svg > title')).filter(