From 3cc5cd35cd5e2ddbaa496a22aeaa5f51a39a43f6 Mon Sep 17 00:00:00 2001 From: asiaznik Date: Fri, 16 Sep 2022 14:44:34 +0200 Subject: [PATCH] cypress: trading-fills --- .../src/integration/trading-fills.cy.ts | 59 +------------------ .../src/support/mocks/generate-fills.ts | 2 +- 2 files changed, 4 insertions(+), 57 deletions(-) diff --git a/apps/trading-e2e/src/integration/trading-fills.cy.ts b/apps/trading-e2e/src/integration/trading-fills.cy.ts index 9b8400ddb..7bb6922f9 100644 --- a/apps/trading-e2e/src/integration/trading-fills.cy.ts +++ b/apps/trading-e2e/src/integration/trading-fills.cy.ts @@ -1,67 +1,14 @@ import { aliasQuery } from '@vegaprotocol/cypress'; -import { generateFill, generateFills } from '../support/mocks/generate-fills'; -import { Side } from '@vegaprotocol/types'; +import { generateFills } from '../support/mocks/generate-fills'; import { MarketState } from '@vegaprotocol/types'; import { connectVegaWallet } from '../support/vega-wallet'; import { mockTradingPage } from '../support/trading'; -import { generateNetworkParameters } from '../support/mocks/generate-network-parameters'; - -const fills = [ - generateFill({ - buyer: { - id: Cypress.env('VEGA_PUBLIC_KEY'), - }, - }), - generateFill({ - id: '1', - seller: { - id: Cypress.env('VEGA_PUBLIC_KEY'), - }, - aggressor: Side.SIDE_SELL, - buyerFee: { - infrastructureFee: '5000', - }, - market: { - id: 'market-1', - }, - }), - generateFill({ - id: '2', - seller: { - id: Cypress.env('VEGA_PUBLIC_KEY'), - }, - aggressor: Side.SIDE_BUY, - }), - generateFill({ - id: '3', - aggressor: Side.SIDE_SELL, - market: { - id: 'market-2', - }, - buyer: { - id: Cypress.env('VEGA_PUBLIC_KEY'), - }, - }), -]; -const result = generateFills({ - party: { - tradesConnection: { - edges: fills.map((f, i) => { - return { - __typename: 'TradeEdge', - node: f, - cursor: i.toString(), - }; - }), - }, - }, -}); describe('fills', () => { beforeEach(() => { cy.mockGQL((req) => { - aliasQuery(req, 'Fills', result); - aliasQuery(req, 'NetworkParamsQuery', generateNetworkParameters()); + mockTradingPage(req, MarketState.STATE_ACTIVE); + aliasQuery(req, 'Fills', generateFills()); }); }); diff --git a/apps/trading-e2e/src/support/mocks/generate-fills.ts b/apps/trading-e2e/src/support/mocks/generate-fills.ts index e4cb9b60a..9ad465473 100644 --- a/apps/trading-e2e/src/support/mocks/generate-fills.ts +++ b/apps/trading-e2e/src/support/mocks/generate-fills.ts @@ -106,7 +106,7 @@ export const generateFill = ( }, market: { __typename: 'Market', - id: 'market-id', + id: 'market-0', }, };