From 2c4caef5392544946039b36a96a47e4599aeef52 Mon Sep 17 00:00:00 2001 From: Sebastian Silbermann Date: Mon, 27 Jan 2020 17:38:35 +0100 Subject: [PATCH] [test] Misc polish (#19425) --- test/utils/createDOM.js | 18 ++---------------- yarn.lock | 15 +++++---------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/test/utils/createDOM.js b/test/utils/createDOM.js index 4e0abf622a598d..d28c7e25e34709 100644 --- a/test/utils/createDOM.js +++ b/test/utils/createDOM.js @@ -1,5 +1,4 @@ const { JSDOM } = require('jsdom'); -const Node = require('jsdom/lib/jsdom/living/node-document-position'); // We can use jsdom-global at some point if maintaining these lists is a burden. const whitelist = [ @@ -9,24 +8,15 @@ const whitelist = [ 'Image', 'HTMLElement', 'HTMLInputElement', + 'Node', 'Performance', + 'document', ]; const blacklist = ['sessionStorage', 'localStorage']; function createDOM() { const dom = new JSDOM('', { pretendToBeVisual: true }); global.window = dom.window; - global.Node = Node; - global.document = dom.window.document; - // Not yet supported: https://github.com/jsdom/jsdom/issues/317 - global.document.createRange = () => ({ - setStart: () => {}, - setEnd: () => {}, - commonAncestorContainer: { - nodeName: 'BODY', - ownerDocument: document, - }, - }); // Not yet supported: https://github.com/jsdom/jsdom/issues/2152 class Touch { constructor(instance) { @@ -67,10 +57,6 @@ function createDOM() { global[key] = dom.window[key]; } }); - - // required for wait-for-expect - // not added by jsdom by default - window.Date = global.Date; } module.exports = createDOM; diff --git a/yarn.lock b/yarn.lock index 8c7f960723514c..ac7ca950a62a80 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2192,11 +2192,6 @@ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-1.19.0.tgz#a2502fb7ce9b6626fdbfc2e2a496f472de1bdd05" integrity sha512-gDE8JJEygpay7IjA/u3JiIURvwZW08f0cZSZLAzFoX/ZmeqvS0Sqv+97aKuHpNsalAMMhwPe+iAS6fQbfmbt7A== -"@types/pretty-format@*": - version "20.0.1" - resolved "https://registry.yarnpkg.com/@types/pretty-format/-/pretty-format-20.0.1.tgz#7ce03b403887b087701a2b4534464f48ce7b2f48" - integrity sha512-Oh7wnvVUCtVIWnCHQWe9qDZKn0fGyk5AMq99jXml0x39K59P+z9qe31CNRtop9TceCpS7NmoK+J9eGeCnyFgnw== - "@types/prop-types@*": version "15.7.1" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.1.tgz#f1a11e7babb0c3cad68100be381d1e064c68f1f6" @@ -2313,11 +2308,11 @@ "@types/react" "*" "@types/testing-library__dom@*", "@types/testing-library__dom@^6.0.0": - version "6.0.1" - resolved "https://registry.yarnpkg.com/@types/testing-library__dom/-/testing-library__dom-6.0.1.tgz#e62c7799a210163ae72b8ac00cc4a841951f9f2d" - integrity sha512-j8wJmvER0VVrmDtab80SwA4MgF0vzFm6hSyk3j2bw9PXyJxgMjFDF8ihJDzo2gUOMP+HpEquHRZcUXOhLmYexA== + version "6.11.1" + resolved "https://registry.yarnpkg.com/@types/testing-library__dom/-/testing-library__dom-6.11.1.tgz#6058a6ac391db679f7c60dbb27b81f0620de2dd9" + integrity sha512-ImChHtQqmjwraRLqBC2sgSQFtczeFvBmBcfhTYZn/3KwXbyD07LQykEQ0xJo7QHc1GbVvf7pRyGaIe6PkCdxEw== dependencies: - "@types/pretty-format" "*" + pretty-format "^24.3.0" "@types/testing-library__react@^9.1.2": version "9.1.2" @@ -11882,7 +11877,7 @@ pretty-format@^23.6.0: ansi-regex "^3.0.0" ansi-styles "^3.2.0" -pretty-format@^24.9.0: +pretty-format@^24.3.0, pretty-format@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9" integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==