From fa5b00f3d8758adc6732cb95fbf2619f87f6080e Mon Sep 17 00:00:00 2001 From: maciek Date: Thu, 22 Jun 2023 12:21:41 +0200 Subject: [PATCH] chore: use generated types from vega protos - move back setup-test imports --- apps/explorer/src/app/setup-tests.ts | 1 + apps/governance/src/setup-tests.ts | 1 + apps/trading/setup-tests.ts | 1 + jest.preset.js | 1 - libs/accounts/src/setup-tests.ts | 1 + libs/assets/src/setup-tests.ts | 1 + libs/candles-chart/src/setup-tests.ts | 2 ++ libs/deal-ticket/src/setup-tests.ts | 1 + libs/deposits/src/setup-tests.ts | 1 + libs/market-depth/src/setup-tests.ts | 1 + libs/markets/src/setup-tests.ts | 1 + libs/orders/src/setup-tests.ts | 1 + libs/positions/src/setup-tests.ts | 1 + libs/proposals/src/setup-tests.ts | 1 + libs/wallet/src/setup-tests.ts | 1 + libs/web3/src/setup-tests.ts | 1 + libs/withdraws/src/setup-tests.ts | 2 ++ 17 files changed, 18 insertions(+), 1 deletion(-) diff --git a/apps/explorer/src/app/setup-tests.ts b/apps/explorer/src/app/setup-tests.ts index 25ebbd3be..a7a3f6c6f 100644 --- a/apps/explorer/src/app/setup-tests.ts +++ b/apps/explorer/src/app/setup-tests.ts @@ -3,6 +3,7 @@ // expect(element).toHaveTextContent(/react/i) // learn more: https://github.com/testing-library/jest-dom import '@testing-library/jest-dom'; +import '../../../../setup-test'; Object.defineProperty(window, 'ResizeObserver', { writable: false, diff --git a/apps/governance/src/setup-tests.ts b/apps/governance/src/setup-tests.ts index d1a19b13c..17e93a516 100644 --- a/apps/governance/src/setup-tests.ts +++ b/apps/governance/src/setup-tests.ts @@ -7,6 +7,7 @@ import dev from './i18n/translations/dev.json'; import i18n from 'i18next'; import { initReactI18next } from 'react-i18next'; import ResizeObserver from 'resize-observer-polyfill'; +import '../../../setup-test'; // Set up i18n instance so that components have the correct default // en translations diff --git a/apps/trading/setup-tests.ts b/apps/trading/setup-tests.ts index ebaab45f9..e477778fe 100644 --- a/apps/trading/setup-tests.ts +++ b/apps/trading/setup-tests.ts @@ -2,6 +2,7 @@ import '@testing-library/jest-dom'; import 'jest-canvas-mock'; import ResizeObserver from 'resize-observer-polyfill'; import { defaultFallbackInView } from 'react-intersection-observer'; +import '../../setup-test'; defaultFallbackInView(true); global.ResizeObserver = ResizeObserver; diff --git a/jest.preset.js b/jest.preset.js index 935510f11..4f63f1ae4 100644 --- a/jest.preset.js +++ b/jest.preset.js @@ -6,5 +6,4 @@ module.exports = { ...(nxPreset?.transformIgnorePatterns || []), 'node_modules/(?!(@vegaprotocol/protos|protobuf-codec))', ], - setupFilesAfterEnv: ['./setup-tests.ts'], }; diff --git a/libs/accounts/src/setup-tests.ts b/libs/accounts/src/setup-tests.ts index 880268538..abab43f71 100644 --- a/libs/accounts/src/setup-tests.ts +++ b/libs/accounts/src/setup-tests.ts @@ -1,6 +1,7 @@ import '@testing-library/jest-dom'; import ResizeObserver from 'resize-observer-polyfill'; import { defaultFallbackInView } from 'react-intersection-observer'; +import '../../../setup-test'; defaultFallbackInView(true); global.ResizeObserver = ResizeObserver; diff --git a/libs/assets/src/setup-tests.ts b/libs/assets/src/setup-tests.ts index 7b0828bfa..da779783f 100644 --- a/libs/assets/src/setup-tests.ts +++ b/libs/assets/src/setup-tests.ts @@ -1 +1,2 @@ import '@testing-library/jest-dom'; +import '../../../setup-test'; diff --git a/libs/candles-chart/src/setup-tests.ts b/libs/candles-chart/src/setup-tests.ts index c0a2e114c..c4aa3e1cd 100644 --- a/libs/candles-chart/src/setup-tests.ts +++ b/libs/candles-chart/src/setup-tests.ts @@ -1,5 +1,7 @@ import '@testing-library/jest-dom'; import 'jest-canvas-mock'; +import '../../../setup-test'; + import ResizeObserver from 'resize-observer-polyfill'; global.ResizeObserver = ResizeObserver; diff --git a/libs/deal-ticket/src/setup-tests.ts b/libs/deal-ticket/src/setup-tests.ts index e62ea0326..859db154a 100644 --- a/libs/deal-ticket/src/setup-tests.ts +++ b/libs/deal-ticket/src/setup-tests.ts @@ -2,6 +2,7 @@ import '@testing-library/jest-dom'; import 'jest-canvas-mock'; import ResizeObserver from 'resize-observer-polyfill'; import { defaultFallbackInView } from 'react-intersection-observer'; +import '../../../setup-test'; defaultFallbackInView(true); global.ResizeObserver = ResizeObserver; diff --git a/libs/deposits/src/setup-tests.ts b/libs/deposits/src/setup-tests.ts index 68773380a..74c3a48ac 100644 --- a/libs/deposits/src/setup-tests.ts +++ b/libs/deposits/src/setup-tests.ts @@ -1,4 +1,5 @@ import '@testing-library/jest-dom'; import ResizeObserver from 'resize-observer-polyfill'; +import '../../../setup-test'; global.ResizeObserver = ResizeObserver; diff --git a/libs/market-depth/src/setup-tests.ts b/libs/market-depth/src/setup-tests.ts index 97c567326..5502c5d6a 100644 --- a/libs/market-depth/src/setup-tests.ts +++ b/libs/market-depth/src/setup-tests.ts @@ -1,5 +1,6 @@ import '@testing-library/jest-dom'; import 'jest-canvas-mock'; +import '../../../setup-test'; Object.defineProperty(window, 'matchMedia', { writable: true, diff --git a/libs/markets/src/setup-tests.ts b/libs/markets/src/setup-tests.ts index 68773380a..74c3a48ac 100644 --- a/libs/markets/src/setup-tests.ts +++ b/libs/markets/src/setup-tests.ts @@ -1,4 +1,5 @@ import '@testing-library/jest-dom'; import ResizeObserver from 'resize-observer-polyfill'; +import '../../../setup-test'; global.ResizeObserver = ResizeObserver; diff --git a/libs/orders/src/setup-tests.ts b/libs/orders/src/setup-tests.ts index 68773380a..74c3a48ac 100644 --- a/libs/orders/src/setup-tests.ts +++ b/libs/orders/src/setup-tests.ts @@ -1,4 +1,5 @@ import '@testing-library/jest-dom'; import ResizeObserver from 'resize-observer-polyfill'; +import '../../../setup-test'; global.ResizeObserver = ResizeObserver; diff --git a/libs/positions/src/setup-tests.ts b/libs/positions/src/setup-tests.ts index 68773380a..74c3a48ac 100644 --- a/libs/positions/src/setup-tests.ts +++ b/libs/positions/src/setup-tests.ts @@ -1,4 +1,5 @@ import '@testing-library/jest-dom'; import ResizeObserver from 'resize-observer-polyfill'; +import '../../../setup-test'; global.ResizeObserver = ResizeObserver; diff --git a/libs/proposals/src/setup-tests.ts b/libs/proposals/src/setup-tests.ts index 68773380a..74c3a48ac 100644 --- a/libs/proposals/src/setup-tests.ts +++ b/libs/proposals/src/setup-tests.ts @@ -1,4 +1,5 @@ import '@testing-library/jest-dom'; import ResizeObserver from 'resize-observer-polyfill'; +import '../../../setup-test'; global.ResizeObserver = ResizeObserver; diff --git a/libs/wallet/src/setup-tests.ts b/libs/wallet/src/setup-tests.ts index 68773380a..74c3a48ac 100644 --- a/libs/wallet/src/setup-tests.ts +++ b/libs/wallet/src/setup-tests.ts @@ -1,4 +1,5 @@ import '@testing-library/jest-dom'; import ResizeObserver from 'resize-observer-polyfill'; +import '../../../setup-test'; global.ResizeObserver = ResizeObserver; diff --git a/libs/web3/src/setup-tests.ts b/libs/web3/src/setup-tests.ts index 7b0828bfa..da779783f 100644 --- a/libs/web3/src/setup-tests.ts +++ b/libs/web3/src/setup-tests.ts @@ -1 +1,2 @@ import '@testing-library/jest-dom'; +import '../../../setup-test'; diff --git a/libs/withdraws/src/setup-tests.ts b/libs/withdraws/src/setup-tests.ts index 6002fef6c..446e9cbfa 100644 --- a/libs/withdraws/src/setup-tests.ts +++ b/libs/withdraws/src/setup-tests.ts @@ -1,5 +1,7 @@ import '@testing-library/jest-dom'; import ResizeObserver from 'resize-observer-polyfill'; +import '../../../setup-test'; + global.ResizeObserver = ResizeObserver; declare global {