fix: update after review

Author: a-oren

e2e/tests/ui/assertions/DetailsPageMatchers.ts

@@ -0,0 +1,39 @@
+import { expect as baseExpect } from "@playwright/test";
+import type { DetailsPage } from "../helpers/DetailsPage";
+import type { MatcherResult } from "./types";
+
+export interface DetailsPageMatchers {
+  toHaveVisibleAction(actionName: string): Promise<MatcherResult>;
+}
+
+type DetailsPageMatcherDefinitions = {
+  readonly [K in keyof DetailsPageMatchers]: (
+    receiver: DetailsPage,
+    ...args: Parameters<DetailsPageMatchers[K]>
+  ) => Promise<MatcherResult>;
+};
+
+export const detailsPageAssertions =
+  baseExpect.extend<DetailsPageMatcherDefinitions>({
+    toHaveVisibleAction: async (
+      detailsPage: DetailsPage,
+      actionName: string,
+    ): Promise<MatcherResult> => {
+      try {
+        await baseExpect(
+          detailsPage.page.getByRole("menuitem", { name: actionName }),
+        ).toBeVisible();
+        return {
+          pass: true,
+          message: () =>
+            `Action "${actionName}" is visible in the actions menu`,
+        };
+      } catch (error) {
+        return {
+          pass: false,
+          message: () =>
+            error instanceof Error ? error.message : String(error),
+        };
+      }
+    },
+  });

e2e/tests/ui/assertions/index.ts

@@ -22,12 +22,19 @@ import {
   type FileUploadMatchers,
 } from "./FileUploadMatchers";
 
+import type { DetailsPage } from "../helpers/DetailsPage";
+import {
+  detailsPageAssertions,
+  type DetailsPageMatchers,
+} from "./DetailsPageMatchers";
+
 const merged = mergeExpects(
   tableAssertions,
   paginationAssertions,
   toolbarAssertions,
   dialogAssertions,
   fileUploadAssertions,
+  detailsPageAssertions,
   // Add more custom assertions here
 );
 
@@ -89,6 +96,14 @@ function typedExpect(
 ): Omit<ReturnType<typeof merged<FileUpload>>, keyof FileUploadMatchers> &
   FileUploadMatchers;
 
+/**
+ * Overload from DetailsPageMatchers.ts
+ */
+function typedExpect(
+  value: DetailsPage,
+): Omit<ReturnType<typeof merged<DetailsPage>>, keyof DetailsPageMatchers> &
+  DetailsPageMatchers;
+
 // Default overload
 function typedExpect<T>(value: T): ReturnType<typeof merged<T>>;
 function typedExpect<T>(value: T): unknown {

e2e/tests/ui/features/@license-export_cdx/license-export_cdx.step.ts

@@ -73,7 +73,7 @@ When('User Clicks "Action" button', async ({ page }) => {
 
 Then('"Download License Report" Option should be visible', async ({ page }) => {
   const detailsPage = new DetailsPage(page);
-  await detailsPage.verifyActionIsVisibleInMenu("Download License Report");
+  await expect(detailsPage).toHaveVisibleAction("Download License Report");
 });
 
 When('Selects "Download License Report" option', async ({ page }) => {

e2e/tests/ui/helpers/DetailsPage.ts

@@ -37,13 +37,7 @@ export class DetailsPage {
   }
 
   async verifyActionIsAvailable(actionName: string) {
-    await this.page.getByRole("button", { name: "Actions" }).click();
-    await expect(
-      this.page.getByRole("menuitem", { name: actionName }),
-    ).toBeVisible();
-  }
-
-  async verifyActionIsVisibleInMenu(actionName: string) {
+    await this.openActionsMenu();
     await expect(
       this.page.getByRole("menuitem", { name: actionName }),
     ).toBeVisible();

e2e/tests/ui/pages/LicenseExportHelpers.ts

@@ -2,7 +2,7 @@ import type { Page } from "@playwright/test";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { exec } from "node:child_process";
+import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import { DetailsPage } from "../helpers/DetailsPage";
 import { clickAndDownload } from "./Helpers";
@@ -19,9 +19,12 @@ export const downloadLicenseReport = async (page: Page): Promise<string> => {
         .click(),
   );
 
+  const sanitizedFilename = download
+    .suggestedFilename()
+    .replace(/[\/\\.]/g, "_");
   const savePath = path.join(
     os.tmpdir(),
-    `license-report-${Date.now()}-${download.suggestedFilename()}`,
+    `license-report-${Date.now()}-${sanitizedFilename}`,
   );
   await download.saveAs(savePath);
   return savePath;
@@ -30,7 +33,7 @@ export const downloadLicenseReport = async (page: Page): Promise<string> => {
 export const extractLicenseReport = async (
   downloadedFilePath: string,
 ): Promise<string> => {
-  const execAsync = promisify(exec);
+  const execFileAsync = promisify(execFile);
   const extractionPath = path.join(
     path.dirname(downloadedFilePath),
     "extracted",
@@ -39,7 +42,7 @@ export const extractLicenseReport = async (
     fs.mkdirSync(extractionPath);
   }
 
-  await execAsync(`tar -xzf ${downloadedFilePath} -C ${extractionPath}`);
+  await execFileAsync("tar", ["-xzf", downloadedFilePath, "-C", extractionPath]);
   return extractionPath;
 };