diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index cbb2b867..2fa12783 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - id: set-dirs - working-directory: ./tests/integration + working-directory: ./tests-legacy/integration run: echo "::set-output name=dir::$( ls -d */ | xargs -0 | sed 's/\///' | jq -R -s -c 'split("\n")[:-2]')" test-integration: @@ -69,7 +69,7 @@ jobs: --config=./jest.integration.config.js \ --detectOpenHandles \ --forceExit \ - --testPathPattern=./tests/integration/${{ matrix.dir }}/* + --testPathPattern=./tests-legacy/integration/${{ matrix.dir }}/* - name: Upload traces uses: actions/upload-artifact@v2 diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index 104b2ef7..550841dc 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 - name: Install dependencies run: yarn - name: Install Playwright Browsers diff --git a/src/app/common/transactions/stacks/generate-unsigned-txs.spec.ts b/src/app/common/transactions/stacks/generate-unsigned-txs.spec.ts index 2c1d2306..6168aa4d 100644 --- a/src/app/common/transactions/stacks/generate-unsigned-txs.spec.ts +++ b/src/app/common/transactions/stacks/generate-unsigned-txs.spec.ts @@ -1,5 +1,5 @@ import { PostConditionMode } from '@stacks/transactions'; -import { generateContractCallToken } from '@tests/utils/transation-test-utils'; +import { generateContractCallToken } from '@tests-legacy/utils/transation-test-utils'; import { decodeToken } from 'jsontokens'; import { generateUnsignedTransaction } from './generate-unsigned-txs'; diff --git a/src/app/common/transactions/stacks/requests.spec.ts b/src/app/common/transactions/stacks/requests.spec.ts index f24ecf39..0cf00320 100644 --- a/src/app/common/transactions/stacks/requests.spec.ts +++ b/src/app/common/transactions/stacks/requests.spec.ts @@ -1,6 +1,6 @@ import { getAppPrivateKey } from '@stacks/wallet-sdk'; -import { STX_TRANSFER_TX_REQUEST, TEST_WALLET } from '@tests/mocks'; -import { generateContractCallToken } from '@tests/utils/transation-test-utils'; +import { STX_TRANSFER_TX_REQUEST, TEST_WALLET } from '@tests-legacy/mocks'; +import { generateContractCallToken } from '@tests-legacy/utils/transation-test-utils'; import { UNAUTHORIZED_TX_REQUEST, verifyTxRequest } from './requests'; diff --git a/src/app/components/account/account-list-item-layout.tsx b/src/app/components/account/account-list-item-layout.tsx index 6ed52af7..a32b6d41 100644 --- a/src/app/components/account/account-list-item-layout.tsx +++ b/src/app/components/account/account-list-item-layout.tsx @@ -1,6 +1,6 @@ import { Flex, Spinner, Stack, StackProps, color, useMediaQuery } from '@stacks/ui'; import { truncateMiddle } from '@stacks/ui-utils'; -import { SettingsSelectors } from '@tests/integration/settings.selectors'; +import { SettingsSelectors } from '@tests-legacy/integration/settings.selectors'; import { Caption } from '@app/components/typography'; import { AccountWithAddress } from '@app/store/accounts/account.models'; diff --git a/src/app/components/event-card.tsx b/src/app/components/event-card.tsx index 4e521042..14c965c0 100644 --- a/src/app/components/event-card.tsx +++ b/src/app/components/event-card.tsx @@ -1,7 +1,7 @@ import { FiMoreHorizontal } from 'react-icons/fi'; import { Box, IconButton, Stack, Text, color } from '@stacks/ui'; -import { SendFormSelectors } from '@tests/page-objects/send-form.selectors'; +import { SendFormSelectors } from '@tests-legacy/page-objects/send-form.selectors'; import { SpaceBetween } from '@app/components/space-between'; import { Caption } from '@app/components/typography'; diff --git a/src/app/components/fee-row/components/custom-fee-field.tsx b/src/app/components/fee-row/components/custom-fee-field.tsx index 51e38877..59e89943 100644 --- a/src/app/components/fee-row/components/custom-fee-field.tsx +++ b/src/app/components/fee-row/components/custom-fee-field.tsx @@ -1,7 +1,7 @@ import { Dispatch, FormEvent, SetStateAction, useCallback } from 'react'; import { Input, InputGroup, Stack, StackProps, color } from '@stacks/ui'; -import { SendFormSelectors } from '@tests/page-objects/send-form.selectors'; +import { SendFormSelectors } from '@tests-legacy/page-objects/send-form.selectors'; import BigNumber from 'bignumber.js'; import { useField } from 'formik'; diff --git a/src/app/components/fee-row/components/fee-estimate-select.tsx b/src/app/components/fee-row/components/fee-estimate-select.tsx index 36804d7f..808116d6 100644 --- a/src/app/components/fee-row/components/fee-estimate-select.tsx +++ b/src/app/components/fee-row/components/fee-estimate-select.tsx @@ -1,7 +1,7 @@ import { Dispatch, SetStateAction, useRef } from 'react'; import { Fade, Stack, color } from '@stacks/ui'; -import { SendFormSelectors } from '@tests/page-objects/send-form.selectors'; +import { SendFormSelectors } from '@tests-legacy/page-objects/send-form.selectors'; import { FeeEstimate, FeeType } from '@shared/models/fees-types'; diff --git a/src/app/components/fee-row/components/transaction-fee.tsx b/src/app/components/fee-row/components/transaction-fee.tsx index 22764706..b521b99c 100644 --- a/src/app/components/fee-row/components/transaction-fee.tsx +++ b/src/app/components/fee-row/components/transaction-fee.tsx @@ -1,5 +1,5 @@ import { Tooltip } from '@stacks/ui'; -import { TransactionSigningSelectors } from '@tests/page-objects/transaction-signing.selectors'; +import { TransactionSigningSelectors } from '@tests-legacy/page-objects/transaction-signing.selectors'; import { Money } from '@shared/models/money.model'; diff --git a/src/app/components/fee-row/fee-row.tsx b/src/app/components/fee-row/fee-row.tsx index 1484546b..dbedf958 100644 --- a/src/app/components/fee-row/fee-row.tsx +++ b/src/app/components/fee-row/fee-row.tsx @@ -2,7 +2,7 @@ import { Suspense, useCallback, useEffect, useMemo, useState } from 'react'; import { FiInfo } from 'react-icons/fi'; import { Box, Stack, Text, color } from '@stacks/ui'; -import { SendFormSelectors } from '@tests/page-objects/send-form.selectors'; +import { SendFormSelectors } from '@tests-legacy/page-objects/send-form.selectors'; import BigNumber from 'bignumber.js'; import { useField } from 'formik'; diff --git a/src/app/components/header.tsx b/src/app/components/header.tsx index dbf18482..1cba796d 100644 --- a/src/app/components/header.tsx +++ b/src/app/components/header.tsx @@ -3,8 +3,8 @@ import { FiArrowLeft, FiMoreHorizontal } from 'react-icons/fi'; import { useLocation, useNavigate } from 'react-router-dom'; import { Box, Flex, FlexProps, IconButton, Stack, Text, color, useMediaQuery } from '@stacks/ui'; -import { OnboardingSelectors } from '@tests/integration/onboarding/onboarding.selectors'; -import { SettingsSelectors } from '@tests/integration/settings.selectors'; +import { OnboardingSelectors } from '@tests-legacy/integration/onboarding/onboarding.selectors'; +import { SettingsSelectors } from '@tests-legacy/integration/settings.selectors'; import { BRANCH } from '@shared/environment'; import { RouteUrls } from '@shared/route-urls'; diff --git a/src/app/components/request-password.tsx b/src/app/components/request-password.tsx index a2e74274..74bf88ce 100644 --- a/src/app/components/request-password.tsx +++ b/src/app/components/request-password.tsx @@ -2,7 +2,7 @@ import { FormEvent, useCallback, useState } from 'react'; import UnlockSession from '@assets/images/unlock-session.png'; import { Box, Input, Stack, color } from '@stacks/ui'; -import { SettingsSelectors } from '@tests/integration/settings.selectors'; +import { SettingsSelectors } from '@tests-legacy/integration/settings.selectors'; import { useAnalytics } from '@app/common/hooks/analytics/use-analytics'; import { useWallet } from '@app/common/hooks/use-wallet'; diff --git a/src/app/components/stacks-transaction-item/stacks-transaction-item.tsx b/src/app/components/stacks-transaction-item/stacks-transaction-item.tsx index d9b18729..7c4ac701 100644 --- a/src/app/components/stacks-transaction-item/stacks-transaction-item.tsx +++ b/src/app/components/stacks-transaction-item/stacks-transaction-item.tsx @@ -3,7 +3,7 @@ import { createSearchParams, useLocation, useNavigate } from 'react-router-dom'; import type { MempoolTransaction } from '@stacks/stacks-blockchain-api-types'; import { Box, BoxProps, Flex, Stack, Text, color, useMediaQuery } from '@stacks/ui'; import { isPendingTx } from '@stacks/ui-utils'; -import { SendFormSelectors } from '@tests/page-objects/send-form.selectors'; +import { SendFormSelectors } from '@tests-legacy/page-objects/send-form.selectors'; import { StacksTx, TxTransferDetails } from '@shared/models/transactions/stacks-transaction.model'; import { RouteUrls } from '@shared/route-urls'; diff --git a/src/app/components/transaction/pending-label.tsx b/src/app/components/transaction/pending-label.tsx index f7437d90..c2701412 100644 --- a/src/app/components/transaction/pending-label.tsx +++ b/src/app/components/transaction/pending-label.tsx @@ -1,7 +1,7 @@ import { FiInfo } from 'react-icons/fi'; import { Box, Flex, Stack, Text, color } from '@stacks/ui'; -import { SendFormSelectors } from '@tests/page-objects/send-form.selectors'; +import { SendFormSelectors } from '@tests-legacy/page-objects/send-form.selectors'; import { Tooltip } from '@app/components/tooltip'; diff --git a/src/app/features/activity-list/components/transaction-list/bitcoin-transaction/bitcoin-transaction-value.tsx b/src/app/features/activity-list/components/transaction-list/bitcoin-transaction/bitcoin-transaction-value.tsx index 6aab4f78..591bfdd0 100644 --- a/src/app/features/activity-list/components/transaction-list/bitcoin-transaction/bitcoin-transaction-value.tsx +++ b/src/app/features/activity-list/components/transaction-list/bitcoin-transaction/bitcoin-transaction-value.tsx @@ -1,4 +1,4 @@ -import { SendFormSelectors } from '@tests/page-objects/send-form.selectors'; +import { SendFormSelectors } from '@tests-legacy/page-objects/send-form.selectors'; import { Title } from '@app/components/typography'; diff --git a/src/app/features/balances-list/balances-list.tsx b/src/app/features/balances-list/balances-list.tsx index af1330f5..af72ebed 100644 --- a/src/app/features/balances-list/balances-list.tsx +++ b/src/app/features/balances-list/balances-list.tsx @@ -2,7 +2,7 @@ import { useCallback } from 'react'; import { useNavigate } from 'react-router-dom'; import { Box, Stack, StackProps } from '@stacks/ui'; -import { HomePageSelectors } from '@tests/page-objects/home.selectors'; +import { HomePageSelectors } from '@tests-legacy/page-objects/home.selectors'; import { BITCOIN_TEST_ADDRESS } from '@shared/constants'; import { RouteUrls } from '@shared/route-urls'; diff --git a/src/app/features/balances-list/components/fund-account.tsx b/src/app/features/balances-list/components/fund-account.tsx index d77a47d8..69a3025f 100644 --- a/src/app/features/balances-list/components/fund-account.tsx +++ b/src/app/features/balances-list/components/fund-account.tsx @@ -1,6 +1,6 @@ import NoFunds from '@assets/images/no-funds.png'; import { Flex, FlexProps } from '@stacks/ui'; -import { OnboardingSelectors } from '@tests/integration/onboarding/onboarding.selectors'; +import { OnboardingSelectors } from '@tests-legacy/integration/onboarding/onboarding.selectors'; import { SecondaryButton } from '@app/components/secondary-button'; import { Caption } from '@app/components/typography'; diff --git a/src/app/features/current-account/current-account-name.tsx b/src/app/features/current-account/current-account-name.tsx index b703502c..16184ea5 100644 --- a/src/app/features/current-account/current-account-name.tsx +++ b/src/app/features/current-account/current-account-name.tsx @@ -2,7 +2,7 @@ import { Suspense, memo } from 'react'; import { BoxProps } from '@stacks/ui'; import { memoWithAs } from '@stacks/ui-core'; -import { SettingsSelectors } from '@tests/integration/settings.selectors'; +import { SettingsSelectors } from '@tests-legacy/integration/settings.selectors'; import { useCurrentAccountDisplayName } from '@app/common/hooks/account/use-account-names'; import { truncateString } from '@app/common/utils'; diff --git a/src/app/features/secret-key-displayer/components/secret-key-word.tsx b/src/app/features/secret-key-displayer/components/secret-key-word.tsx index 2af42627..a0abd803 100644 --- a/src/app/features/secret-key-displayer/components/secret-key-word.tsx +++ b/src/app/features/secret-key-displayer/components/secret-key-word.tsx @@ -1,5 +1,5 @@ import { Box, color } from '@stacks/ui'; -import { OnboardingSelectors } from '@tests/integration/onboarding/onboarding.selectors'; +import { OnboardingSelectors } from '@tests-legacy/integration/onboarding/onboarding.selectors'; import { Text } from '@app/components/typography'; diff --git a/src/app/features/secret-key-displayer/secret-key-displayer.layout.tsx b/src/app/features/secret-key-displayer/secret-key-displayer.layout.tsx index ce2a26ae..204fc17b 100644 --- a/src/app/features/secret-key-displayer/secret-key-displayer.layout.tsx +++ b/src/app/features/secret-key-displayer/secret-key-displayer.layout.tsx @@ -2,7 +2,7 @@ import { FiCopy } from 'react-icons/fi'; import YourSecretKey from '@assets/images/onboarding/your-secret-key.png'; import { Box, Stack, color } from '@stacks/ui'; -import { SettingsSelectors } from '@tests/integration/settings.selectors'; +import { SettingsSelectors } from '@tests-legacy/integration/settings.selectors'; import { Link } from '@app/components/link'; import { Text, Title } from '@app/components/typography'; diff --git a/src/app/features/settings-dropdown/settings-dropdown.tsx b/src/app/features/settings-dropdown/settings-dropdown.tsx index e3fdda70..8df87774 100644 --- a/src/app/features/settings-dropdown/settings-dropdown.tsx +++ b/src/app/features/settings-dropdown/settings-dropdown.tsx @@ -2,7 +2,7 @@ import { useCallback, useRef } from 'react'; import { useNavigate } from 'react-router-dom'; import { Box, Flex, SlideFade, color } from '@stacks/ui'; -import { SettingsSelectors } from '@tests/integration/settings.selectors'; +import { SettingsSelectors } from '@tests-legacy/integration/settings.selectors'; import { RouteUrls } from '@shared/route-urls'; diff --git a/src/app/features/suggested-first-steps/components/step-done-badge.tsx b/src/app/features/suggested-first-steps/components/step-done-badge.tsx index 410bca77..65d405ec 100644 --- a/src/app/features/suggested-first-steps/components/step-done-badge.tsx +++ b/src/app/features/suggested-first-steps/components/step-done-badge.tsx @@ -1,7 +1,7 @@ import { FiCheck } from 'react-icons/fi'; import { Stack, color } from '@stacks/ui'; -import { OnboardingSelectors } from '@tests/integration/onboarding/onboarding.selectors'; +import { OnboardingSelectors } from '@tests-legacy/integration/onboarding/onboarding.selectors'; import { Caption } from '@app/components/typography'; diff --git a/src/app/features/suggested-first-steps/components/step-full-page.tsx b/src/app/features/suggested-first-steps/components/step-full-page.tsx index 5e6130be..7e867f32 100644 --- a/src/app/features/suggested-first-steps/components/step-full-page.tsx +++ b/src/app/features/suggested-first-steps/components/step-full-page.tsx @@ -1,7 +1,7 @@ import { FiArrowRight } from 'react-icons/fi'; import { Box, Flex, Stack, color } from '@stacks/ui'; -import { OnboardingSelectors } from '@tests/integration/onboarding/onboarding.selectors'; +import { OnboardingSelectors } from '@tests-legacy/integration/onboarding/onboarding.selectors'; import { Link } from '@app/components/link'; import { Tooltip } from '@app/components/tooltip'; diff --git a/src/app/features/suggested-first-steps/suggested-first-steps.layout.tsx b/src/app/features/suggested-first-steps/suggested-first-steps.layout.tsx index 97e0d5b9..e26550dd 100644 --- a/src/app/features/suggested-first-steps/suggested-first-steps.layout.tsx +++ b/src/app/features/suggested-first-steps/suggested-first-steps.layout.tsx @@ -1,7 +1,7 @@ import { FiX } from 'react-icons/fi'; import { Circle, Flex, Grid, GridProps, Stack, color } from '@stacks/ui'; -import { OnboardingSelectors } from '@tests/integration/onboarding/onboarding.selectors'; +import { OnboardingSelectors } from '@tests-legacy/integration/onboarding/onboarding.selectors'; import { HOME_FULL_PAGE_MAX_WIDTH } from '@app/components/global-styles/full-page-styles'; import { SpaceBetween } from '@app/components/space-between'; diff --git a/src/app/features/theme-drawer/theme-list.tsx b/src/app/features/theme-drawer/theme-list.tsx index 320fa070..2723fc4f 100644 --- a/src/app/features/theme-drawer/theme-list.tsx +++ b/src/app/features/theme-drawer/theme-list.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react'; import { Flex, FlexProps } from '@stacks/ui'; -import { SettingsSelectors } from '@tests/integration/settings.selectors'; +import { SettingsSelectors } from '@tests-legacy/integration/settings.selectors'; import { useAnalytics } from '@app/common/hooks/analytics/use-analytics'; import { UserSelectedTheme, themeLabelMap, useThemeSwitcher } from '@app/common/theme-provider'; diff --git a/src/app/pages/add-network/add-network.tsx b/src/app/pages/add-network/add-network.tsx index cf438f77..9825a715 100644 --- a/src/app/pages/add-network/add-network.tsx +++ b/src/app/pages/add-network/add-network.tsx @@ -3,7 +3,7 @@ import { useNavigate } from 'react-router-dom'; import { ChainID } from '@stacks/transactions'; import { Input, Stack } from '@stacks/ui'; -import { NetworkSelectors } from '@tests/integration/network.selectors'; +import { NetworkSelectors } from '@tests-legacy/integration/network.selectors'; import { Formik } from 'formik'; import { DefaultNetworkConfigurations } from '@shared/constants'; diff --git a/src/app/pages/allow-diagnostics/allow-diagnostics-layout.tsx b/src/app/pages/allow-diagnostics/allow-diagnostics-layout.tsx index 9837858d..7038280e 100644 --- a/src/app/pages/allow-diagnostics/allow-diagnostics-layout.tsx +++ b/src/app/pages/allow-diagnostics/allow-diagnostics-layout.tsx @@ -3,7 +3,7 @@ import { FiCheck } from 'react-icons/fi'; import HelpUsImprove from '@assets/images/onboarding/help-us-improve.png'; import { Box, Button, Flex, Stack, color } from '@stacks/ui'; -import { OnboardingSelectors } from '@tests/integration/onboarding/onboarding.selectors'; +import { OnboardingSelectors } from '@tests-legacy/integration/onboarding/onboarding.selectors'; import { CenteredPageContainer } from '@app/components/centered-page-container'; import { CENTERED_FULL_PAGE_MAX_WIDTH } from '@app/components/global-styles/full-page-styles'; diff --git a/src/app/pages/fund/components/fiat-provider-item.tsx b/src/app/pages/fund/components/fiat-provider-item.tsx index d964050f..cee9d142 100644 --- a/src/app/pages/fund/components/fiat-provider-item.tsx +++ b/src/app/pages/fund/components/fiat-provider-item.tsx @@ -1,4 +1,4 @@ -import { FundPageSelectors } from '@tests/page-objects/fund.selectors'; +import { FundPageSelectors } from '@tests-legacy/page-objects/fund.selectors'; import { AvailableRegions } from '@app/query/common/hiro-config/hiro-config.query'; diff --git a/src/app/pages/fund/components/fund-account-tile.tsx b/src/app/pages/fund/components/fund-account-tile.tsx index 84c73829..e5d5c8bc 100644 --- a/src/app/pages/fund/components/fund-account-tile.tsx +++ b/src/app/pages/fund/components/fund-account-tile.tsx @@ -1,5 +1,5 @@ import { Box, Stack, color, transition } from '@stacks/ui'; -import { FundPageSelectors } from '@tests/page-objects/fund.selectors'; +import { FundPageSelectors } from '@tests-legacy/page-objects/fund.selectors'; import { Caption, Title } from '@app/components/typography'; diff --git a/src/app/pages/fund/components/receive-stx-item.tsx b/src/app/pages/fund/components/receive-stx-item.tsx index 3d9e2e26..a93d2469 100644 --- a/src/app/pages/fund/components/receive-stx-item.tsx +++ b/src/app/pages/fund/components/receive-stx-item.tsx @@ -2,7 +2,7 @@ import QRCodeIcon from '@assets/images/fund/qr-code-icon.png'; import ReceiveStxEllipses from '@assets/images/fund/receive-stx-ellipses.png'; import StacksIcon from '@assets/images/fund/stacks-icon.png'; import { Box } from '@stacks/ui'; -import { FundPageSelectors } from '@tests/page-objects/fund.selectors'; +import { FundPageSelectors } from '@tests-legacy/page-objects/fund.selectors'; import { FundAccountTile } from './fund-account-tile'; diff --git a/src/app/pages/fund/components/skip-fund-account-button.tsx b/src/app/pages/fund/components/skip-fund-account-button.tsx index c367a03c..1563015b 100644 --- a/src/app/pages/fund/components/skip-fund-account-button.tsx +++ b/src/app/pages/fund/components/skip-fund-account-button.tsx @@ -1,5 +1,5 @@ import { Button } from '@stacks/ui'; -import { FundPageSelectors } from '@tests/page-objects/fund.selectors'; +import { FundPageSelectors } from '@tests-legacy/page-objects/fund.selectors'; interface SkipFundAccountButton { onSkipFundAccount(): void; diff --git a/src/app/pages/home/components/account-area.tsx b/src/app/pages/home/components/account-area.tsx index e582436a..e147f111 100644 --- a/src/app/pages/home/components/account-area.tsx +++ b/src/app/pages/home/components/account-area.tsx @@ -3,7 +3,7 @@ import { FiCopy } from 'react-icons/fi'; import { Box, Stack, StackProps, color, useClipboard } from '@stacks/ui'; import { truncateMiddle } from '@stacks/ui-utils'; -import { UserAreaSelectors } from '@tests/integration/user-area.selectors'; +import { UserAreaSelectors } from '@tests-legacy/integration/user-area.selectors'; import { useAnalytics } from '@app/common/hooks/analytics/use-analytics'; import { Tooltip } from '@app/components/tooltip'; diff --git a/src/app/pages/home/components/buy-button.tsx b/src/app/pages/home/components/buy-button.tsx index 541125bc..5895ab94 100644 --- a/src/app/pages/home/components/buy-button.tsx +++ b/src/app/pages/home/components/buy-button.tsx @@ -4,7 +4,7 @@ import { useNavigate } from 'react-router-dom'; import { ChainID } from '@stacks/transactions'; import { ButtonProps } from '@stacks/ui'; -import { HomePageSelectors } from '@tests/page-objects/home.selectors'; +import { HomePageSelectors } from '@tests-legacy/page-objects/home.selectors'; import { RouteUrls } from '@shared/route-urls'; diff --git a/src/app/pages/home/components/home.layout.tsx b/src/app/pages/home/components/home.layout.tsx index 33a9d8e1..874d7c21 100644 --- a/src/app/pages/home/components/home.layout.tsx +++ b/src/app/pages/home/components/home.layout.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Flex, Stack } from '@stacks/ui'; -import { HomePageSelectors } from '@tests/page-objects/home.selectors'; +import { HomePageSelectors } from '@tests-legacy/page-objects/home.selectors'; import { HOME_FULL_PAGE_MAX_WIDTH } from '@app/components/global-styles/full-page-styles'; diff --git a/src/app/pages/home/components/send-button.tsx b/src/app/pages/home/components/send-button.tsx index 488d6c74..d09e4ee9 100644 --- a/src/app/pages/home/components/send-button.tsx +++ b/src/app/pages/home/components/send-button.tsx @@ -3,7 +3,7 @@ import { FiArrowUp } from 'react-icons/fi'; import { useNavigate } from 'react-router-dom'; import { ButtonProps } from '@stacks/ui'; -import { HomePageSelectors } from '@tests/page-objects/home.selectors'; +import { HomePageSelectors } from '@tests-legacy/page-objects/home.selectors'; import { featureFlags } from '@shared/feature-flags'; import { RouteUrls } from '@shared/route-urls'; diff --git a/src/app/pages/onboarding/back-up-secret-key/components/back-up-secret-key-actions.tsx b/src/app/pages/onboarding/back-up-secret-key/components/back-up-secret-key-actions.tsx index 2df32c0b..e4acaaf7 100644 --- a/src/app/pages/onboarding/back-up-secret-key/components/back-up-secret-key-actions.tsx +++ b/src/app/pages/onboarding/back-up-secret-key/components/back-up-secret-key-actions.tsx @@ -1,7 +1,7 @@ import { FiEyeOff, FiLock, FiRotateCcw } from 'react-icons/fi'; import { Box, Stack, color } from '@stacks/ui'; -import { OnboardingSelectors } from '@tests/integration/onboarding/onboarding.selectors'; +import { OnboardingSelectors } from '@tests-legacy/integration/onboarding/onboarding.selectors'; import { PrimaryButton } from '@app/components/primary-button'; import { Caption } from '@app/components/typography'; diff --git a/src/app/pages/onboarding/magic-recovery-code/magic-recovery-code.tsx b/src/app/pages/onboarding/magic-recovery-code/magic-recovery-code.tsx index 4f59fd57..33ebab08 100644 --- a/src/app/pages/onboarding/magic-recovery-code/magic-recovery-code.tsx +++ b/src/app/pages/onboarding/magic-recovery-code/magic-recovery-code.tsx @@ -2,7 +2,7 @@ import { memo } from 'react'; import { useNavigate } from 'react-router-dom'; import { Button, Flex, Input, Stack, StackProps, Text } from '@stacks/ui'; -import { WalletPageSelectors } from '@tests/page-objects/wallet.selectors'; +import { WalletPageSelectors } from '@tests-legacy/page-objects/wallet.selectors'; import { Form, Formik } from 'formik'; import { RouteUrls } from '@shared/route-urls'; diff --git a/src/app/pages/onboarding/set-password/components/password-field.tsx b/src/app/pages/onboarding/set-password/components/password-field.tsx index 7cd98f34..f5754481 100644 --- a/src/app/pages/onboarding/set-password/components/password-field.tsx +++ b/src/app/pages/onboarding/set-password/components/password-field.tsx @@ -2,7 +2,7 @@ import { useState } from 'react'; import { FiEye, FiEyeOff } from 'react-icons/fi'; import { Box, Button, Flex, Input, color } from '@stacks/ui'; -import { OnboardingSelectors } from '@tests/integration/onboarding/onboarding.selectors'; +import { OnboardingSelectors } from '@tests-legacy/integration/onboarding/onboarding.selectors'; import { useField } from 'formik'; import { ValidatedPassword } from '@app/common/validation/validate-password'; diff --git a/src/app/pages/onboarding/set-password/set-password.tsx b/src/app/pages/onboarding/set-password/set-password.tsx index c637bc0d..e2e25a8f 100644 --- a/src/app/pages/onboarding/set-password/set-password.tsx +++ b/src/app/pages/onboarding/set-password/set-password.tsx @@ -3,7 +3,7 @@ import { useNavigate } from 'react-router-dom'; import SetPassword from '@assets/images/onboarding/set-password.png'; import { Box, Stack, Text } from '@stacks/ui'; -import { OnboardingSelectors } from '@tests/integration/onboarding/onboarding.selectors'; +import { OnboardingSelectors } from '@tests-legacy/integration/onboarding/onboarding.selectors'; import { Form, Formik } from 'formik'; import { debounce } from 'ts-debounce'; import * as yup from 'yup'; diff --git a/src/app/pages/onboarding/sign-in/sign-in.tsx b/src/app/pages/onboarding/sign-in/sign-in.tsx index aaae1262..bfa2d69e 100644 --- a/src/app/pages/onboarding/sign-in/sign-in.tsx +++ b/src/app/pages/onboarding/sign-in/sign-in.tsx @@ -2,7 +2,7 @@ import { useNavigate } from 'react-router-dom'; import YourSecretKey from '@assets/images/onboarding/your-secret-key.png'; import { Box, Input, Stack, Text, color, useMediaQuery } from '@stacks/ui'; -import { OnboardingSelectors } from '@tests/integration/onboarding/onboarding.selectors'; +import { OnboardingSelectors } from '@tests-legacy/integration/onboarding/onboarding.selectors'; import { Form, Formik } from 'formik'; import { RouteUrls } from '@shared/route-urls'; diff --git a/src/app/pages/onboarding/welcome/welcome.layout.tsx b/src/app/pages/onboarding/welcome/welcome.layout.tsx index 4ab7842d..446a8f67 100644 --- a/src/app/pages/onboarding/welcome/welcome.layout.tsx +++ b/src/app/pages/onboarding/welcome/welcome.layout.tsx @@ -2,7 +2,7 @@ import { Outlet } from 'react-router-dom'; import ExploreStacks from '@assets/images/onboarding/explore-stacks.png'; import { Box, Flex, color } from '@stacks/ui'; -import { OnboardingSelectors } from '@tests/integration/onboarding/onboarding.selectors'; +import { OnboardingSelectors } from '@tests-legacy/integration/onboarding/onboarding.selectors'; import { featureFlags } from '@shared/feature-flags'; diff --git a/src/app/pages/select-network/components/add-network-button.tsx b/src/app/pages/select-network/components/add-network-button.tsx index d4301e36..38760173 100644 --- a/src/app/pages/select-network/components/add-network-button.tsx +++ b/src/app/pages/select-network/components/add-network-button.tsx @@ -1,5 +1,5 @@ import { Button, ButtonProps } from '@stacks/ui'; -import { SettingsSelectors } from '@tests/integration/settings.selectors'; +import { SettingsSelectors } from '@tests-legacy/integration/settings.selectors'; interface AddNetworkButtonProps extends ButtonProps { onAddNetwork(): void; diff --git a/src/app/pages/select-network/components/network-list-item.layout.tsx b/src/app/pages/select-network/components/network-list-item.layout.tsx index 120eb512..5c6774a5 100644 --- a/src/app/pages/select-network/components/network-list-item.layout.tsx +++ b/src/app/pages/select-network/components/network-list-item.layout.tsx @@ -1,5 +1,5 @@ import { Box, BoxProps, Flex, Stack, color } from '@stacks/ui'; -import { SettingsSelectors } from '@tests/integration/settings.selectors'; +import { SettingsSelectors } from '@tests-legacy/integration/settings.selectors'; import { NetworkConfiguration } from '@shared/constants'; diff --git a/src/app/pages/send-tokens/components/amount-field.tsx b/src/app/pages/send-tokens/components/amount-field.tsx index 71e20553..10f29e1b 100644 --- a/src/app/pages/send-tokens/components/amount-field.tsx +++ b/src/app/pages/send-tokens/components/amount-field.tsx @@ -1,7 +1,7 @@ import { memo } from 'react'; import { Box, Input, InputGroup, Stack, StackProps, Text } from '@stacks/ui'; -import { SendFormSelectors } from '@tests/page-objects/send-form.selectors'; +import { SendFormSelectors } from '@tests-legacy/page-objects/send-form.selectors'; import { useFormikContext } from 'formik'; import { SendFormValues } from '@shared/models/form.model'; diff --git a/src/app/pages/send-tokens/components/asset-search/asset-search-field.tsx b/src/app/pages/send-tokens/components/asset-search/asset-search-field.tsx index 4bbfb161..81c759c8 100644 --- a/src/app/pages/send-tokens/components/asset-search/asset-search-field.tsx +++ b/src/app/pages/send-tokens/components/asset-search/asset-search-field.tsx @@ -1,7 +1,7 @@ import { useRef } from 'react'; import { Box, Flex, Input, Text } from '@stacks/ui'; -import { SendFormSelectors } from '@tests/page-objects/send-form.selectors'; +import { SendFormSelectors } from '@tests-legacy/page-objects/send-form.selectors'; import { useCombobox } from 'downshift'; import type { diff --git a/src/app/pages/send-tokens/components/asset-search/selected-asset-item.tsx b/src/app/pages/send-tokens/components/asset-search/selected-asset-item.tsx index d3d5f483..b337cd38 100644 --- a/src/app/pages/send-tokens/components/asset-search/selected-asset-item.tsx +++ b/src/app/pages/send-tokens/components/asset-search/selected-asset-item.tsx @@ -1,7 +1,7 @@ import { memo } from 'react'; import { Box, BoxProps, ChevronIcon, Stack, Text, color } from '@stacks/ui'; -import { SendFormSelectors } from '@tests/page-objects/send-form.selectors'; +import { SendFormSelectors } from '@tests-legacy/page-objects/send-form.selectors'; import { useField } from 'formik'; import { diff --git a/src/app/pages/send-tokens/components/memo-field.tsx b/src/app/pages/send-tokens/components/memo-field.tsx index 6fd63f2d..7dfb53bf 100644 --- a/src/app/pages/send-tokens/components/memo-field.tsx +++ b/src/app/pages/send-tokens/components/memo-field.tsx @@ -1,7 +1,7 @@ import { memo } from 'react'; import { Input, InputGroup, Stack, StackProps, Text } from '@stacks/ui'; -import { SendFormSelectors } from '@tests/page-objects/send-form.selectors'; +import { SendFormSelectors } from '@tests-legacy/page-objects/send-form.selectors'; import { useFormikContext } from 'formik'; import { ErrorLabel } from '@app/components/error-label'; diff --git a/src/app/pages/send-tokens/components/recipient-field.tsx b/src/app/pages/send-tokens/components/recipient-field.tsx index dc91cb2e..b297b495 100644 --- a/src/app/pages/send-tokens/components/recipient-field.tsx +++ b/src/app/pages/send-tokens/components/recipient-field.tsx @@ -4,7 +4,7 @@ import { FiCopy, FiInfo } from 'react-icons/fi'; import { Box, Input, InputGroup, Stack, StackProps, Text, useClipboard } from '@stacks/ui'; import { color, truncateMiddle } from '@stacks/ui-utils'; -import { SendFormSelectors } from '@tests/page-objects/send-form.selectors'; +import { SendFormSelectors } from '@tests-legacy/page-objects/send-form.selectors'; import { useFormikContext } from 'formik'; import { SendFormValues } from '@shared/models/form.model'; diff --git a/src/app/pages/send-tokens/components/send-form-inner.tsx b/src/app/pages/send-tokens/components/send-form-inner.tsx index f5c005e8..81197997 100644 --- a/src/app/pages/send-tokens/components/send-form-inner.tsx +++ b/src/app/pages/send-tokens/components/send-form-inner.tsx @@ -1,7 +1,7 @@ import { Suspense, useCallback } from 'react'; import { Box, Stack, Text } from '@stacks/ui'; -import { SendFormSelectors } from '@tests/page-objects/send-form.selectors'; +import { SendFormSelectors } from '@tests-legacy/page-objects/send-form.selectors'; import { useFormikContext } from 'formik'; import { HIGH_FEE_AMOUNT_STX } from '@shared/constants'; diff --git a/src/app/pages/send-tokens/components/send-max-button.tsx b/src/app/pages/send-tokens/components/send-max-button.tsx index 5e9fbcbf..f1c5f82a 100644 --- a/src/app/pages/send-tokens/components/send-max-button.tsx +++ b/src/app/pages/send-tokens/components/send-max-button.tsx @@ -2,7 +2,7 @@ import { useCallback } from 'react'; import { toast } from 'react-hot-toast'; import { Box, ButtonProps, color } from '@stacks/ui'; -import { SendFormSelectors } from '@tests/page-objects/send-form.selectors'; +import { SendFormSelectors } from '@tests-legacy/page-objects/send-form.selectors'; import { isUndefined } from '@shared/utils'; diff --git a/src/app/pages/send-tokens/components/send-tokens-confirm-drawer/send-tokens-confirm-actions.tsx b/src/app/pages/send-tokens/components/send-tokens-confirm-drawer/send-tokens-confirm-actions.tsx index 5e2b8bba..fad1d140 100644 --- a/src/app/pages/send-tokens/components/send-tokens-confirm-drawer/send-tokens-confirm-actions.tsx +++ b/src/app/pages/send-tokens/components/send-tokens-confirm-drawer/send-tokens-confirm-actions.tsx @@ -1,6 +1,6 @@ import { StacksTransaction } from '@stacks/transactions'; import { Button, Stack } from '@stacks/ui'; -import { SendFormSelectors } from '@tests/page-objects/send-form.selectors'; +import { SendFormSelectors } from '@tests-legacy/page-objects/send-form.selectors'; import { LoadingKeys, useLoading } from '@app/common/hooks/use-loading'; diff --git a/src/app/pages/send-tokens/components/send-tokens-confirm-drawer/send-tokens-confirm-details.tsx b/src/app/pages/send-tokens/components/send-tokens-confirm-drawer/send-tokens-confirm-details.tsx index 295e4323..5bcf056a 100644 --- a/src/app/pages/send-tokens/components/send-tokens-confirm-drawer/send-tokens-confirm-details.tsx +++ b/src/app/pages/send-tokens/components/send-tokens-confirm-drawer/send-tokens-confirm-details.tsx @@ -1,6 +1,6 @@ import { Flex, StackProps } from '@stacks/ui'; import { color, truncateMiddle } from '@stacks/ui-utils'; -import { SendFormSelectors } from '@tests/page-objects/send-form.selectors'; +import { SendFormSelectors } from '@tests-legacy/page-objects/send-form.selectors'; import { getIconString } from '@app/common/crypto-assets/stacks-crypto-asset.utils'; import { useSelectedAssetBalance } from '@app/common/hooks/use-selected-asset-balance'; diff --git a/src/app/pages/sign-out-confirm/sign-out-confirm.layout.tsx b/src/app/pages/sign-out-confirm/sign-out-confirm.layout.tsx index facb39a6..ed9c4585 100644 --- a/src/app/pages/sign-out-confirm/sign-out-confirm.layout.tsx +++ b/src/app/pages/sign-out-confirm/sign-out-confirm.layout.tsx @@ -1,7 +1,7 @@ import { FC } from 'react'; import { Box, Button, Flex, Text, color } from '@stacks/ui'; -import { SettingsSelectors } from '@tests/integration/settings.selectors'; +import { SettingsSelectors } from '@tests-legacy/integration/settings.selectors'; import { useFormik } from 'formik'; import { useWalletType } from '@app/common/use-wallet-type'; diff --git a/src/app/pages/transaction-request/components/minimal-error-message.tsx b/src/app/pages/transaction-request/components/minimal-error-message.tsx index 83deed29..e18c94c1 100644 --- a/src/app/pages/transaction-request/components/minimal-error-message.tsx +++ b/src/app/pages/transaction-request/components/minimal-error-message.tsx @@ -2,7 +2,7 @@ import { Suspense, memo } from 'react'; import { FiAlertTriangle } from 'react-icons/fi'; import { Box, Stack, StackProps, color } from '@stacks/ui'; -import { TransactionSigningSelectors } from '@tests/page-objects/transaction-signing.selectors'; +import { TransactionSigningSelectors } from '@tests-legacy/page-objects/transaction-signing.selectors'; import { Caption } from '@app/components/typography'; import { TransactionErrorReason } from '@app/pages/transaction-request/components/transaction-error/transaction-error'; diff --git a/src/app/pages/transaction-request/components/page-top.tsx b/src/app/pages/transaction-request/components/page-top.tsx index adf01667..73e119d6 100644 --- a/src/app/pages/transaction-request/components/page-top.tsx +++ b/src/app/pages/transaction-request/components/page-top.tsx @@ -1,7 +1,7 @@ import { memo } from 'react'; import { Stack } from '@stacks/ui'; -import { TransactionSigningSelectors } from '@tests/page-objects/transaction-signing.selectors'; +import { TransactionSigningSelectors } from '@tests-legacy/page-objects/transaction-signing.selectors'; import { useDefaultRequestParams } from '@app/common/hooks/use-default-request-search-params'; import { addPortSuffix, getUrlHostname } from '@app/common/utils'; diff --git a/src/app/pages/transaction-request/components/submit-action.tsx b/src/app/pages/transaction-request/components/submit-action.tsx index f82dd493..394c2baf 100644 --- a/src/app/pages/transaction-request/components/submit-action.tsx +++ b/src/app/pages/transaction-request/components/submit-action.tsx @@ -1,7 +1,7 @@ import { Suspense } from 'react'; import { Button, ButtonProps } from '@stacks/ui'; -import { TransactionSigningSelectors } from '@tests/page-objects/transaction-signing.selectors'; +import { TransactionSigningSelectors } from '@tests-legacy/page-objects/transaction-signing.selectors'; import { useFormikContext } from 'formik'; import { HIGH_FEE_AMOUNT_STX } from '@shared/constants'; diff --git a/src/app/query/stacks/nonce/account-nonces.query.spec.ts b/src/app/query/stacks/nonce/account-nonces.query.spec.ts index 08326ede..fd8dc303 100644 --- a/src/app/query/stacks/nonce/account-nonces.query.spec.ts +++ b/src/app/query/stacks/nonce/account-nonces.query.spec.ts @@ -1,6 +1,6 @@ import { AddressNonces } from '@stacks/blockchain-api-client/lib/generated'; import { MempoolTransaction, Transaction } from '@stacks/stacks-blockchain-api-types'; -import { setupHeystackEnv } from '@tests/mocks/heystack'; +import { setupHeystackEnv } from '@tests-legacy/mocks/heystack'; import { NonceTypes, getNextNonce } from './account-nonces.utils'; diff --git a/src/app/store/accounts/account.spec.tsx b/src/app/store/accounts/account.spec.tsx index ced339b8..75d0fd1b 100644 --- a/src/app/store/accounts/account.spec.tsx +++ b/src/app/store/accounts/account.spec.tsx @@ -1,6 +1,6 @@ import { act, renderHook } from '@testing-library/react-hooks'; -import { TEST_ACCOUNTS_WITH_ADDRESS } from '@tests/mocks'; -import { ProviderWithTestWallet } from '@tests/state-utils'; +import { TEST_ACCOUNTS_WITH_ADDRESS } from '@tests-legacy/mocks'; +import { ProviderWithTestWallet } from '@tests-legacy/state-utils'; import { useAtomValue } from 'jotai/utils'; import { accountsWithAddressState, softwareAccountsState } from '@app/store/accounts/accounts'; diff --git a/src/app/store/transactions/post-conditions.spec.ts b/src/app/store/transactions/post-conditions.spec.ts index 6255851b..ecfa4833 100644 --- a/src/app/store/transactions/post-conditions.spec.ts +++ b/src/app/store/transactions/post-conditions.spec.ts @@ -1,5 +1,5 @@ import { FungibleConditionCode, parsePrincipalString } from '@stacks/transactions'; -import { HEYSTACK_HEY_TX_REQUEST, HEYSTACK_HEY_TX_REQUEST_DECODED } from '@tests/mocks'; +import { HEYSTACK_HEY_TX_REQUEST, HEYSTACK_HEY_TX_REQUEST_DECODED } from '@tests-legacy/mocks'; import { getPayloadFromToken } from '@shared/utils/requests'; diff --git a/src/app/store/utils/vault-reducer-migration.spec.ts b/src/app/store/utils/vault-reducer-migration.spec.ts index 1f952c52..65c59b12 100644 --- a/src/app/store/utils/vault-reducer-migration.spec.ts +++ b/src/app/store/utils/vault-reducer-migration.spec.ts @@ -1,4 +1,4 @@ -import { LocalStorageMock } from '@tests/mocks/localStorage-mock'; +import { LocalStorageMock } from '@tests-legacy/mocks/localStorage-mock'; import { defaultKeyId } from '../keys/key.slice'; import { migrateVaultReducerStoreToNewStateStructure } from './vault-reducer-migration'; diff --git a/src/shared/utils/requests.spec.ts b/src/shared/utils/requests.spec.ts index 240c44f7..d5647887 100644 --- a/src/shared/utils/requests.spec.ts +++ b/src/shared/utils/requests.spec.ts @@ -1,5 +1,5 @@ import { TransactionTypes } from '@stacks/connect'; -import { HEYSTACK_HEY_TX_REQUEST } from '@tests/mocks'; +import { HEYSTACK_HEY_TX_REQUEST } from '@tests-legacy/mocks'; import { getPayloadFromToken } from './requests'; diff --git a/test-app/src/components/auth.tsx b/test-app/src/components/auth.tsx index 4d0d3f46..040f97b5 100644 --- a/test-app/src/components/auth.tsx +++ b/test-app/src/components/auth.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Button, Text, Box, ButtonGroup } from '@stacks/ui'; import { useConnect } from '@stacks/connect-react'; -import { OnboardingSelectors } from '@tests/integration/onboarding/onboarding.selectors'; +import { OnboardingSelectors } from '@tests-legacy/integration/onboarding/onboarding.selectors'; export const Auth: React.FC = () => { const { doOpenAuth } = useConnect(); diff --git a/test-app/src/components/debugger.tsx b/test-app/src/components/debugger.tsx index e52004cf..d9cc4717 100644 --- a/test-app/src/components/debugger.tsx +++ b/test-app/src/components/debugger.tsx @@ -35,9 +35,9 @@ import { stacksTestnetNetwork as network, stacksTestnetNetwork, } from '@common/utils'; -import { TransactionSigningSelectors } from '@tests/page-objects/transaction-signing.selectors'; +import { TransactionSigningSelectors } from '@tests-legacy/page-objects/transaction-signing.selectors'; -import { WalletPageSelectors } from '@tests/page-objects/wallet.selectors'; +import { WalletPageSelectors } from '@tests-legacy/page-objects/wallet.selectors'; import { ExplorerLink } from './explorer-link'; export const Debugger = () => { diff --git a/test-app/tsconfig.json b/test-app/tsconfig.json index 92d0a6a0..36817f70 100644 --- a/test-app/tsconfig.json +++ b/test-app/tsconfig.json @@ -32,11 +32,18 @@ "@containers/*": ["./containers/*"], "@common/*": ["./common/*"], "@cards/*": ["./components/cards/*"], - "@tests/*": ["../../tests/*"] + "@tests/*": ["../../tests/*"], + "@tests-legacy/*": ["../../tests-legacy/*"] }, "baseUrl": "./src", "allowSyntheticDefaultImports": true, "esModuleInterop": true }, - "include": ["./src/**/*", "./tests/**/*", "./components/**/*", "./common/**/*"] + "include": [ + "./src/**/*", + "./tests-legacy/**/*", + "./tests/**/*", + "./components/**/*", + "./common/**/*" + ] } diff --git a/tests-legacy/integration/assets/decimal-tests.spec.ts b/tests-legacy/integration/assets/decimal-tests.spec.ts index 7169847d..0a47402b 100644 --- a/tests-legacy/integration/assets/decimal-tests.spec.ts +++ b/tests-legacy/integration/assets/decimal-tests.spec.ts @@ -1,8 +1,8 @@ -import { SettingsSelectors } from '@tests/integration/settings.selectors'; -import { BrowserDriver, createTestSelector, setupBrowser } from '@tests/integration/utils'; -import { APINetworkRecipientAddress, SECRET_KEY_2 } from '@tests/mocks'; -import { SendPage } from '@tests/page-objects/send-form.page'; -import { WalletPage } from '@tests/page-objects/wallet.page'; +import { SettingsSelectors } from '@tests-legacy/integration/settings.selectors'; +import { BrowserDriver, createTestSelector, setupBrowser } from '@tests-legacy/integration/utils'; +import { APINetworkRecipientAddress, SECRET_KEY_2 } from '@tests-legacy/mocks'; +import { SendPage } from '@tests-legacy/page-objects/send-form.page'; +import { WalletPage } from '@tests-legacy/page-objects/wallet.page'; import { RouteUrls } from '@shared/route-urls'; diff --git a/tests-legacy/integration/balance/balance.spec.ts b/tests-legacy/integration/balance/balance.spec.ts index a5616a2d..29286025 100644 --- a/tests-legacy/integration/balance/balance.spec.ts +++ b/tests-legacy/integration/balance/balance.spec.ts @@ -1,7 +1,7 @@ -import { BalanceSelectors } from '@tests/integration/balance.selectors'; -import { BrowserDriver, createTestSelector, setupBrowser } from '@tests/integration/utils'; -import { SECRET_KEY_2 } from '@tests/mocks'; -import { WalletPage } from '@tests/page-objects/wallet.page'; +import { BalanceSelectors } from '@tests-legacy/integration/balance.selectors'; +import { BrowserDriver, createTestSelector, setupBrowser } from '@tests-legacy/integration/utils'; +import { SECRET_KEY_2 } from '@tests-legacy/mocks'; +import { WalletPage } from '@tests-legacy/page-objects/wallet.page'; import { RouteUrls } from '@shared/route-urls'; diff --git a/tests-legacy/integration/contract-call/locked-wallet.spec.ts b/tests-legacy/integration/contract-call/locked-wallet.spec.ts index b8cbf15c..83974e4e 100644 --- a/tests-legacy/integration/contract-call/locked-wallet.spec.ts +++ b/tests-legacy/integration/contract-call/locked-wallet.spec.ts @@ -1,5 +1,5 @@ -import { SettingsSelectors } from '@tests/integration/settings.selectors'; -import { SECRET_KEY_2 } from '@tests/mocks'; +import { SettingsSelectors } from '@tests-legacy/integration/settings.selectors'; +import { SECRET_KEY_2 } from '@tests-legacy/mocks'; import { Page } from 'playwright-core'; import { RouteUrls } from '@shared/route-urls'; diff --git a/tests-legacy/integration/fund/fund.spec.ts b/tests-legacy/integration/fund/fund.spec.ts index b2e39ab8..39baac9d 100644 --- a/tests-legacy/integration/fund/fund.spec.ts +++ b/tests-legacy/integration/fund/fund.spec.ts @@ -1,5 +1,5 @@ -import { SECRET_KEY_2 } from '@tests/mocks'; -import { FundPage } from '@tests/page-objects/fund.page'; +import { SECRET_KEY_2 } from '@tests-legacy/mocks'; +import { FundPage } from '@tests-legacy/page-objects/fund.page'; import { RouteUrls } from '@shared/route-urls'; diff --git a/tests-legacy/integration/network/add-network.spec.ts b/tests-legacy/integration/network/add-network.spec.ts index 1d627ed5..c50516bc 100644 --- a/tests-legacy/integration/network/add-network.spec.ts +++ b/tests-legacy/integration/network/add-network.spec.ts @@ -1,9 +1,9 @@ -import { NetworkSelectors } from '@tests/integration/network.selectors'; -import { SettingsSelectors } from '@tests/integration/settings.selectors'; -import { BrowserDriver, createTestSelector, setupBrowser } from '@tests/integration/utils'; -import { SECRET_KEY_2 } from '@tests/mocks'; -import { NetworkPage } from '@tests/page-objects/network-page'; -import { WalletPage } from '@tests/page-objects/wallet.page'; +import { NetworkSelectors } from '@tests-legacy/integration/network.selectors'; +import { SettingsSelectors } from '@tests-legacy/integration/settings.selectors'; +import { BrowserDriver, createTestSelector, setupBrowser } from '@tests-legacy/integration/utils'; +import { SECRET_KEY_2 } from '@tests-legacy/mocks'; +import { NetworkPage } from '@tests-legacy/page-objects/network-page'; +import { WalletPage } from '@tests-legacy/page-objects/wallet.page'; import { RouteUrls } from '@shared/route-urls'; diff --git a/tests-legacy/integration/send-tokens/send-tokens.spec.ts b/tests-legacy/integration/send-tokens/send-tokens.spec.ts index 2a0d197c..73765fb1 100644 --- a/tests-legacy/integration/send-tokens/send-tokens.spec.ts +++ b/tests-legacy/integration/send-tokens/send-tokens.spec.ts @@ -1,5 +1,5 @@ -import { UserAreaSelectors } from '@tests/integration/user-area.selectors'; -import { SECRET_KEY_2 } from '@tests/mocks'; +import { UserAreaSelectors } from '@tests-legacy/integration/user-area.selectors'; +import { SECRET_KEY_2 } from '@tests-legacy/mocks'; import { RouteUrls } from '@shared/route-urls'; diff --git a/tests-legacy/integration/transactions/transactions.spec.ts b/tests-legacy/integration/transactions/transactions.spec.ts index 5a6a8e7f..d346c8f2 100644 --- a/tests-legacy/integration/transactions/transactions.spec.ts +++ b/tests-legacy/integration/transactions/transactions.spec.ts @@ -1,9 +1,9 @@ import { TokenTransferPayload, deserializeTransaction } from '@stacks/transactions'; -import { SECRET_KEY_2 } from '@tests/mocks'; -import { DemoPage } from '@tests/page-objects/demo.page'; -import { TransactionSigningPage } from '@tests/page-objects/transaction-signing.page'; -import { TransactionSigningSelectors } from '@tests/page-objects/transaction-signing.selectors'; -import { WalletPage } from '@tests/page-objects/wallet.page'; +import { SECRET_KEY_2 } from '@tests-legacy/mocks'; +import { DemoPage } from '@tests-legacy/page-objects/demo.page'; +import { TransactionSigningPage } from '@tests-legacy/page-objects/transaction-signing.page'; +import { TransactionSigningSelectors } from '@tests-legacy/page-objects/transaction-signing.selectors'; +import { WalletPage } from '@tests-legacy/page-objects/wallet.page'; import { Page } from 'playwright'; import { RouteUrls } from '@shared/route-urls'; diff --git a/tests-legacy/integration/utils.ts b/tests-legacy/integration/utils.ts index dd935a89..cfbf1ed2 100644 --- a/tests-legacy/integration/utils.ts +++ b/tests-legacy/integration/utils.ts @@ -1,5 +1,5 @@ -import { SettingsSelectors } from '@tests/integration/settings.selectors'; -import { WalletPage } from '@tests/page-objects/wallet.page'; +import { SettingsSelectors } from '@tests-legacy/integration/settings.selectors'; +import { WalletPage } from '@tests-legacy/page-objects/wallet.page'; import { mkdtemp } from 'fs'; import { tmpdir } from 'os'; import { join } from 'path'; diff --git a/tests-legacy/jest-unit.setup.js b/tests-legacy/jest-unit.setup.js index 0a6ba398..a045da9e 100644 --- a/tests-legacy/jest-unit.setup.js +++ b/tests-legacy/jest-unit.setup.js @@ -2,7 +2,7 @@ Object.assign(global, require('jest-chrome')); // setup jsdom inside `node` test environment const JSDOM = require('jsdom').JSDOM; -const LocalStorageMock = require('@tests/mocks/localStorage-mock').LocalStorageMock; +const LocalStorageMock = require('@tests-legacy/mocks/localStorage-mock').LocalStorageMock; const dom = new JSDOM('', { url: 'http://localhost/' }); diff --git a/tests-legacy/page-objects/demo.page.ts b/tests-legacy/page-objects/demo.page.ts index f4c7c36d..5f8a8481 100644 --- a/tests-legacy/page-objects/demo.page.ts +++ b/tests-legacy/page-objects/demo.page.ts @@ -1,4 +1,4 @@ -import { OnboardingSelectors } from '@tests/integration/onboarding/onboarding.selectors'; +import { OnboardingSelectors } from '@tests-legacy/integration/onboarding/onboarding.selectors'; import { BrowserContext, Page } from 'playwright-core'; import { createTestSelector } from '../integration/utils'; diff --git a/tests-legacy/page-objects/fund.page.ts b/tests-legacy/page-objects/fund.page.ts index 630a1f88..eed1e67c 100644 --- a/tests-legacy/page-objects/fund.page.ts +++ b/tests-legacy/page-objects/fund.page.ts @@ -1,4 +1,4 @@ -import { FundPageSelectors } from '@tests/page-objects/fund.selectors'; +import { FundPageSelectors } from '@tests-legacy/page-objects/fund.selectors'; import { Page } from 'playwright-core'; import { createTestSelector } from '../integration/utils'; diff --git a/tests-legacy/page-objects/network-page.ts b/tests-legacy/page-objects/network-page.ts index d1f136b0..0ba2f555 100644 --- a/tests-legacy/page-objects/network-page.ts +++ b/tests-legacy/page-objects/network-page.ts @@ -1,4 +1,4 @@ -import { NetworkSelectors } from '@tests/integration/network.selectors'; +import { NetworkSelectors } from '@tests-legacy/integration/network.selectors'; import { Page } from 'playwright-core'; import { createTestSelector } from '../integration/utils'; diff --git a/tests-legacy/page-objects/send-form.page.ts b/tests-legacy/page-objects/send-form.page.ts index 501f3898..44577dff 100644 --- a/tests-legacy/page-objects/send-form.page.ts +++ b/tests-legacy/page-objects/send-form.page.ts @@ -1,6 +1,6 @@ -import { AssetSelectors } from '@tests/integration/asset.selectors'; -import { TransactionSigningSelectors } from '@tests/page-objects/transaction-signing.selectors'; -import { WalletPageSelectors } from '@tests/page-objects/wallet.selectors'; +import { AssetSelectors } from '@tests-legacy/integration/asset.selectors'; +import { TransactionSigningSelectors } from '@tests-legacy/page-objects/transaction-signing.selectors'; +import { WalletPageSelectors } from '@tests-legacy/page-objects/wallet.selectors'; import { Page } from 'playwright-core'; import { createTestSelector } from '../integration/utils'; diff --git a/tests-legacy/page-objects/wallet.page.ts b/tests-legacy/page-objects/wallet.page.ts index d5b345b3..1892a930 100644 --- a/tests-legacy/page-objects/wallet.page.ts +++ b/tests-legacy/page-objects/wallet.page.ts @@ -1,6 +1,6 @@ -import { OnboardingSelectors } from '@tests/integration/onboarding/onboarding.selectors'; -import { SettingsSelectors } from '@tests/integration/settings.selectors'; -import { HomePageSelectors } from '@tests/page-objects/home.selectors'; +import { OnboardingSelectors } from '@tests-legacy/integration/onboarding/onboarding.selectors'; +import { SettingsSelectors } from '@tests-legacy/integration/settings.selectors'; +import { HomePageSelectors } from '@tests-legacy/page-objects/home.selectors'; import { Page } from 'playwright-core'; import { RouteUrls } from '@shared/route-urls'; diff --git a/tests/punycode.spec.ts b/tests/punycode.spec.ts index 9d8b5488..3d9434a4 100644 --- a/tests/punycode.spec.ts +++ b/tests/punycode.spec.ts @@ -5,7 +5,7 @@ import { addressToString, deserializeTransaction, } from '@stacks/transactions'; -import { SendFormSelectors } from '@tests/page-objects/send-form.selectors'; +import { SendFormSelectors } from '@tests-legacy/page-objects/send-form.selectors'; import { RouteUrls } from '@shared/route-urls'; diff --git a/tsconfig.json b/tsconfig.json index 1e27c63b..aac85987 100755 --- a/tsconfig.json +++ b/tsconfig.json @@ -29,9 +29,7 @@ "@inpage/*": ["inpage/*"], "@app/*": ["app/*"], "@tests/*": ["../tests/*"], - "@tests": ["../tests"], - "@tests-new/*": ["../tests-legacy/*"], - "@tests-new": ["../tests-legacy"] + "@tests-legacy/*": ["../tests-legacy/*"] }, "allowSyntheticDefaultImports": true, "esModuleInterop": true,