chore(trading): add metaKey detection - clean up some unit tests (#3337)
This commit is contained in:
parent
17ad0cc975
commit
7c82144f37
@ -7,7 +7,6 @@ import type { Trade } from './fills-data-provider';
|
||||
|
||||
import { FillsTable, getFeesBreakdown } from './fills-table';
|
||||
import { generateFill } from './test-helpers';
|
||||
import { MemoryRouter } from 'react-router-dom';
|
||||
|
||||
describe('FillsTable', () => {
|
||||
let defaultFill: PartialDeep<Trade>;
|
||||
@ -37,11 +36,7 @@ describe('FillsTable', () => {
|
||||
|
||||
it('correct columns are rendered', async () => {
|
||||
await act(async () => {
|
||||
render(
|
||||
<MemoryRouter>
|
||||
<FillsTable partyId="party-id" rowData={[generateFill()]} />
|
||||
</MemoryRouter>
|
||||
);
|
||||
render(<FillsTable partyId="party-id" rowData={[generateFill()]} />);
|
||||
});
|
||||
|
||||
const headers = screen.getAllByRole('columnheader');
|
||||
@ -72,11 +67,7 @@ describe('FillsTable', () => {
|
||||
liquidityFee: '2',
|
||||
},
|
||||
});
|
||||
render(
|
||||
<MemoryRouter>
|
||||
<FillsTable partyId={partyId} rowData={[{ ...buyerFill }]} />
|
||||
</MemoryRouter>
|
||||
);
|
||||
render(<FillsTable partyId={partyId} rowData={[{ ...buyerFill }]} />);
|
||||
const cells = screen.getAllByRole('gridcell');
|
||||
const expectedValues = [
|
||||
buyerFill.market?.tradableInstrument.instrument.name || '',
|
||||
@ -109,11 +100,7 @@ describe('FillsTable', () => {
|
||||
liquidityFee: '1',
|
||||
},
|
||||
});
|
||||
render(
|
||||
<MemoryRouter>
|
||||
<FillsTable partyId={partyId} rowData={[buyerFill]} />
|
||||
</MemoryRouter>
|
||||
);
|
||||
render(<FillsTable partyId={partyId} rowData={[buyerFill]} />);
|
||||
|
||||
const cells = screen.getAllByRole('gridcell');
|
||||
const expectedValues = [
|
||||
@ -142,9 +129,7 @@ describe('FillsTable', () => {
|
||||
aggressor: Schema.Side.SIDE_SELL,
|
||||
});
|
||||
const { rerender } = render(
|
||||
<MemoryRouter>
|
||||
<FillsTable partyId={partyId} rowData={[takerFill]} />
|
||||
</MemoryRouter>
|
||||
);
|
||||
expect(
|
||||
screen
|
||||
@ -158,11 +143,7 @@ describe('FillsTable', () => {
|
||||
},
|
||||
aggressor: Schema.Side.SIDE_BUY,
|
||||
});
|
||||
rerender(
|
||||
<MemoryRouter>
|
||||
<FillsTable partyId={partyId} rowData={[makerFill]} />
|
||||
</MemoryRouter>
|
||||
);
|
||||
rerender(<FillsTable partyId={partyId} rowData={[makerFill]} />);
|
||||
|
||||
expect(
|
||||
screen
|
||||
@ -179,11 +160,7 @@ describe('FillsTable', () => {
|
||||
},
|
||||
aggressor: Schema.Side.SIDE_SELL,
|
||||
});
|
||||
render(
|
||||
<MemoryRouter>
|
||||
<FillsTable partyId={partyId} rowData={[takerFill]} />
|
||||
</MemoryRouter>
|
||||
);
|
||||
render(<FillsTable partyId={partyId} rowData={[takerFill]} />);
|
||||
|
||||
const feeCell = screen
|
||||
.getAllByRole('gridcell')
|
||||
|
@ -13,7 +13,6 @@ import {
|
||||
limitOrder,
|
||||
marketOrder,
|
||||
} from '../mocks/generate-orders';
|
||||
import { MemoryRouter } from 'react-router-dom';
|
||||
|
||||
// Mock theme switcher to get around inconsistent mocking of zustand
|
||||
// stores
|
||||
@ -37,11 +36,9 @@ const generateJsx = (
|
||||
) => {
|
||||
return (
|
||||
<MockedProvider>
|
||||
<MemoryRouter>
|
||||
<VegaWalletContext.Provider value={context as VegaWalletContextShape}>
|
||||
<OrderListTable {...defaultProps} {...props} />
|
||||
</VegaWalletContext.Provider>
|
||||
</MemoryRouter>
|
||||
</MockedProvider>
|
||||
);
|
||||
};
|
||||
|
@ -6,7 +6,6 @@ import type { Position } from './positions-data-providers';
|
||||
import * as Schema from '@vegaprotocol/types';
|
||||
import { PositionStatus, PositionStatusMapping } from '@vegaprotocol/types';
|
||||
import type { ICellRendererParams } from 'ag-grid-community';
|
||||
import { MemoryRouter } from 'react-router-dom';
|
||||
|
||||
const singleRow: Position = {
|
||||
marketName: 'ETH/BTC (31 july 2022)',
|
||||
@ -38,9 +37,7 @@ const singleRowData = [singleRow];
|
||||
it('should render successfully', async () => {
|
||||
await act(async () => {
|
||||
const { baseElement } = render(
|
||||
<MemoryRouter>
|
||||
<PositionsTable rowData={[]} isReadOnly={false} />
|
||||
</MemoryRouter>
|
||||
);
|
||||
expect(baseElement).toBeTruthy();
|
||||
});
|
||||
@ -48,11 +45,7 @@ it('should render successfully', async () => {
|
||||
|
||||
it('render correct columns', async () => {
|
||||
await act(async () => {
|
||||
render(
|
||||
<MemoryRouter>
|
||||
<PositionsTable rowData={singleRowData} isReadOnly={true} />
|
||||
</MemoryRouter>
|
||||
);
|
||||
render(<PositionsTable rowData={singleRowData} isReadOnly={true} />);
|
||||
});
|
||||
|
||||
const headers = screen.getAllByRole('columnheader');
|
||||
@ -76,11 +69,7 @@ it('render correct columns', async () => {
|
||||
|
||||
it('renders market name', async () => {
|
||||
await act(async () => {
|
||||
render(
|
||||
<MemoryRouter>
|
||||
<PositionsTable rowData={singleRowData} isReadOnly={false} />
|
||||
</MemoryRouter>
|
||||
);
|
||||
render(<PositionsTable rowData={singleRowData} isReadOnly={false} />);
|
||||
});
|
||||
expect(screen.getByText('ETH/BTC (31 july 2022)')).toBeTruthy();
|
||||
});
|
||||
@ -91,11 +80,7 @@ it('Does not fail if the market name does not match the split pattern', async ()
|
||||
Object.assign({}, singleRow, { marketName: breakingMarketName }),
|
||||
];
|
||||
await act(async () => {
|
||||
render(
|
||||
<MemoryRouter>
|
||||
<PositionsTable rowData={row} isReadOnly={false} />
|
||||
</MemoryRouter>
|
||||
);
|
||||
render(<PositionsTable rowData={row} isReadOnly={false} />);
|
||||
});
|
||||
|
||||
expect(screen.getByText(breakingMarketName)).toBeTruthy();
|
||||
@ -105,9 +90,7 @@ it('add color and sign to amount, displays positive notional value', async () =>
|
||||
let result: RenderResult;
|
||||
await act(async () => {
|
||||
result = render(
|
||||
<MemoryRouter>
|
||||
<PositionsTable rowData={singleRowData} isReadOnly={false} />
|
||||
</MemoryRouter>
|
||||
);
|
||||
});
|
||||
let cells = screen.getAllByRole('gridcell');
|
||||
@ -118,12 +101,10 @@ it('add color and sign to amount, displays positive notional value', async () =>
|
||||
expect(cells[1].textContent).toEqual('1,230.0');
|
||||
await act(async () => {
|
||||
result.rerender(
|
||||
<MemoryRouter>
|
||||
<PositionsTable
|
||||
rowData={[{ ...singleRow, openVolume: '-100' }]}
|
||||
isReadOnly={false}
|
||||
/>
|
||||
</MemoryRouter>
|
||||
);
|
||||
});
|
||||
cells = screen.getAllByRole('gridcell');
|
||||
@ -137,9 +118,7 @@ it('displays mark price', async () => {
|
||||
let result: RenderResult;
|
||||
await act(async () => {
|
||||
result = render(
|
||||
<MemoryRouter>
|
||||
<PositionsTable rowData={singleRowData} isReadOnly={false} />
|
||||
</MemoryRouter>
|
||||
);
|
||||
});
|
||||
|
||||
@ -148,7 +127,6 @@ it('displays mark price', async () => {
|
||||
|
||||
await act(async () => {
|
||||
result.rerender(
|
||||
<MemoryRouter>
|
||||
<PositionsTable
|
||||
rowData={[
|
||||
{
|
||||
@ -159,7 +137,6 @@ it('displays mark price', async () => {
|
||||
]}
|
||||
isReadOnly={false}
|
||||
/>
|
||||
</MemoryRouter>
|
||||
);
|
||||
});
|
||||
|
||||
@ -169,11 +146,7 @@ it('displays mark price', async () => {
|
||||
|
||||
it('displays leverage', async () => {
|
||||
await act(async () => {
|
||||
render(
|
||||
<MemoryRouter>
|
||||
<PositionsTable rowData={singleRowData} isReadOnly={false} />
|
||||
</MemoryRouter>
|
||||
);
|
||||
render(<PositionsTable rowData={singleRowData} isReadOnly={false} />);
|
||||
});
|
||||
const cells = screen.getAllByRole('gridcell');
|
||||
expect(cells[6].textContent).toEqual('1.1');
|
||||
@ -181,11 +154,7 @@ it('displays leverage', async () => {
|
||||
|
||||
it('displays allocated margin', async () => {
|
||||
await act(async () => {
|
||||
render(
|
||||
<MemoryRouter>
|
||||
<PositionsTable rowData={singleRowData} isReadOnly={false} />
|
||||
</MemoryRouter>
|
||||
);
|
||||
render(<PositionsTable rowData={singleRowData} isReadOnly={false} />);
|
||||
});
|
||||
const cells = screen.getAllByRole('gridcell');
|
||||
const cell = cells[7];
|
||||
@ -194,11 +163,7 @@ it('displays allocated margin', async () => {
|
||||
|
||||
it('displays realised and unrealised PNL', async () => {
|
||||
await act(async () => {
|
||||
render(
|
||||
<MemoryRouter>
|
||||
<PositionsTable rowData={singleRowData} isReadOnly={false} />
|
||||
</MemoryRouter>
|
||||
);
|
||||
render(<PositionsTable rowData={singleRowData} isReadOnly={false} />);
|
||||
});
|
||||
const cells = screen.getAllByRole('gridcell');
|
||||
expect(cells[9].textContent).toEqual('4.56');
|
||||
@ -207,7 +172,6 @@ it('displays realised and unrealised PNL', async () => {
|
||||
it('displays close button', async () => {
|
||||
await act(async () => {
|
||||
render(
|
||||
<MemoryRouter>
|
||||
<PositionsTable
|
||||
rowData={singleRowData}
|
||||
onClose={() => {
|
||||
@ -215,7 +179,6 @@ it('displays close button', async () => {
|
||||
}}
|
||||
isReadOnly={false}
|
||||
/>
|
||||
</MemoryRouter>
|
||||
);
|
||||
});
|
||||
const cells = screen.getAllByRole('gridcell');
|
||||
@ -225,7 +188,6 @@ it('displays close button', async () => {
|
||||
it('do not display close button if openVolume is zero', async () => {
|
||||
await act(async () => {
|
||||
render(
|
||||
<MemoryRouter>
|
||||
<PositionsTable
|
||||
rowData={[{ ...singleRow, openVolume: '0' }]}
|
||||
onClose={() => {
|
||||
@ -233,7 +195,6 @@ it('do not display close button if openVolume is zero', async () => {
|
||||
}}
|
||||
isReadOnly={false}
|
||||
/>
|
||||
</MemoryRouter>
|
||||
);
|
||||
});
|
||||
const cells = screen.getAllByRole('gridcell');
|
||||
|
Loading…
Reference in New Issue
Block a user