test(playwright): refactor page.evaluate into page.request.<METHOD>

Author: OliverDudgeon

tests/project-bootstrap.browser.ts

@@ -17,43 +17,46 @@ test("Project bootstrap works", async ({ page, baseURL }) => {
   // This needs to come before the unit fetch request below so there isn't a cors issue
   await page.goto(baseURL ?? "/");
 
+  expect(baseURL).toBeDefined();
+
+  const url = new URL(baseURL as string);
+  url.pathname = "/api/as-api/organisation/default";
+  const defaultOrg: OrganisationGetDefaultResponse = await (
+    await page.request.get(url.href)
+  ).json();
+
   // Ensure default unit and associated projects and products doesn't exist
-  await page.evaluate(
-    async ({ baseURL, username }) => {
-      // This need to be a pure function
-      const defaultOrgRes = await fetch(baseURL + "/api/as-api/organisation/default");
-      const defaultOrg: OrganisationGetDefaultResponse = await defaultOrgRes.json();
-      const orgRes = await fetch(baseURL + `/api/as-api/organisation/${defaultOrg.id}/unit`);
-      const units = ((await orgRes.json()) as OrganisationUnitsGetResponse).units;
-
-      const personalUnit = units.find((unit) => unit.name === username);
-
-      if (personalUnit) {
-        const productRes = await fetch(baseURL + "/api/as-api/product");
-        const products = ((await productRes.json()) as ProductsGetResponse).products;
-
-        const productsToDelete = products
-          .filter((product) => product.unit.id === personalUnit.id)
-          .filter(
-            (product): product is ProductDmProjectTier =>
-              product.product.type === "DATA_MANAGER_PROJECT_TIER_SUBSCRIPTION",
-          );
-        const productPromises = productsToDelete.map(async (product) => {
-          await fetch(baseURL + `/api/dm-api/project/${product.claim?.id}`, { method: "DELETE" });
-          await fetch(baseURL + `/api/as-api/product/${product.product.id}`, { method: "DELETE" });
-        });
-        await Promise.allSettled(productPromises);
-
-        const res = await fetch(baseURL + "/api/as-api/unit", { method: "DELETE" });
-        const response = await res.json();
-        if (!res.ok && response.error !== "The Unit does not exist") {
-          console.log(response.error);
-          throw Error("An existing unit could not be cleaned up before running the test");
-        }
-      }
-    },
-    { baseURL, username: process.env.PW_USERNAME },
-  );
+  url.pathname = `/api/as-api/organisation/${defaultOrg.id}/unit`;
+  const units = ((await (await page.request.get(url.href)).json()) as OrganisationUnitsGetResponse)
+    .units;
+
+  const personalUnit = units.find((unit) => unit.name === process.env.PW_USERNAME);
+
+  if (personalUnit) {
+    url.pathname = "/api/as-api/product";
+    const products = ((await (await page.request.get(url.href)).json()) as ProductsGetResponse)
+      .products;
+
+    const productsToDelete = products
+      .filter((product) => product.unit.id === personalUnit.id)
+      .filter(
+        (product): product is ProductDmProjectTier =>
+          product.product.type === "DATA_MANAGER_PROJECT_TIER_SUBSCRIPTION",
+      );
+    const productPromises = productsToDelete.map(async (product) => {
+      url.pathname = `/api/dm-api/project/${product.claim?.id}`;
+      page.request.delete(url.href);
+      url.pathname = `/api/as-api/product/${product.product.id}`;
+      page.request.delete(url.href);
+    });
+    await Promise.allSettled(productPromises);
+
+    url.pathname = "/api/as-api/unit";
+    const res = await page.request.delete(url.href);
+
+    const response = await res.json();
+    expect(!res.ok() && response.error !== "The Unit does not exist").toBeFalsy();
+  }
 
   //
   // The Test