diff --git a/tests/govtool-frontend/playwright/lib/pages/governanceActionDetailsPage.ts b/tests/govtool-frontend/playwright/lib/pages/governanceActionDetailsPage.ts index d79a84e51..5338b14da 100644 --- a/tests/govtool-frontend/playwright/lib/pages/governanceActionDetailsPage.ts +++ b/tests/govtool-frontend/playwright/lib/pages/governanceActionDetailsPage.ts @@ -126,10 +126,12 @@ export default class GovernanceActionDetailsPage { async getDRepTotalAbstainVoted( proposal: IProposal, - metricsResponsePromise: Promise + totalStakeResponsePromise: Promise ): Promise { - const metricsResponses = await Promise.resolve(metricsResponsePromise); - const alwaysAbstainVotingPower = await metricsResponses + const totalStakeResponses = await Promise.resolve( + totalStakeResponsePromise + ); + const alwaysAbstainVotingPower = await totalStakeResponses .json() .then((data) => data.alwaysAbstainVotingPower); diff --git a/tests/govtool-frontend/playwright/lib/pages/outcomeDetailsPage.ts b/tests/govtool-frontend/playwright/lib/pages/outcomeDetailsPage.ts index 8a69e5bf3..e1e298704 100644 --- a/tests/govtool-frontend/playwright/lib/pages/outcomeDetailsPage.ts +++ b/tests/govtool-frontend/playwright/lib/pages/outcomeDetailsPage.ts @@ -46,13 +46,11 @@ export default class OutcomeDetailsPage { ): Promise { const alwaysAbstainVotingPower = await metricsResponses .json() - .then((res) => res.alwaysAbstainVotingPower); - if ( - alwaysAbstainVotingPower && - typeof alwaysAbstainVotingPower === "number" - ) { + .then((res) => res.always_abstain_voting_power); + + if (alwaysAbstainVotingPower) { const totalAbstainVoted = - alwaysAbstainVotingPower + parseInt(proposal.abstain_votes); + parseInt(alwaysAbstainVotingPower) + parseInt(proposal.abstain_votes); return totalAbstainVoted; } else { diff --git a/tests/govtool-frontend/playwright/tests/4-proposal-visibility/proposalVisibility.dRep.spec.ts b/tests/govtool-frontend/playwright/tests/4-proposal-visibility/proposalVisibility.dRep.spec.ts index 1c8a25cf3..196f4b012 100644 --- a/tests/govtool-frontend/playwright/tests/4-proposal-visibility/proposalVisibility.dRep.spec.ts +++ b/tests/govtool-frontend/playwright/tests/4-proposal-visibility/proposalVisibility.dRep.spec.ts @@ -150,10 +150,6 @@ test.describe("Check vote count", () => { ) ); - const metricsResponsePromise = page.waitForResponse((response) => - response.url().includes(`network/metrics`) - ); - const governanceActionsPage = new GovernanceActionsPage(page); await governanceActionsPage.goto(); @@ -179,19 +175,23 @@ test.describe("Check vote count", () => { storageState: ".auth/dRep01.json", wallet: dRep01Wallet, }); + + const totalStakeResponsePromise = dRepPage.waitForResponse((response) => + response.url().includes(`network/total-stake`) + ); const govActionDetailsPage = new GovernanceActionDetailsPage(dRepPage); await govActionDetailsPage.goto( `${proposalToCheck.txHash}#${proposalToCheck.index}` ); + await govActionDetailsPage.showVotesBtn.click(); + const dRepTotalAbstainVote = await govActionDetailsPage.getDRepTotalAbstainVoted( proposalToCheck, - metricsResponsePromise + totalStakeResponsePromise ); - await govActionDetailsPage.showVotesBtn.click(); - // check dRep votes if (await areDRepVoteTotalsDisplayed(proposalToCheck)) { await expect(govActionDetailsPage.dRepYesVotes).toHaveText( diff --git a/tests/govtool-frontend/playwright/tests/4-proposal-visibility/proposalVisibility.spec.ts b/tests/govtool-frontend/playwright/tests/4-proposal-visibility/proposalVisibility.spec.ts index f86f2dfa5..999a38f2a 100644 --- a/tests/govtool-frontend/playwright/tests/4-proposal-visibility/proposalVisibility.spec.ts +++ b/tests/govtool-frontend/playwright/tests/4-proposal-visibility/proposalVisibility.spec.ts @@ -222,10 +222,6 @@ test("4K. Should display correct vote counts on governance details page for disc ) ); - const metricsResponsePromise = page.waitForResponse((response) => - response.url().includes(`network/metrics`) - ); - const governanceActionsPage = new GovernanceActionsPage(page); await governanceActionsPage.goto(); const responses = await Promise.all(responsesPromise); @@ -248,6 +244,9 @@ test("4K. Should display correct vote counts on governance details page for disc uniqueProposalTypes.map(async (proposalToCheck) => { const newPage = await browser.newPage(); injectLogger(newPage); + const totalStakeResponsePromise = newPage.waitForResponse((response) => + response.url().includes(`network/total-stake`) + ); const govActionDetailsPage = new GovernanceActionDetailsPage(newPage); await govActionDetailsPage.goto( `${proposalToCheck.txHash}#${proposalToCheck.index}` @@ -256,7 +255,7 @@ test("4K. Should display correct vote counts on governance details page for disc const dRepTotalAbstainVote = await govActionDetailsPage.getDRepTotalAbstainVoted( proposalToCheck, - metricsResponsePromise + totalStakeResponsePromise ); // check dRep votes diff --git a/tests/govtool-frontend/playwright/tests/6-miscellaneous/miscellaneous.spec.ts b/tests/govtool-frontend/playwright/tests/6-miscellaneous/miscellaneous.spec.ts index ad97b87d1..f10ee426c 100644 --- a/tests/govtool-frontend/playwright/tests/6-miscellaneous/miscellaneous.spec.ts +++ b/tests/govtool-frontend/playwright/tests/6-miscellaneous/miscellaneous.spec.ts @@ -104,7 +104,7 @@ test("6M. Should navigate between footer links", async ({ page, context }) => { }); test("6O. Should display proper network name", async ({ page }) => { - await page.route("**/network/metrics", async (route) => { + await page.route("**/network/info", async (route) => { // Fetch the original response from the server const response = await route.fetch(); const json = await response.json(); @@ -119,7 +119,7 @@ test("6O. Should display proper network name", async ({ page }) => { body: JSON.stringify(json), }); }); - const responsePromise = page.waitForResponse("**/network/metrics"); + const responsePromise = page.waitForResponse("**/network/info"); await page.goto("/"); const response = await responsePromise; diff --git a/tests/govtool-frontend/playwright/tests/9-outcomes/outcomes.spec.ts b/tests/govtool-frontend/playwright/tests/9-outcomes/outcomes.spec.ts index 9a3b1ab95..4c7c41841 100644 --- a/tests/govtool-frontend/playwright/tests/9-outcomes/outcomes.spec.ts +++ b/tests/govtool-frontend/playwright/tests/9-outcomes/outcomes.spec.ts @@ -330,9 +330,7 @@ test("9G. Should display correct vote counts on outcome details page", async ({ ); const metricsResponsePromise = page.waitForResponse( - (response) => - response.url().includes(`/network/metrics`) && - !response.url().includes(`/misc/network/metrics`), + (response) => response.url().includes(`/misc/network/metrics`), { timeout: 60_000 } );