Skip to content

Some fixes noticed testing FR1 release #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 30, 2020
Merged

Some fixes noticed testing FR1 release #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions packages/react-scripts/scripts/utils/frontierInit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,14 @@ function installFrontierDependencies(appPath, appName, ownPath) {
...[
'@emotion/core@10',
'@fs/zion-axios@2',
'@fs/zion-cache@2',
'@fs/zion-config@1',
'@fs/zion-debug@1',
'@fs/zion-error-boundary@2',
'@fs/zion-frontend-friends@2',
'@fs/zion-icon@3',
'@fs/zion-locale@3',
'@fs/zion-root@3',
'@fs/zion-router@3',
'@fs/zion-style-normalize@3',
'@fs/zion-subnav@2',
'@fs/zion-ui@6',
'@fs/zion-user@3',
'@sentry/browser@5',
Expand All @@ -49,6 +47,7 @@ function installFrontierDependencies(appPath, appName, ownPath) {
'@storybook/addon-viewport@5',
'@storybook/addons@5',
'@storybook/react@5',
'@storybook/theming@5',
'storybook-readme@5',
'@fs/eslint-config-frontier-react@4',
'@fs/babel-preset-frontier@2',
Expand All @@ -57,10 +56,10 @@ function installFrontierDependencies(appPath, appName, ownPath) {
'eslint@6',
'@alienfast/i18next-loader@1',
'dotenv@8',
'@testing-library/jest-dom@4',
'http-proxy-middleware@0.19',
'husky@3',
'lint-staged@8',
'@testing-library/jest-dom@5',
'http-proxy-middleware@0.20',
'husky@4',
'lint-staged@10',
'suppress-exit-code@0.1',
'source-map-explorer@2',
'gzip-cli@1',
Expand Down
9 changes: 0 additions & 9 deletions packages/react-scripts/template/src/setupTests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,8 @@
// For more details on how this file is used: https://bit.ly/31umnT1

/* eslint-disable import/no-extraneous-dependencies */
import { cleanup } from '@fs/zion-testing-library'
import { act } from 'react-dom/test-utils'
import '@testing-library/jest-dom/extend-expect'

// This performs a global cleanup as recommended by Kent C. Dodds.
// For more details see: https://bit.ly/2FhMiUT
afterEach(() => async () => {
await act(async () => {})
cleanup()
})

// Use this file to reduce boilerplate when writing tests. Add code that
// needs to be run for all or most of your tests. The most common
// things found in a file like this are afterEach(), beforeEach(),
Expand Down