From ad1b4d44efffb319a7b00e02dbdf47b457bc348a Mon Sep 17 00:00:00 2001 From: Theophile Sandoz Date: Thu, 11 Apr 2024 20:44:29 +0200 Subject: [PATCH] Fix tests --- .../ui/src/mocks/resolvers/baseResolvers.ts | 21 +++++++++++++++---- .../test/council/pages/PastCouncil.test.tsx | 7 ++++--- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/packages/ui/src/mocks/resolvers/baseResolvers.ts b/packages/ui/src/mocks/resolvers/baseResolvers.ts index ebeced9d02..31b4c90f75 100644 --- a/packages/ui/src/mocks/resolvers/baseResolvers.ts +++ b/packages/ui/src/mocks/resolvers/baseResolvers.ts @@ -90,14 +90,27 @@ const getFilter = (where: Record) => { } } - if (['gte', 'lte'].includes(type)) { - const resultToBoolean: (a: number) => boolean = type == 'gte' ? (a) => a >= 0 : (a) => a <= 0 + if (['gte', 'gt', 'lte', 'lt'].includes(type)) { + const compare = (a: number, b: number): boolean => { + switch (type) { + case 'gte': + return a >= b + case 'gt': + return a > b + case 'lte': + return a <= b + case 'lt': + return a < b + default: + return false + } + } if (['createdAt', 'statusSetAtTime'].includes(field)) { filters.push((model: Record) => - resultToBoolean(new Date(model[field]).getTime() - new Date(checkValue).getTime()) + compare(new Date(model[field]).getTime(), new Date(checkValue).getTime()) ) } else { - filters.push((model: Record) => resultToBoolean(model[field] - checkValue)) + filters.push((model: Record) => compare(model[field], checkValue)) } } diff --git a/packages/ui/test/council/pages/PastCouncil.test.tsx b/packages/ui/test/council/pages/PastCouncil.test.tsx index 6be877d845..dc0e14d5fc 100644 --- a/packages/ui/test/council/pages/PastCouncil.test.tsx +++ b/packages/ui/test/council/pages/PastCouncil.test.tsx @@ -80,16 +80,17 @@ describe('UI: Past Council page', () => { describe('Stats', () => { beforeEach(async () => { - seedProposal(testProposals[0], mockServer.server) + const proposal = testProposals[1] + seedProposal(proposal, mockServer.server) seedEvent( { id: '0', inBlock: 5, createdAt: '2021-10-07T11:47:39.042Z', network: 'OLYMPIA', - proposalId: testProposals[0].id, + proposalId: proposal.id, }, - 'ProposalExecutedEvent', + 'ProposalDecisionMadeEvent', mockServer.server ) seedEvent(