Merge branch 'main' into feat/advance-timers-wrapper

Author: eps1lon

.all-contributorsrc

@@ -1424,6 +1424,16 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "istateside",
+      "name": "Kevin Fleischman",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7245931?v=4",
+      "profile": "http://www.hawkeye.dog",
+      "contributions": [
+        "code",
+        "test"
+      ]
     }
   ],
   "repoHost": "https://github.com"

README.md

@@ -317,6 +317,7 @@ Thanks goes to these people ([emoji key][emojis]):
     <td align="center"><a href="https://github.com/G-Rath"><img src="https://avatars.githubusercontent.com/u/3151613?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Gareth Jones</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=G-Rath" title="Code">💻</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=G-Rath" title="Tests">⚠️</a></td>
     <td align="center"><a href="https://github.com/riotrah"><img src="https://avatars.githubusercontent.com/u/22646419?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rayat Rahman</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=riotrah" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/savcni01"><img src="https://avatars.githubusercontent.com/u/18025894?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nik Savchenko</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=savcni01" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.hawkeye.dog"><img src="https://avatars.githubusercontent.com/u/7245931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kevin Fleischman</b></sub></a><br /><a href="https://github.com/testing-library/dom-testing-library/commits?author=istateside" title="Code">💻</a> <a href="https://github.com/testing-library/dom-testing-library/commits?author=istateside" title="Tests">⚠️</a></td>
   </tr>
 </table>
 

src/__tests__/element-queries.js

@@ -1,10 +1,6 @@
 import {configure} from '../config'
 import {render, renderIntoDocument} from './helpers/test-utils'
 
-beforeEach(() => {
-  document.defaultView.Cypress = null
-})
-
 test('query can return null', () => {
   const {
     queryByLabelText,
@@ -1061,46 +1057,6 @@ test('the debug helper prints the dom state here', () => {
   process.env.DEBUG_PRINT_LIMIT = originalDebugPrintLimit
 })
 
-test('get throws a useful error message without DOM in Cypress', () => {
-  document.defaultView.Cypress = {}
-  const {
-    getByLabelText,
-    getByPlaceholderText,
-    getByText,
-    getByTestId,
-    getByAltText,
-    getByTitle,
-    getByDisplayValue,
-  } = render('<div />')
-  expect(() =>
-    getByLabelText('LucyRicardo'),
-  ).toThrowErrorMatchingInlineSnapshot(
-    `Unable to find a label with the text of: LucyRicardo`,
-  )
-  expect(() =>
-    getByPlaceholderText('LucyRicardo'),
-  ).toThrowErrorMatchingInlineSnapshot(
-    `Unable to find an element with the placeholder text of: LucyRicardo`,
-  )
-  expect(() => getByText('LucyRicardo')).toThrowErrorMatchingInlineSnapshot(
-    `Unable to find an element with the text: LucyRicardo. 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.`,
-  )
-  expect(() => getByTestId('LucyRicardo')).toThrowErrorMatchingInlineSnapshot(
-    `Unable to find an element by: [data-testid="LucyRicardo"]`,
-  )
-  expect(() => getByAltText('LucyRicardo')).toThrowErrorMatchingInlineSnapshot(
-    `Unable to find an element with the alt text: LucyRicardo`,
-  )
-  expect(() => getByTitle('LucyRicardo')).toThrowErrorMatchingInlineSnapshot(
-    `Unable to find an element with the title: LucyRicardo.`,
-  )
-  expect(() =>
-    getByDisplayValue('LucyRicardo'),
-  ).toThrowErrorMatchingInlineSnapshot(
-    `Unable to find an element with the display value: LucyRicardo.`,
-  )
-})
-
 test('getByText ignores script tags by default', () => {
   const {getAllByText} = render(
     '<script>Hello</script><div>Hello</div><style>.Hello{}</style>',

src/__tests__/pretty-dom.js

@@ -26,6 +26,14 @@ test('prettyDOM prints out the given DOM element tree', () => {
 test('prettyDOM supports truncating the output length', () => {
   const {container} = render('<div>Hello World!</div>')
   expect(prettyDOM(container, 5)).toMatch(/\.\.\./)
+  expect(prettyDOM(container, 0)).toMatch('')
+  expect(prettyDOM(container, Number.POSITIVE_INFINITY)).toMatchInlineSnapshot(`
+    "<div>
+      <div>
+        Hello World!
+      </div>
+    </div>"
+  `)
 })
 
 test('prettyDOM defaults to document.body', () => {

src/config.ts

@@ -36,11 +36,7 @@ let config: InternalConfig = {
     const error = new Error(
       [
         message,
-        prettifiedDOM.length > 0
-          ? `Ignored nodes: comments, <script />, <style />\n${prettyDOM(
-              container,
-            )}`
-          : null,
+        `Ignored nodes: comments, <script />, <style />\n${prettifiedDOM}`,
       ]
         .filter(Boolean)
         .join('\n\n'),

src/pretty-dom.js

@@ -4,25 +4,11 @@ import {getUserCodeFrame} from './get-user-code-frame'
 import {getDocument} from './helpers'
 import {DEFAULT_IGNORE_TAGS} from './shared'
 
-function inCypress(dom) {
-  const window =
-    (dom.ownerDocument && dom.ownerDocument.defaultView) || undefined
-  return (
-    (typeof global !== 'undefined' && global.Cypress) ||
-    (typeof window !== 'undefined' && window.Cypress)
-  )
-}
-
 const inNode = () =>
   typeof process !== 'undefined' &&
   process.versions !== undefined &&
   process.versions.node !== undefined
 
-const getMaxLength = dom =>
-  inCypress(dom)
-    ? 0
-    : (typeof process !== 'undefined' && process.env.DEBUG_PRINT_LIMIT) || 7000
-
 const {DOMCollection} = prettyFormat.plugins
 
 // https://developer.mozilla.org/en-US/docs/Web/API/Node/nodeType#node_type_constants
@@ -43,7 +29,8 @@ function prettyDOM(dom, maxLength, options = {}) {
     dom = getDocument().body
   }
   if (typeof maxLength !== 'number') {
-    maxLength = getMaxLength(dom)
+    maxLength =
+      (typeof process !== 'undefined' && process.env.DEBUG_PRINT_LIMIT) || 7000
   }
 
   if (maxLength === 0) {