Added advisory type filtering for locator

Signed-off-by: mrrajan <86094767+mrrajan@users.noreply.github.com.>

Author: mrrajan

tests/ui/features/@advisory-explorer/advisory-explorer.feature

@@ -4,15 +4,15 @@ Feature: Advisory Explorer
 
 # Advisory Vulnerabilities
 Scenario: Display vulnerabilities tied to a single advisory
-    Given User visits Advisory details Page of "<advisoryName>"
-    Then User navigates to the Vulnerabilites tab on the Advisory Overview page
+    Given User visits Advisory details Page of "<advisoryName>" with type "<advisoryType>"
+    Then User navigates to the Vulnerabilities tab on the Advisory Overview page
     Then Pagination of Vulnerabilities list works
     Then A list of all active vulnerabilites tied to the advisory should display
     And The "ID, Title, Discovery, Release, Score, CWE" information should be visible for each vulnerability
     And The vulnerabilities should be sorted by ID by default
     And User visits Vulnerability details Page of "<vulnerabilityID>" by clicking it
 
     Examples:
-        | advisoryName    | vulnerabilityID | 
-        | CVE-2023-3223 | CVE-2023-3223  | 
+        | advisoryName    | vulnerabilityID | advisoryType |
+        | CVE-2023-3223   | CVE-2023-3223   |     csaf     |
 

tests/ui/features/@advisory-explorer/advisory-explorer.step.ts

@@ -8,16 +8,17 @@ export const { Given, When, Then } = createBdd();
 const VULN_TABLE_NAME = "vulnerability table";
 
 Given(
-  "User visits Advisory details Page of {string}",
-  async ({ page }, advisoryName) => {
+  "User visits Advisory details Page of {string} with type {string}",
+  async ({ page }, advisoryName, advisoryType) => {
     const searchPage = new SearchPage(page, "Advisories");
     await searchPage.dedicatedSearch(advisoryName);
-    await page.getByRole("link", { name: advisoryName }).click();
+    const advisory = `xpath=//tr[contains(.,'${advisoryName}') and contains(.,'${advisoryType}')]/td/a`;
+    await page.locator(advisory).click();
   }
 );
 
 Then(
-  "User navigates to the Vulnerabilites tab on the Advisory Overview page",
+  "User navigates to the Vulnerabilities tab on the Advisory Overview page",
   async ({ page }) => {
     await page.getByRole("tab", { name: "Vulnerabilities" }).click();
   }
@@ -52,7 +53,9 @@ Then(
 Then(
   "The {string} information should be visible for each vulnerability",
   async ({ page }, headers) => {
-    const headersArr = headers.split(`,`).map((column) => column.trim());
+    const headersArr = headers
+      .split(`,`)
+      .map((column: String) => column.trim());
     for (const label of headersArr) {
       const header = page.getByRole("columnheader", { name: label });
       if (await header.count()) {

tests/ui/features/@sbom-explorer/sbom-explorer.feature

@@ -76,7 +76,7 @@ Feature: SBOM Explorer - View SBOM details
         Then List of related Vulnerabilities should be sorted by "Id" in ascending order
 
         Examples:
-        | sbomName |
+        | sbomName    |
         | quarkus-bom |
 
     @slow
@@ -86,7 +86,7 @@ Feature: SBOM Explorer - View SBOM details
         When User selects the Tab "Vulnerabilities"
         Then Pagination of Vulnerabilities list works
         Examples:
-        | sbomName |
+        | sbomName    |
         | quarkus-bom |
 
     @slow
@@ -96,7 +96,7 @@ Feature: SBOM Explorer - View SBOM details
         When User selects the Tab "Packages"
         Then Pagination of Packages list works
         Examples:
-        | sbomName |
+        |        sbomName        |
         | ubi9-minimal-container |
 
     Scenario Outline: Check Column Headers of SBOM Explorer Vulnerabilities table
@@ -110,7 +110,7 @@ Feature: SBOM Explorer - View SBOM details
         Then List of Vulnerabilities has column "Published"
         Then List of Vulnerabilities has column "Updated"
         Examples:
-        | sbomName |
+        | sbomName    |
         | quarkus-bom |
 
     @slow
@@ -123,15 +123,15 @@ Feature: SBOM Explorer - View SBOM details
         #Then Sorting of "CVSS" Columns works
         # Bug: https://issues.redhat.com/browse/TC-2598
         Examples:
-        | sbomName |
+        | sbomName    |
         | quarkus-bom |
 
     Scenario Outline: Add Labels to SBOM from SBOM List Page
         Given An ingested SBOM "<sbomName>" is available
         When User Adds Labels "<Labels>" to "<sbomName>" SBOM from List Page
         Then The Label list "<Labels>" added to the SBOM "<sbomName>" on List Page
         Examples:
-        | sbomName | Labels |
+        | sbomName    |     Labels    |
         | quarkus-bom | RANDOM_LABELS |
 
     Scenario Outline: Add Labels to SBOM from SBOM Explorer Page
@@ -140,5 +140,5 @@ Feature: SBOM Explorer - View SBOM details
         When User Adds Labels "<Labels>" to "<sbomName>" SBOM from Explorer Page
         Then The Label list "<Labels>" added to the SBOM "<sbomName>" on Explorer Page
         Examples:
-        | sbomName | Labels |
+        |         sbomName       |    Labels     |
         | ubi9-minimal-container | RANDOM_LABELS |

tests/ui/features/@vulnerability-explorer/vulnerability-explorer.feature

@@ -57,9 +57,9 @@ Feature: Vulnerability Explorer - View Vulnerability details
         And The "ID, Title, Type, Revision, Vulnerabilities" information should be visible for each advisory
         And The advisories should be sorted by "<columnName>"
         Then User searches for "<advisoryID>"
-        Then User visits Advisory details Page of "<advisoryID>"
+        Then User visits Advisory details Page of "<advisoryID>" with type "<advisoryType>"
         Then The page title is "<advisoryID>"
 
         Examples:
-            | vulnerabilityID |        advisoryID |     columnName |     
-            | CVE-2023-1664|         CVE-2023-1664 |  ID | 
+            | vulnerabilityID | columnName |  advisoryID   | advisoryType |
+            | CVE-2023-1664   |    ID      | CVE-2023-1664 |      csaf    |

tests/ui/features/@vulnerability-explorer/vulnerability-explorer.step.ts

@@ -136,7 +136,9 @@ Then(
 Then(
   "The {string} information should be visible for each advisory",
   async ({ page }, columnHeaders) => {
-    const headers = columnHeaders.split(`,`).map((column) => column.trim());
+    const headers = columnHeaders
+      .split(`,`)
+      .map((column: String) => column.trim());
 
     for (const header of headers) {
       console.log(`Checking visibility of column header: ${header}`);
@@ -164,9 +166,9 @@ Then("User searches for {string}", async ({ page }, advisoryID) => {
 });
 
 Then(
-  "User visits Advisory details Page of {string}",
-  async ({ page }, advisoryID) => {
-    const link = page.getByRole("link", { name: advisoryID });
-    await link.click();
+  "User visits Advisory details Page of {string} with type {string}",
+  async ({ page }, advisoryID, advisoryType) => {
+    const advisory = `xpath=//tr[contains(.,'${advisoryID}') and contains(.,'${advisoryType}')]/td/a`;
+    await page.locator(advisory).click();
   }
 );