Improve the tests (#883)

Author: petrvecera

e2e/page-objects/team-leaderboards-page.ts

@@ -209,6 +209,24 @@ export class TeamLeaderboardsPage extends BasePage {
     return await this.paginationInfo.innerText();
   }
 
+  /**
+   * Get the total number of records from pagination info
+   */
+  async getTotalRecordCount(): Promise<number> {
+    const paginationText = await this.getPaginationInfo();
+    // Extract total from "Showing X - Y of Z teams"
+    const match = paginationText.match(/of (\d+) teams/);
+    return match ? parseInt(match[1], 10) : 0;
+  }
+
+  /**
+   * Get the currently selected records per page value
+   */
+  async getSelectedRecordsPerPage(): Promise<string> {
+    // The select component shows the selected value in its button
+    return await this.recordsPerPageSelect.locator("input").inputValue();
+  }
+
   /**
    * Click on a player name in the table
    */
@@ -286,11 +304,15 @@ export class TeamLeaderboardsPage extends BasePage {
       .evaluate((el) => {
         return window.getComputedStyle(el).color;
       });
-    // This is a basic check - you might need to adjust based on actual color values
-    if (expectedColor === "green") {
-      expect(color).toContain("green");
-    } else {
-      expect(color).toContain("red");
-    }
+
+    // Normalize the computed color to RGB format for comparison
+    // Expected colors: green = rgb(64, 192, 87) or similar, red = rgb(250, 82, 82) or similar
+    // The actual RGB values may vary based on the theme, so we check the pattern
+    const colorMapping = {
+      green: /rgb\(\s*\d+,\s*1[5-9]\d|2\d\d,\s*\d+\s*\)/i, // Green has high G value (150+)
+      red: /rgb\(\s*2[0-5]\d,\s*\d{1,2},\s*\d{1,2}\s*\)/i, // Red has high R value (200+)
+    };
+
+    expect(color).toMatch(colorMapping[expectedColor]);
   }
 }

e2e/regression/player-export-api.spec.ts

@@ -20,7 +20,7 @@ test.describe("Player Export API", () => {
       expect(data.error).toBe("error parsing the profileIDs data");
     });
 
-    test("should return 400 when types parameter is not a string", async ({ request }) => {
+    test("should return 400 when types contains invalid game types", async ({ request }) => {
       const profileIDs = JSON.stringify([1, 2]);
       const types = JSON.stringify(["1v1", "5v5"]);
       const response = await request.get(`${baseUrl}?profileIDs=${profileIDs}&types=${types}`);
@@ -41,16 +41,6 @@ test.describe("Player Export API", () => {
       expect(data.error).toBe("error parsing the types data");
     });
 
-    test("should return 400 when types contains invalid game types", async ({ request }) => {
-      const profileIDs = JSON.stringify([1, 2]);
-      const types = JSON.stringify(["1v1", "5v5"]);
-      const response = await request.get(`${baseUrl}?profileIDs=${profileIDs}&types=${types}`);
-
-      expect(response.status()).toBe(400);
-      const data = await response.json();
-      expect(data.error).toBe("parsedTypes contains invalid data");
-    });
-
     test("should return 400 when requesting more than 50 records", async ({ request }) => {
       const profileIDs = JSON.stringify(Array.from({ length: 51 }, (_, i) => i + 1));
       const response = await request.get(`${baseUrl}?profileIDs=${profileIDs}`);

e2e/regression/team-leaderboards.spec.ts

@@ -78,13 +78,24 @@ test.describe("Team Leaderboards Page", () => {
       await teamLeaderboardsPage.waitForTableLoad();
 
       const rowCountBefore = await teamLeaderboardsPage.getRowCount();
+      const totalRecords = await teamLeaderboardsPage.getTotalRecordCount();
 
       await teamLeaderboardsPage.selectRecordsPerPage("50");
 
+      // Verify the page size control actually changed to "50"
+      const selectedPageSize = await teamLeaderboardsPage.getSelectedRecordsPerPage();
+      expect(selectedPageSize).toBe("50");
+
       const rowCountAfter = await teamLeaderboardsPage.getRowCount();
 
-      // Row count should change
-      expect(rowCountAfter).not.toBe(rowCountBefore);
+      // Assert the displayed row count equals Math.min(totalRecords, 50)
+      const expectedRowCount = Math.min(totalRecords, 50);
+      expect(rowCountAfter).toBe(expectedRowCount);
+
+      // Also verify that either the row count changed OR total records is <= 50
+      if (totalRecords > 50) {
+        expect(rowCountAfter).not.toBe(rowCountBefore);
+      }
     });
   });
 

pages/api/playerExport.ts

@@ -44,7 +44,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     }
 
     // Parse and validate types
-    let parsedTypes: ["1v1", "2v2", "3v3", "4v4"];
+    let parsedTypes: Array<"1v1" | "2v2" | "3v3" | "4v4">;
 
     if (types !== undefined && typeof types !== "string") {
       return res.status(400).json({ error: "types contains invalid data" });