Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,12 @@ export default class GovernanceActionDetailsPage {

async getDRepTotalAbstainVoted(
proposal: IProposal,
metricsResponsePromise: Promise<Response>
totalStakeResponsePromise: Promise<Response>
): Promise<number | undefined> {
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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,11 @@ export default class OutcomeDetailsPage {
): Promise<number | undefined> {
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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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}`
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
);

Expand Down