Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"@babel/preset-env": "7.4.4",
"@babel/preset-react": "7.0.0",
"@svgr/webpack": "4.2.0",
"@testing-library/react": "8.0.1",
"@types/react": "16.8.17",
"@zendeskgarden/css-variables": "6.3.3",
"@zendeskgarden/eslint-config": "7.2.1",
Expand Down Expand Up @@ -90,7 +91,6 @@
"react": "16.8.6",
"react-dom": "16.8.6",
"react-styleguidist": "8.0.6",
"react-testing-library": "7.0.1",
"regenerator-runtime": "0.13.2",
"resolve-from": "5.0.0",
"rimraf": "2.6.3",
Expand Down
4 changes: 2 additions & 2 deletions utils/test/garden-test-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import React from 'react';
import PropTypes from 'prop-types';
import { render, configure } from 'react-testing-library';
import { render, configure } from '@testing-library/react';
import { ThemeProvider } from '../../packages/theming/src';

configure({ testIdAttribute: 'data-test-id' });
Expand All @@ -32,7 +32,7 @@ const customLtrRender = (ui, options) => render(ui, { wrapper: LtrProvider, ...o
const customRtlRender = (ui, options) => render(ui, { wrapper: RtlProvider, ...options });

// eslint-disable-next-line no-duplicate-imports
export * from 'react-testing-library';
export * from '@testing-library/react';
export { customLtrRender as render };
export { customRtlRender as renderRtl };
export { default as getExports } from './getExports';
2 changes: 1 addition & 1 deletion utils/test/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = {
snapshotSerializers: ['enzyme-to-json/serializer'],
setupFilesAfterEnv: [
'<rootDir>/utils/test/jest.setup.js',
'react-testing-library/cleanup-after-each'
'@testing-library/react/cleanup-after-each'
],
moduleNameMapper: {
'\\.(css)$': 'identity-obj-proxy',
Expand Down
69 changes: 27 additions & 42 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1054,10 +1054,10 @@
dependencies:
regenerator-runtime "^0.12.0"

"@babel/runtime@^7.4.3":
version "7.4.4"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.4.tgz#dc2e34982eb236803aa27a07fea6857af1b9171d"
integrity sha512-w0+uT71b6Yi7i5SE0co4NioIpSYS6lLiXvCzWzGSKvpK5vdQtCbICHMj+gbAKAOtxiV6HsVh/MBdaF9EQ6faSg==
"@babel/runtime@^7.4.5":
version "7.4.5"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12"
integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==
dependencies:
regenerator-runtime "^0.13.2"

Expand Down Expand Up @@ -1395,13 +1395,6 @@
source-map "^0.6.1"
write-file-atomic "2.4.1"

"@jest/types@^24.7.0":
version "24.7.0"
resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.7.0.tgz#c4ec8d1828cdf23234d9b4ee31f5482a3f04f48b"
dependencies:
"@types/istanbul-lib-coverage" "^2.0.0"
"@types/yargs" "^12.0.9"

"@jest/types@^24.8.0":
version "24.8.0"
resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.8.0.tgz#f31e25948c58f0abd8c845ae26fcea1491dea7ad"
Expand Down Expand Up @@ -2114,6 +2107,7 @@
"@sheerun/mutationobserver-shim@^0.3.2":
version "0.3.2"
resolved "https://registry.yarnpkg.com/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.2.tgz#8013f2af54a2b7d735f71560ff360d3a8176a87b"
integrity sha512-vTCdPp/T/Q3oSqwHmZ5Kpa9oI7iLtGl3RQaA/NyLHikvcrPxACkkKVr/XzkSPJWXHRhKGzVvb0urJsbMlRxi1Q==

"@svgr/babel-plugin-add-jsx-attribute@^4.2.0":
version "4.2.0"
Expand Down Expand Up @@ -2206,6 +2200,24 @@
"@svgr/plugin-svgo" "^4.2.0"
loader-utils "^1.2.3"

"@testing-library/dom@^5.0.0":
version "5.1.1"
resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-5.1.1.tgz#091a30b1ca058080bf432cd1aeb2b7c646022f97"
integrity sha512-twpAkqomsI0xeOLehijOAmPxeKvs6+WZC/6/nXD0+HNQupP3OZeZho/PBlNhrGL+8nQWiPjdvmxeyU0tq+hctA==
dependencies:
"@babel/runtime" "^7.4.5"
"@sheerun/mutationobserver-shim" "^0.3.2"
pretty-format "^24.8.0"
wait-for-expect "^1.2.0"

"@testing-library/react@8.0.1":
version "8.0.1"
resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-8.0.1.tgz#91c254adf855b13de50020613cb5d3915f9f7875"
integrity sha512-N/1pJfhEnNYkGyxuw4xbp03evaS0z/CT8o0QgTfJqGlukAcU15xf9uU1w03NHKZJcU69nOCBAoAkXHtHzYwMbg==
dependencies:
"@babel/runtime" "^7.4.5"
"@testing-library/dom" "^5.0.0"

"@types/babel__core@^7.1.0":
version "7.1.1"
resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.1.tgz#ce9a9e5d92b7031421e1d0d74ae59f572ba48be6"
Expand Down Expand Up @@ -4947,16 +4959,6 @@ dom-serializer@0, dom-serializer@~0.1.0:
domelementtype "~1.1.1"
entities "~1.1.1"

dom-testing-library@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/dom-testing-library/-/dom-testing-library-4.1.0.tgz#273264e62e9e63f4e404f7349ddd7b9356aacd23"
integrity sha512-654GHd0oPC31S+ll1bJH9NUOBRzcHcrf23/XzJh41o6g67uGUpF9tn23qmbcwjNauoRqKQfAdHCDwr/Ez/Ot7A==
dependencies:
"@babel/runtime" "^7.4.3"
"@sheerun/mutationobserver-shim" "^0.3.2"
pretty-format "^24.7.0"
wait-for-expect "^1.1.1"

domain-browser@^1.1.1:
version "1.2.0"
resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
Expand Down Expand Up @@ -10648,15 +10650,6 @@ pretty-format@^24.0.0:
ansi-regex "^4.0.0"
ansi-styles "^3.2.0"

pretty-format@^24.7.0:
version "24.7.0"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.7.0.tgz#d23106bc2edcd776079c2daa5da02bcb12ed0c10"
dependencies:
"@jest/types" "^24.7.0"
ansi-regex "^4.0.0"
ansi-styles "^3.2.0"
react-is "^16.8.4"

pretty-format@^24.8.0:
version "24.8.0"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.8.0.tgz#8dae7044f58db7cb8be245383b565a963e3c27f2"
Expand Down Expand Up @@ -11092,14 +11085,6 @@ react-test-renderer@^16.0.0-0:
react-is "^16.5.1"
schedule "^0.4.0"

react-testing-library@7.0.1:
version "7.0.1"
resolved "https://registry.yarnpkg.com/react-testing-library/-/react-testing-library-7.0.1.tgz#0cf113bb53a78599f018378f6854e91a52dbf205"
integrity sha512-doQkM3/xPcIm22x9jgTkGxU8xqXg4iWvM1WwbbQ7CI5/EMk3DhloYBwMyk+Ywtta3dIAIh9sC7llXoKovf3L+w==
dependencies:
"@babel/runtime" "^7.4.3"
dom-testing-library "^4.1.0"

react@16.8.6:
version "16.8.6"
resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
Expand Down Expand Up @@ -13367,10 +13352,10 @@ w3c-hr-time@^1.0.1:
dependencies:
browser-process-hrtime "^0.1.2"

wait-for-expect@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/wait-for-expect/-/wait-for-expect-1.1.1.tgz#9cd10e07d52810af9e0aaf509872e38f3c3d81ae"
integrity sha512-vd9JOqqEcBbCDhARWhW85ecjaEcfBLuXgVBqatfS3iw6oU4kzAcs+sCNjF+TC9YHPImCW7ypsuQc+htscIAQCw==
wait-for-expect@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/wait-for-expect/-/wait-for-expect-1.2.0.tgz#fdab6a26e87d2039101db88bff3d8158e5c3e13f"
integrity sha512-EJhKpA+5UHixduMBEGhTFuLuVgQBKWxkFbefOdj2bbk2/OpA5Opsc4aUTGmF+qJ+v3kTGxDRNYwKaT4j6g5n8Q==

walker@^1.0.7, walker@~1.0.5:
version "1.0.7"
Expand Down