Merge pull request #3732 from IntersectMBO/fix/proposal-sorting-test

kneerose · web-flow · commit 5f6bf60ea184 · 2025-06-09T11:37:53.000+05:45
Fix: proposal sorting test
diff --git a/tests/govtool-frontend/playwright/lib/helpers/transaction.ts b/tests/govtool-frontend/playwright/lib/helpers/transaction.ts
@@ -77,7 +77,7 @@ export async function waitForTxConfirmation(
         .getByTestId("alert-warning")
         .getByText("Transaction in progress", { exact: false })
     ).toBeVisible({
-      timeout: 60_000,
+      timeout: 90_000,
     });
     const url = (await transactionStatusPromise).url();
     const regex = /\/transaction\/status\/([^\/]+)$/;
@@ -90,7 +90,7 @@ export async function waitForTxConfirmation(
       await pollTransaction(transactionHash);
       await expect(
         page.getByText("In Progress", { exact: true }).first() //FIXME: Only one element needs to be displayed
-      ).not.toBeVisible({ timeout: 60_000 });
+      ).not.toBeVisible({ timeout: 90_000 });
     }
   } catch (error) {
     Logger.fail(error.message);
diff --git a/tests/govtool-frontend/playwright/lib/pages/budgetDiscussionPage.ts b/tests/govtool-frontend/playwright/lib/pages/budgetDiscussionPage.ts
@@ -174,7 +174,11 @@ export default class BudgetDiscussionPage {
     // API validation
     for (let i = 0; i <= proposals.length - 2; i++) {
       const isValid = validationFn(proposals[i], proposals[i + 1]);
-      expect(isValid).toBe(true);
+      expect(isValid, {
+        message:
+          !isValid &&
+          `Failed on sorting ${type} with proposals: ${proposals[i].id} and ${proposals[i + 1].id}`,
+      }).toBe(true);
     }
   }
 
diff --git a/tests/govtool-frontend/playwright/lib/pages/proposalDiscussionPage.ts b/tests/govtool-frontend/playwright/lib/pages/proposalDiscussionPage.ts
@@ -183,7 +183,11 @@ export default class ProposalDiscussionPage {
     // API validation
     for (let i = 0; i <= proposals.length - 2; i++) {
       const isValid = validationFn(proposals[i], proposals[i + 1]);
-      expect(isValid).toBe(true);
+      expect(isValid, {
+        message:
+          !isValid &&
+          `Failed on sorting ${type} with proposals: ${proposals[i].id} and ${proposals[i + 1].id}`,
+      }).toBe(true);
     }
   }
 
diff --git a/tests/govtool-frontend/playwright/lib/types.ts b/tests/govtool-frontend/playwright/lib/types.ts
@@ -210,6 +210,7 @@ export type ProposedGovAction = {
       attributes: {
         proposal_id: string;
         prop_name: string;
+        createdAt: string;
       };
     };
     creator: {
diff --git a/tests/govtool-frontend/playwright/tests/11-proposal-budget/proposalBudget.spec.ts b/tests/govtool-frontend/playwright/tests/11-proposal-budget/proposalBudget.spec.ts
@@ -108,6 +108,7 @@ test.describe("Budget proposal list manipulation", () => {
     });
 
     test("11B_3. Should sort budget proposals", async () => {
+      test.slow();
       const sortOptions = {
         Oldest: (p1: ProposedGovAction, p2: ProposedGovAction) =>
           p1.attributes.createdAt <= p2.attributes.createdAt,
@@ -120,21 +121,35 @@ test.describe("Budget proposal list manipulation", () => {
           p1.attributes.prop_comments_number <=
           p2.attributes.prop_comments_number,
         "Name A-Z": (p1: ProposedGovAction, p2: ProposedGovAction) =>
-          p1.attributes.bd_proposal_detail.data.attributes.proposal_name.localeCompare(
-            p2.attributes.bd_proposal_detail.data.attributes.proposal_name
-          ) <= 0,
+          p1.attributes.bd_proposal_detail.data.attributes.proposal_name
+            .replace(/ /g, "")
+            .localeCompare(
+              p2.attributes.bd_proposal_detail.data.attributes.proposal_name.replace(
+                / /g,
+                ""
+              )
+            ) <= 0,
         "Name Z-A": (p1: ProposedGovAction, p2: ProposedGovAction) =>
-          p1.attributes.bd_proposal_detail.data.attributes.proposal_name.localeCompare(
-            p2.attributes.bd_proposal_detail.data.attributes.proposal_name
-          ) >= 0,
+          p1.attributes.bd_proposal_detail.data.attributes.proposal_name
+            .replace(/ /g, "")
+            .localeCompare(
+              p2.attributes.bd_proposal_detail.data.attributes.proposal_name.replace(
+                / /g,
+                ""
+              )
+            ) >= 0,
         "Proposer A-Z": (p1: ProposedGovAction, p2: ProposedGovAction) =>
-          p1.attributes.creator.data.attributes.govtool_username.localeCompare(
-            p2.attributes.creator.data.attributes.govtool_username
-          ) <= 0,
+          p1.attributes.creator.data.attributes.govtool_username
+            .replace(/ /g, "")
+            .localeCompare(
+              p2.attributes.creator.data.attributes.govtool_username
+            ) <= 0,
         "Proposer Z-A": (p1: ProposedGovAction, p2: ProposedGovAction) =>
-          p1.attributes.creator.data.attributes.govtool_username.localeCompare(
-            p2.attributes.creator.data.attributes.govtool_username
-          ) >= 0,
+          p1.attributes.creator.data.attributes.govtool_username
+            .replace(/ /g, "")
+            .localeCompare(
+              p2.attributes.creator.data.attributes.govtool_username
+            ) >= 0,
       };
 
       for (const [option, validationFn] of Object.entries(sortOptions)) {
diff --git a/tests/govtool-frontend/playwright/tests/8-proposal-discussion/proposalDiscussion.spec.ts b/tests/govtool-frontend/playwright/tests/8-proposal-discussion/proposalDiscussion.spec.ts
@@ -69,11 +69,14 @@ test.describe("Filter and sort proposals", () => {
   });
 
   test("8B_2. Should sort the list of proposed governance actions.", async () => {
+    test.slow();
     const sortOptions = {
       Oldest: (p1: ProposedGovAction, p2: ProposedGovAction) =>
-        p1.attributes.createdAt <= p2.attributes.createdAt,
+        p1.attributes.content.attributes.createdAt <=
+        p2.attributes.content.attributes.createdAt,
       Newest: (p1: ProposedGovAction, p2: ProposedGovAction) =>
-        p1.attributes.createdAt >= p2.attributes.createdAt,
+        p1.attributes.content.attributes.createdAt >=
+        p2.attributes.content.attributes.createdAt,
       "Most likes": (p1: ProposedGovAction, p2: ProposedGovAction) =>
         p1.attributes.prop_likes >= p2.attributes.prop_likes,
       "Least likes": (p1: ProposedGovAction, p2: ProposedGovAction) =>
@@ -89,13 +92,17 @@ test.describe("Filter and sort proposals", () => {
         p1.attributes.prop_comments_number <=
         p2.attributes.prop_comments_number,
       "Name A-Z": (p1: ProposedGovAction, p2: ProposedGovAction) =>
-        p1.attributes.content.attributes.prop_name.localeCompare(
-          p2.attributes.content.attributes.prop_name
-        ) <= 0,
+        p1.attributes.content.attributes.prop_name
+          .replace(/ /g, "")
+          .localeCompare(
+            p2.attributes.content.attributes.prop_name.replace(/ /g, "")
+          ) <= 0,
       "Name Z-A": (p1: ProposedGovAction, p2: ProposedGovAction) =>
-        p1.attributes.content.attributes.prop_name.localeCompare(
-          p2.attributes.content.attributes.prop_name
-        ) >= 0,
+        p1.attributes.content.attributes.prop_name
+          .replace(/ /g, "")
+          .localeCompare(
+            p2.attributes.content.attributes.prop_name.replace(/ /g, "")
+          ) >= 0,
     };
 
     for (const [sortOption, sortFunction] of Object.entries(sortOptions)) {

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,11 @@ export default class BudgetDiscussionPage {`
`174`	`174`	`// API validation`
`175`	`175`	`for (let i = 0; i <= proposals.length - 2; i++) {`
`176`	`176`	`const isValid = validationFn(proposals[i], proposals[i + 1]);`
`177`		`- expect(isValid).toBe(true);`
	`177`	`+ expect(isValid, {`
	`178`	`+ message:`
	`179`	`+ !isValid &&`
	`180`	+ `Failed on sorting ${type} with proposals: ${proposals[i].id} and ${proposals[i + 1].id}`,
	`181`	`+ }).toBe(true);`
`178`	`182`	`}`
`179`	`183`	`}`
`180`	`184`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,11 @@ export default class ProposalDiscussionPage {`
`183`	`183`	`// API validation`
`184`	`184`	`for (let i = 0; i <= proposals.length - 2; i++) {`
`185`	`185`	`const isValid = validationFn(proposals[i], proposals[i + 1]);`
`186`		`- expect(isValid).toBe(true);`
	`186`	`+ expect(isValid, {`
	`187`	`+ message:`
	`188`	`+ !isValid &&`
	`189`	+ `Failed on sorting ${type} with proposals: ${proposals[i].id} and ${proposals[i + 1].id}`,
	`190`	`+ }).toBe(true);`
`187`	`191`	`}`
`188`	`192`	`}`
`189`	`193`