+
{parts[0]}
)}
- {computedTag && :{computedTag}}
+ {computedTag && (
+
+ :{computedTag}
+
+ )}
)
}
diff --git a/src/containers/shared/components/Transaction/DepositPreauth/test/DepositPreauthDescription.test.tsx b/src/containers/shared/components/Transaction/DepositPreauth/test/DepositPreauthDescription.test.tsx
index 29672c26c..fdaa7079e 100644
--- a/src/containers/shared/components/Transaction/DepositPreauth/test/DepositPreauthDescription.test.tsx
+++ b/src/containers/shared/components/Transaction/DepositPreauth/test/DepositPreauthDescription.test.tsx
@@ -12,7 +12,7 @@ describe('DepositPreauth: Description', () => {
it('renders description for authorize', () => {
const wrapper = createWrapper(mockDepositPreaut)
expect(wrapper.html()).toBe(
- ``,
+ ``,
)
wrapper.unmount()
})
@@ -20,7 +20,7 @@ describe('DepositPreauth: Description', () => {
it('renders description for unauthorize', () => {
const wrapper = createWrapper(mockDepositPreauthUnauthorize)
expect(wrapper.html()).toBe(
- ``,
+ ``,
)
wrapper.unmount()
})
diff --git a/src/containers/shared/components/Transaction/EscrowCancel/test/EscrowCancelDescription.test.tsx b/src/containers/shared/components/Transaction/EscrowCancel/test/EscrowCancelDescription.test.tsx
index d4d4a3776..25af99edc 100644
--- a/src/containers/shared/components/Transaction/EscrowCancel/test/EscrowCancelDescription.test.tsx
+++ b/src/containers/shared/components/Transaction/EscrowCancel/test/EscrowCancelDescription.test.tsx
@@ -8,7 +8,7 @@ describe('EscrowCancelDescription', () => {
it('renders description for EscrowCancel', () => {
const wrapper = createWrapper(EscrowCancel)
expect(wrapper.html()).toBe(
- 'The escrow was created byrpmqbo5FWoydTL2Ufh5YdtzmRjbeLyxt56with transactionA979AD...',
+ 'The escrow was created byrpmqbo5FWoydTL2Ufh5YdtzmRjbeLyxt56with transactionA979AD...',
)
wrapper.unmount()
})
diff --git a/src/containers/shared/components/Transaction/EscrowCreate/test/EscrowCreateDescription.test.tsx b/src/containers/shared/components/Transaction/EscrowCreate/test/EscrowCreateDescription.test.tsx
index d55fa71f6..0c256b19e 100644
--- a/src/containers/shared/components/Transaction/EscrowCreate/test/EscrowCreateDescription.test.tsx
+++ b/src/containers/shared/components/Transaction/EscrowCreate/test/EscrowCreateDescription.test.tsx
@@ -8,7 +8,7 @@ describe('EscrowCreateDescription', () => {
it('renders description for EscrowCreate', () => {
const wrapper = createWrapper(EscrowCreate)
expect(wrapper.html()).toBe(
- 'The escrow is fromrLbgNAngLq3HABBXK4uPGCHrqeZwgaYi8qtorLbgNAngLq3HABBXK4uPGCHrqeZwgaYi7qescrow_condition A0258020886F982742772F414243855DC13B348FC78FB3D5119412C8A6480114E36A4451810120
escrowed_amount \uE900997.50XRP
describe_cancel_after March 1, 2020 at 8:54:20 AM UTC
describe_finish_after March 1, 2020 at 9:01:00 AM UTC
',
+ 'The escrow is fromrLbgNAngLq3HABBXK4uPGCHrqeZwgaYi8qtorLbgNAngLq3HABBXK4uPGCHrqeZwgaYi7qescrow_condition A0258020886F982742772F414243855DC13B348FC78FB3D5119412C8A6480114E36A4451810120
escrowed_amount \uE900997.50XRP
describe_cancel_after March 1, 2020 at 8:54:20 AM UTC
describe_finish_after March 1, 2020 at 9:01:00 AM UTC
',
)
wrapper.unmount()
})
diff --git a/src/containers/shared/components/Transaction/EscrowFinish/test/EscrowFinishDescription.test.tsx b/src/containers/shared/components/Transaction/EscrowFinish/test/EscrowFinishDescription.test.tsx
index eba92bc6e..558762aa2 100644
--- a/src/containers/shared/components/Transaction/EscrowFinish/test/EscrowFinishDescription.test.tsx
+++ b/src/containers/shared/components/Transaction/EscrowFinish/test/EscrowFinishDescription.test.tsx
@@ -8,7 +8,7 @@ describe('EscrowFinishDescription', () => {
it('renders description for EscrowFinish', () => {
const wrapper = createWrapper(EscrowFinish)
expect(wrapper.html()).toBe(
- 'The escrow was created byr4UDXF4nL7Tgss8uQxn39cCocd8GnGyXS8with transaction3E2E75...escrow_finish_fullfillment_desc Fulfillment
',
+ 'The escrow was created byr4UDXF4nL7Tgss8uQxn39cCocd8GnGyXS8with transaction3E2E75...escrow_finish_fullfillment_desc Fulfillment
',
)
wrapper.unmount()
})
diff --git a/src/containers/shared/components/Transaction/OfferCreate/test/OfferCreateDescription.test.tsx b/src/containers/shared/components/Transaction/OfferCreate/test/OfferCreateDescription.test.tsx
index 25d08654c..fd467dcde 100644
--- a/src/containers/shared/components/Transaction/OfferCreate/test/OfferCreateDescription.test.tsx
+++ b/src/containers/shared/components/Transaction/OfferCreate/test/OfferCreateDescription.test.tsx
@@ -10,7 +10,7 @@ describe('OfferCreate: Description', () => {
const wrapper = createWrapper(OfferCreate)
expect(wrapper.html()).toBe(
- 'offer_create_desc_line_2 612.52XRP/CSC
offer_create_desc_line_3 44866443
The offer expiresMay 18, 2022 at 5:28:16 PM UTCunless cancelled before',
+ 'offer_create_desc_line_2 612.52XRP/CSC
offer_create_desc_line_3 44866443
The offer expiresMay 18, 2022 at 5:28:16 PM UTCunless cancelled before',
)
wrapper.unmount()
})
@@ -19,7 +19,7 @@ describe('OfferCreate: Description', () => {
const wrapper = createWrapper(OfferCreateInvertedCurrencies)
expect(wrapper.html()).toBe(
- 'offer_create_desc_line_2 0.34690XRP/USD
offer_create_desc_line_3 80543309
',
+ 'offer_create_desc_line_2 0.34690XRP/USD
offer_create_desc_line_3 80543309
',
)
wrapper.unmount()
})
diff --git a/src/containers/shared/components/Transaction/TrustSet/test/TrustSetDescription.test.tsx b/src/containers/shared/components/Transaction/TrustSet/test/TrustSetDescription.test.tsx
index e9331d2a4..c1826319f 100644
--- a/src/containers/shared/components/Transaction/TrustSet/test/TrustSetDescription.test.tsx
+++ b/src/containers/shared/components/Transaction/TrustSet/test/TrustSetDescription.test.tsx
@@ -11,7 +11,7 @@ describe('TrustSet: Description', () => {
it('renders description for authorize', () => {
const wrapper = createWrapper(mockTrustSet)
expect(wrapper.html()).toBe(
- ``,
+ ``,
)
wrapper.unmount()
})
diff --git a/src/containers/shared/components/test/Account.test.tsx b/src/containers/shared/components/test/Account.test.tsx
index 50e48f5c9..237309a0c 100644
--- a/src/containers/shared/components/test/Account.test.tsx
+++ b/src/containers/shared/components/test/Account.test.tsx
@@ -1,104 +1,75 @@
-import { mount } from 'enzyme'
import { I18nextProvider } from 'react-i18next'
import { BrowserRouter } from 'react-router-dom'
+import { cleanup, render, screen } from '@testing-library/react'
import i18n from '../../../../i18n/testConfig'
import { Account } from '../Account'
const createWrapper = (component: JSX.Element) =>
- mount(
+ render(
{component}
,
)
+const ACCOUNT = 'rHWcuuZoFvDS6gNbmHSdpb7u1hZzxvCoMt'
+const ACCOUNT_PLUS_DT = `${ACCOUNT}:381702`
+
describe('Account', () => {
+ afterEach(cleanup)
it('should render with a link', () => {
- const wrapper = createWrapper(
- ,
- )
- const anchor = wrapper.find('a')
- expect(anchor).toHaveClassName('account')
- expect(anchor).toHaveText('rHWcuuZoFvDS6gNbmHSdpb7u1hZzxvCoMt')
- expect(anchor).toHaveProp(
- 'href',
- '/accounts/rHWcuuZoFvDS6gNbmHSdpb7u1hZzxvCoMt',
- )
- expect(anchor).toHaveProp('title', 'rHWcuuZoFvDS6gNbmHSdpb7u1hZzxvCoMt')
- expect(wrapper.find('.dt')).not.toExist()
- wrapper.unmount()
+ createWrapper()
+ const link = screen.getByTestId('account')
+ expect(link).toHaveClass('account')
+ expect(link).toHaveTextContent(ACCOUNT)
+ expect(link).toHaveAttribute('href', `/accounts/${ACCOUNT}`)
+ expect(link).toHaveAttribute('title', ACCOUNT)
+ expect(screen.queryByTestId('dt')).toBeNull()
})
it('should render without a link', () => {
- const wrapper = createWrapper(
- ,
- )
- const address = wrapper.find('.account').hostNodes()
- expect(address).toHaveText('rHWcuuZoFvDS6gNbmHSdpb7u1hZzxvCoMt')
- expect(address).not.toHaveDisplayName('a')
- expect(address).toHaveProp('title', 'rHWcuuZoFvDS6gNbmHSdpb7u1hZzxvCoMt')
- expect(wrapper.find('.dt')).not.toExist()
- wrapper.unmount()
+ createWrapper()
+ const link = screen.getByTestId('account')
+ expect(link).toHaveTextContent(ACCOUNT)
+ expect(link).not.toHaveAttribute('href')
+ expect(link).toHaveAttribute('title', ACCOUNT)
+ expect(screen.queryByTestId('dt')).toBeNull()
})
it('should render with a destination tag', () => {
- const wrapper = createWrapper(
- ,
- )
- const anchor = wrapper.find('a')
- expect(anchor).toHaveClassName('account')
- expect(anchor).toHaveText('rHWcuuZoFvDS6gNbmHSdpb7u1hZzxvCoMt')
- expect(anchor).toHaveProp(
- 'href',
- '/accounts/rHWcuuZoFvDS6gNbmHSdpb7u1hZzxvCoMt',
- )
- expect(anchor).toHaveProp('title', 'rHWcuuZoFvDS6gNbmHSdpb7u1hZzxvCoMt')
- expect(wrapper.find('.dt')).toHaveText(':381702')
- wrapper.unmount()
+ createWrapper()
+ const link = screen.getByTestId('account')
+ expect(link).toHaveClass('account')
+ expect(link).toHaveTextContent(ACCOUNT)
+ expect(link).toHaveAttribute('href', `/accounts/${ACCOUNT}`)
+ expect(link).toHaveAttribute('title', ACCOUNT)
+ expect(screen.queryByTestId('dt')).toHaveTextContent(':381702')
})
it('should render with a destination tag and no link', () => {
- const wrapper = createWrapper(
- ,
- )
- const address = wrapper.find('.account')
- expect(address).toHaveText('rHWcuuZoFvDS6gNbmHSdpb7u1hZzxvCoMt')
- expect(address).not.toHaveDisplayName('a')
- expect(address).toHaveProp('title', 'rHWcuuZoFvDS6gNbmHSdpb7u1hZzxvCoMt')
- expect(wrapper.find('.dt')).toHaveText(':381702')
- wrapper.unmount()
+ createWrapper()
+ const link = screen.getByTestId('account')
+ expect(link).toHaveClass('account')
+ expect(link).toHaveTextContent(ACCOUNT)
+ expect(link).not.toHaveAttribute('href')
+ expect(link).toHaveAttribute('title', ACCOUNT)
+ expect(screen.queryByTestId('dt')).toHaveTextContent(':381702')
})
it('should render with a destination tag supplied separately', () => {
- const wrapper = createWrapper(
- ,
- )
- const anchor = wrapper.find('a')
- expect(anchor).toHaveClassName('account')
- expect(anchor).toHaveText('rHWcuuZoFvDS6gNbmHSdpb7u1hZzxvCoMt')
- expect(anchor).toHaveProp(
- 'href',
- '/accounts/rHWcuuZoFvDS6gNbmHSdpb7u1hZzxvCoMt',
- )
- expect(anchor).toHaveProp('title', 'rHWcuuZoFvDS6gNbmHSdpb7u1hZzxvCoMt')
- expect(wrapper.find('.dt')).toHaveText(':123')
- wrapper.unmount()
+ createWrapper()
+ const link = screen.getByTestId('account')
+ expect(link).toHaveClass('account')
+ expect(link).toHaveTextContent(ACCOUNT)
+ expect(link).toHaveAttribute('href', `/accounts/${ACCOUNT}`)
+ expect(link).toHaveAttribute('title', ACCOUNT)
+ expect(screen.queryByTestId('dt')).toHaveTextContent(':123')
})
it('should render with a destination tag supplied separately and no link', () => {
- const wrapper = createWrapper(
- ,
- )
- const address = wrapper.find('.account')
- expect(address).toHaveText('rHWcuuZoFvDS6gNbmHSdpb7u1hZzxvCoMt')
- expect(address).not.toHaveDisplayName('a')
- expect(address).toHaveProp('title', 'rHWcuuZoFvDS6gNbmHSdpb7u1hZzxvCoMt')
- expect(wrapper.find('.dt')).toHaveText(':123')
- wrapper.unmount()
+ createWrapper()
+ const link = screen.getByTestId('account')
+ expect(link).toHaveTextContent(ACCOUNT)
+ expect(link).not.toHaveAttribute('href')
+ expect(link).toHaveAttribute('title', ACCOUNT)
+ expect(screen.queryByTestId('dt')).toHaveTextContent(':123')
})
})
diff --git a/src/setupTests.ts b/src/setupTests.ts
index e92887b90..722be5464 100644
--- a/src/setupTests.ts
+++ b/src/setupTests.ts
@@ -1,5 +1,6 @@
import 'dotenv/config'
import 'jest-enzyme'
+import '@testing-library/jest-dom/extend-expect'
import { configure } from 'enzyme'
import Adapter from 'enzyme-adapter-react-17-updated'
diff --git a/tsconfig.json b/tsconfig.json
index 34d66a11f..6d7cc1f1c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -23,7 +23,7 @@
"dom.iterable",
"esnext"
],
- "types": ["jest"],
+ "types": ["jest", "@testing-library/jest-dom"],
"typeRoots": [
"./node_modules/@types",
"./@types"