fix tests

aragon · Jul 19, 2023 · 049a362 · 049a362
1 parent 82705e0
commit 049a362
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/modules/client/src/client-common/utils.ts b/modules/client/src/client-common/utils.ts
@@ -70,7 +70,7 @@ export function computeProposalStatusFilter(
       where = { startDate_gte: now, potentiallyExecutable: false, executed: false };
       break;
     case ProposalStatus.ACTIVE:
-      where = { startDate_lt: now, endDate_gte: now, executed: false, potentiallyExecutable: false };
+      where = { startDate_lt: now, endDate_gte: now, executed: false };
       break;
     case ProposalStatus.EXECUTED:
       where = { executed: true };

diff --git a/modules/client/test/integration/addresslistVoting-client/methods.test.ts b/modules/client/test/integration/addresslistVoting-client/methods.test.ts
@@ -871,6 +871,7 @@ describe("Client Address List", () => {
           where: {
             endDate_lt: nowFilter,
             executed: false,
+            potentiallyExecutable: false,
           },
           skip: 0,
           limit: params.limit,

diff --git a/modules/client/test/integration/multisig-client/methods.test.ts b/modules/client/test/integration/multisig-client/methods.test.ts
@@ -608,6 +608,7 @@ describe("Client Multisig", () => {
           where: {
             endDate_lt: nowFilter,
             executed: false,
+            potentiallyExecutable: false,
           },
           skip: 0,
           limit: params.limit,

diff --git a/modules/client/test/integration/tokenVoting-client/methods.test.ts b/modules/client/test/integration/tokenVoting-client/methods.test.ts
@@ -1167,6 +1167,7 @@ describe("Token Voting Client", () => {
             where: {
               endDate_lt: nowFilter,
               executed: false,
+              potentiallyExecutable: false,
             },
             skip: 0,
             limit: params.limit,

diff --git a/modules/client/test/unit/client-common/utils.test.ts b/modules/client/test/unit/client-common/utils.test.ts
@@ -95,7 +95,7 @@ describe("client-common utils", () => {
       })).toBe(ProposalStatus.ACTIVE);
     });
     it("should return SUCCEDED if executable = true", () => {
-      const endDate = Date.now() / 1000;
+      const endDate = (Date.now() / 1000) - 300;
       const startDate = (Date.now() / 1000) - 500;
 
       expect(computeProposalStatus({
@@ -113,7 +113,7 @@ describe("client-common utils", () => {
       expect(computeProposalStatus({
         endDate: endDate.toString(),
         startDate: startDate.toString(),
-        potentiallyExecutable: false,
+        potentiallyExecutable: true,
         executed: false,
         earlyExecutable: true,
       })).toBe(ProposalStatus.SUCCEEDED);