tests for admin side

ieeeuoft · Jul 9, 2023 · c4f724a · c4f724a
1 parent 9868f5d
commit c4f724a
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 1 deletion.
diff --git a/...dashboard/frontend/src/components/teamDetail/SimpleOrderTables/SimpleOrderTables.test.tsx b/...dashboard/frontend/src/components/teamDetail/SimpleOrderTables/SimpleOrderTables.test.tsx
@@ -12,6 +12,7 @@ import {
 } from "./SimpleOrderTables";
 import { waitFor } from "@testing-library/react";
 import { RootStore } from "slices/store";
+import { PendingTables } from "../../dashboard/ItemTable/ItemTable";
 
 const mockOrdersInTable = mockPendingOrdersInTable.concat(mockCheckedOutOrdersInTable);
 
@@ -172,6 +173,28 @@ describe("<SimplePendingOrderFulfillmentTable />", () => {
             });
         }
     });
+
+    it("Displays pending orders from oldest to newest on the admin side", () => {
+        const { getAllByTestId } = render(<SimplePendingOrderFulfillmentTable />, {
+            store,
+        });
+        const orderElements = getAllByTestId(/admin-simple-pending-order-\d+/);
+        const orders = orderElements.map((element) => {
+            const updatedTime = element.getAttribute("data-updated-time");
+            return { updatedTime };
+        });
+        let isSorted = true;
+        for (let i = 0; i < orders.length - 1; i++) {
+            const currentDate = orders[i];
+            const previousDate = orders[i + 1];
+
+            if (currentDate > previousDate) {
+                isSorted = false;
+                break;
+            }
+        }
+        expect(isSorted).toBe(true);
+    });
 });
 
 describe("<AdminReturnedItemsTable />", () => {
@@ -201,4 +224,24 @@ describe("<AdminReturnedItemsTable />", () => {
             expect(queryByText(`Order #${id}`)).toBeNull();
         });
     });
+
+    it("Displays returned orders from newest to oldest on the admin side", () => {
+        const { getAllByTestId } = render(<AdminReturnedItemsTable />, { store });
+        const orderElements = getAllByTestId(/returned-order-table-\d+/);
+        const orders = orderElements.map((element) => {
+            const updatedTime = element.getAttribute("data-updated-time");
+            return { updatedTime };
+        });
+        let isSorted = true;
+        for (let i = 0; i < orders.length - 1; i++) {
+            const currentDate = orders[i];
+            const previousDate = orders[i + 1];
+
+            if (currentDate > previousDate) {
+                isSorted = false;
+                break;
+            }
+        }
+        expect(isSorted).toBe(true);
+    });
 });
diff --git a/...site/dashboard/frontend/src/components/teamDetail/SimpleOrderTables/SimpleOrderTables.tsx b/...site/dashboard/frontend/src/components/teamDetail/SimpleOrderTables/SimpleOrderTables.tsx
@@ -167,7 +167,7 @@ export const SimplePendingOrderFulfillmentTable = () => {
         );
     });
 
-    orders.splice(0, orders.length, ...ready_orders, ...submitted_orders);
+    orders.splice(0, orders.length, ...submitted_orders, ...ready_orders);
 
     const [isVisible, setVisibility] = useState(true);
     const toggleVisibility = () => setVisibility(!isVisible);
@@ -211,6 +211,7 @@ export const SimplePendingOrderFulfillmentTable = () => {
                     >
                         <Form
                             data-testid={`admin-simple-pending-order-${pendingOrder.id}`}
+                            data-updated-time={`pending-order-time-${pendingOrder.updatedTime}`}
                         >
                             <GeneralPendingTable
                                 {...{

diff --git a/...tend/src/components/teamDetail/TeamCheckedOutOrderTable/TeamCheckedOutOrderTable.test.tsx b/...tend/src/components/teamDetail/TeamCheckedOutOrderTable/TeamCheckedOutOrderTable.test.tsx
@@ -11,6 +11,7 @@ import {
 } from "testing/utils";
 import { mockHardware, mockCheckedOutOrdersInTable } from "testing/mockData";
 import TeamCheckedOutOrderTable from "components/teamDetail/TeamCheckedOutOrderTable/TeamCheckedOutOrderTable";
+import { CheckedOutTables } from "../../dashboard/ItemTable/ItemTable";
 
 const store = makeStoreWithEntities({
     teamDetailOrders: mockCheckedOutOrdersInTable,
@@ -91,4 +92,25 @@ describe("team pending order table", () => {
             });
         }
     });
+    it("Displays checked out orders from most recent to oldest order", async () => {
+        const { getAllByTestId, container } = render(<TeamCheckedOutOrderTable />, {
+            store,
+        });
+        let orderElements = getAllByTestId(/table-\d+-\d+/);
+        const orders = orderElements.map((element) => {
+            const updatedTime = element.getAttribute("data-updated-time");
+            return { updatedTime };
+        });
+        let isSorted = true;
+        for (let i = 0; i < orders.length - 1; i++) {
+            const currentDate = orders[i];
+            const previousDate = orders[i + 1];
+
+            if (currentDate < previousDate) {
+                isSorted = false;
+                break;
+            }
+        }
+        expect(isSorted).toBe(true);
+    });
 });