feat: split dRep not voted calculation; assert only if totalStakeControlledByDReps is in metrics

Author: kneerose

tests/govtool-frontend/playwright/lib/pages/governanceActionDetailsPage.ts

@@ -1,7 +1,8 @@
 import environments from "@constants/environments";
 import { downloadMetadata } from "@helpers/metadata";
-import { Download, Page } from "@playwright/test";
+import { Download, Page, Response } from "@playwright/test";
 import metadataBucketService from "@services/metadataBucketService";
+import { IProposal } from "@types";
 import { withTxConfirmation } from "lib/transaction.decorator";
 
 export default class GovernanceActionDetailsPage {
@@ -100,6 +101,29 @@ export default class GovernanceActionDetailsPage {
     await this.voteBtn.click();
   }
 
+  async getDRepNotVoted(
+    proposal: IProposal,
+    metricsResponsePromise: Promise<Response>
+  ): Promise<number | undefined> {
+    const metricsResponses = await Promise.resolve(metricsResponsePromise);
+    const totalStakeControlledByDReps = await metricsResponses
+      .json()
+      .then((data) => data.totalStakeControlledByDReps);
+
+    if (
+      totalStakeControlledByDReps &&
+      typeof totalStakeControlledByDReps === "number"
+    ) {
+      const dRepNotVoted =
+        totalStakeControlledByDReps -
+        proposal.dRepYesVotes -
+        proposal.dRepAbstainVotes -
+        proposal.dRepNoVotes;
+
+      return dRepNotVoted;
+    }
+  }
+
   async downloadVoteMetadata() {
     const download: Download = await this.page.waitForEvent("download");
     return downloadMetadata(download);

tests/govtool-frontend/playwright/tests/4-proposal-visibility/proposalVisibility.dRep.spec.ts

@@ -184,16 +184,10 @@ test.describe("Check vote count", () => {
           `${proposalToCheck.txHash}#${proposalToCheck.index}`
         );
 
-        const metricsResponses = await Promise.resolve(metricsResponsePromise);
-        const totalStakeControlledByDReps = await metricsResponses
-          .json()
-          .then((data) => data.totalStakeControlledByDReps);
-
-        const dRepNotVoted =
-          totalStakeControlledByDReps -
-          proposalToCheck.dRepYesVotes -
-          proposalToCheck.dRepAbstainVotes -
-          proposalToCheck.dRepNoVotes;
+        const dRepNotVoted = await govActionDetailsPage.getDRepNotVoted(
+          proposalToCheck,
+          metricsResponsePromise
+        );
 
         await govActionDetailsPage.showVotesBtn.click();
 
@@ -209,9 +203,11 @@ test.describe("Check vote count", () => {
             `₳ ${correctVoteAdaFormat(proposalToCheck.dRepNoVotes)}`
           );
 
-          await expect(govActionDetailsPage.dRepNotVoted).toHaveText(
-            `₳ ${correctVoteAdaFormat(dRepNotVoted)}`
-          );
+          if (dRepNotVoted) {
+            await expect(govActionDetailsPage.dRepNotVoted).toHaveText(
+              `₳ ${correctVoteAdaFormat(dRepNotVoted)}`
+            );
+          }
         }
 
         // check sPos votes

tests/govtool-frontend/playwright/tests/4-proposal-visibility/proposalVisibility.spec.ts

@@ -75,16 +75,10 @@ test("4K. Should display correct vote counts on governance details page for disc
         `${proposalToCheck.txHash}#${proposalToCheck.index}`
       );
 
-      const metricsResponses = await Promise.resolve(metricsResponsePromise);
-      const totalStakeControlledByDReps = await metricsResponses
-        .json()
-        .then((data) => data.totalStakeControlledByDReps);
-
-      const dRepNotVoted =
-        totalStakeControlledByDReps -
-        proposalToCheck.dRepYesVotes -
-        proposalToCheck.dRepAbstainVotes -
-        proposalToCheck.dRepNoVotes;
+      const dRepNotVoted = await govActionDetailsPage.getDRepNotVoted(
+        proposalToCheck,
+        metricsResponsePromise
+      );
 
       // check dRep votes
       if (await areDRepVoteTotalsDisplayed(proposalToCheck)) {
@@ -98,9 +92,11 @@ test("4K. Should display correct vote counts on governance details page for disc
           `₳ ${correctVoteAdaFormat(proposalToCheck.dRepNoVotes)}`
         );
 
-        await expect(govActionDetailsPage.dRepNotVoted).toHaveText(
-          `₳ ${correctVoteAdaFormat(dRepNotVoted)}`
-        );
+        if (dRepNotVoted) {
+          await expect(govActionDetailsPage.dRepNotVoted).toHaveText(
+            `₳ ${correctVoteAdaFormat(dRepNotVoted)}`
+          );
+        }
       }
       // check sPos votes
       if (await areSPOVoteTotalsDisplayed(proposalToCheck)) {