Conditionals

Author: zdrapela

e2e-tests/eslint.config.js

@@ -101,7 +101,6 @@ export default [
       "playwright/valid-describe-callback": "off", // Allow async describe callbacks
       "playwright/valid-expect": "error", // Keep this as error to catch missing matchers
       "playwright/no-wait-for-selector": "off", // Allow wait for selector
-      "playwright/no-conditional-in-test": "off", // Allow conditional in test
       "playwright/no-wait-for-timeout": "off", // Allow wait for timeout
       "playwright/no-skipped-test": [
         "warn",

e2e-tests/playwright/e2e/configuration-test/config-map.spec.ts

@@ -18,6 +18,7 @@ test.describe("Change app-config at e2e test runtime", () => {
 
     // Start with a common name, but let KubeClient find the actual ConfigMap
     const configMapName = "app-config-rhdh";
+    // eslint-disable-next-line playwright/no-conditional-in-test
     const namespace = process.env.NAME_SPACE_RUNTIME || "showcase-runtime";
     const deploymentName = "rhdh-developer-hub";
 

e2e-tests/playwright/e2e/extensions.spec.ts

@@ -138,6 +138,7 @@ test.describe("Admin > Extensions > Catalog", () => {
     await expect(page.getByRole("button", { name: "✔" })).toBeVisible();
     await uiHelper.clickButton("Reset");
     await expect(page.getByText("pluginConfig:")).toBeHidden();
+    // eslint-disable-next-line playwright/no-conditional-in-test
     const modifier = isMac ? "Meta" : "Control";
     await page.keyboard.press(`${modifier}+KeyA`);
     await page.keyboard.press(`${modifier}+KeyV`);

e2e-tests/playwright/e2e/plugins/adoption-insights/adoption-insights.spec.ts

@@ -3,6 +3,8 @@ import { Common } from "../../../utils/common";
 import { UIhelper } from "../../../utils/ui-helper";
 import { TestHelper } from "../../../support/pages/adoption-insights";
 
+/* eslint-disable playwright/no-conditional-in-test */
+
 test.describe.serial("Test Adoption Insights", () => {
   test.beforeAll(async () => {
     test.info().annotations.push({

e2e-tests/playwright/e2e/plugins/bulk-import.spec.ts

@@ -11,7 +11,7 @@ import {
 
 // Pre-req : plugin-bulk-import & plugin-bulk-import-backend-dynamic
 test.describe("Bulk Import plugin", () => {
-  test.describe.configure({ retries: process.env.CI ? 2 : 0 , mode: "serial"});
+  test.describe.configure({ retries: process.env.CI ? 2 : 0, mode: "serial" });
   test.skip(() => process.env.JOB_NAME.includes("osd-gcp")); // skipping due to RHIDP-5704 on OSD Env
 
   let page: Page;

e2e-tests/playwright/e2e/plugins/keycloak/catalog-users.spec.ts

@@ -47,6 +47,7 @@ test.describe("Test Keycloak plugin", () => {
       );
       expect(userFound).not.toBeNull();
 
+      // eslint-disable-next-line playwright/no-conditional-in-test
       if (userFound) {
         await keycloak.checkUserDetails(
           page,
@@ -86,6 +87,7 @@ test.describe("Test Keycloak plugin metrics", () => {
     const domain = host.split(".").slice(1).join(".");
 
     const metricsRoute = await kubeClient.getRoute(namespace, routerName);
+    // eslint-disable-next-line playwright/no-conditional-in-test
     if (!metricsRoute) {
       const service = await kubeClient.getServiceByLabel(
         namespace,

e2e-tests/playwright/e2e/plugins/middleware.spec.ts

@@ -14,7 +14,7 @@ test.describe("Test middleware plugin", () => {
     const common = new Common(page);
 
     await common.loginAsGuest();
-    await page.goto("/simple-chat", { waitUntil: "networkidle" });
+    await page.goto("/simple-chat", { waitUntil: "domcontentloaded" });
     await page.getByRole("checkbox", { name: "Use Proxy" }).check();
     await page.getByRole("textbox").fill("hi");
 
@@ -26,7 +26,8 @@ test.describe("Test middleware plugin", () => {
     const headers = await response.allHeaders();
     console.log("All headers:", headers);
     console.log("Target header:", headers["x-proxy-test-header"]);
+
+    // eslint-disable-next-line playwright/valid-expect
     expect(headers["x-proxy-test-header"]);
-    expect(headers["x-proxy-test-header"]).toBeTruthy();
   });
 });

e2e-tests/playwright/e2e/plugins/quick-start.spec.ts

@@ -20,6 +20,7 @@ test.describe("Test Quick Start plugin", () => {
 
   test("Access Quick start from Global Header", async ({ page }) => {
     await page.waitForTimeout(1000);
+    // eslint-disable-next-line playwright/no-conditional-in-test
     if (await page.getByRole("button", { name: "Hide" }).isHidden()) {
       await uiHelper.clickButtonByLabel("Help");
       await uiHelper.clickByDataTestId("quickstart-button");

e2e-tests/playwright/e2e/plugins/rbac/rbac.spec.ts

@@ -243,6 +243,7 @@ test.describe.serial("Test RBAC", () => {
       const lines = fileContent.trim().split("\n");
 
       const header = "userEntityRef,displayName,email,lastAuthTime";
+      // eslint-disable-next-line playwright/no-conditional-in-test
       if (lines[0] !== header) {
         throw new Error("Header does not match");
       }
@@ -251,6 +252,7 @@ test.describe.serial("Test RBAC", () => {
       const allUsersValid = lines
         .slice(1)
         .every((line) => line.startsWith("user:default"));
+      // eslint-disable-next-line playwright/no-conditional-in-test
       if (!allUsersValid) {
         throw new Error("Not all users info are valid");
       }
@@ -394,7 +396,9 @@ test.describe.serial("Test RBAC", () => {
         nextButton2 = page.locator('[data-testid="nextButton-2"]');
         matchNextButton2 = await nextButton2.all();
         attempts++;
+        // eslint-disable-next-line playwright/no-conditional-in-test
       } while (matchNextButton2.length > 1 && attempts < 5);
+      // eslint-disable-next-line playwright/no-force-option
       await nextButton2.click({ force: true });
       await page.waitForTimeout(1_000);
       await uiHelper.clickButton("Save");
@@ -489,12 +493,14 @@ test.describe.serial("Test RBAC", () => {
 
       const policiesResponse = await rbacApi.getPolicies();
 
+      // eslint-disable-next-line playwright/no-conditional-in-test
       if (!rolesResponse.ok()) {
         throw Error(
           `RBAC rolesResponse API call failed with status code ${rolesResponse.status()}`,
         );
       }
 
+      // eslint-disable-next-line playwright/no-conditional-in-test
       if (!policiesResponse.ok()) {
         throw Error(
           `RBAC policiesResponse API call failed with status code ${policiesResponse.status()}`,

e2e-tests/playwright/e2e/plugins/topology/topology.spec.ts

@@ -55,6 +55,7 @@ test.describe("Test Topology Plugin", () => {
     // Determine resource type and run appropriate test
     const resourceType = await getResourceType(page);
 
+    // eslint-disable-next-line playwright/no-conditional-in-test
     if (resourceType === "ingress") {
       await testIngressResources(page, uiHelper);
     } else {