infra: Webui sizzle remove

Makefile

@@ -131,11 +131,6 @@ install: $(DIST_TEST) po/LINGUAS
 	mkdir -p $(DESTDIR)/usr/lib/systemd/system/
 	cp src/systemd/webui-cockpit-ws.service $(DESTDIR)/usr/lib/systemd/system/
 
-# required for running integration tests;
-TEST_NPMS = \
-	node_modules/sizzle \
-	$(NULL)
-
 dist: $(TARFILE)
 	@ls -1 $(TARFILE)
 
@@ -147,7 +142,7 @@ $(TARFILE): $(DIST_TEST) $(SPEC)
 	tar --xz $(TAR_ARGS) -cf $(TARFILE) --transform 's,^,$(RPM_NAME)/,' \
 		--exclude '*.in' --exclude test/reference \
 		$$(git ls-files | grep -v node_modules) \
-		$(COCKPIT_REPO_FILES) $(NODE_MODULES_TEST) $(SPEC) $(TEST_NPMS) VERSION.txt \
+		$(COCKPIT_REPO_FILES) $(NODE_MODULES_TEST) $(SPEC) VERSION.txt \
 		dist/
 
 srpm: $(TARFILE) $(SPEC)

package.json

@@ -36,7 +36,6 @@
     "jed": "1.1.1",
     "qunit": "2.25.0",
     "sass": "1.98.0",
-    "sizzle": "2.3.10",
     "stdio": "2.1.3",
     "stylelint": "17.6.0",
     "stylelint-config-recommended-scss": "17.0.1",

test/check-storage-cockpit

@@ -392,7 +392,7 @@ class TestStorageCockpitIntegration(VirtInstallMachineCase, StorageCase):
         dev = "vda"
         r.check_disk(dev, "16.1 GB vda (Virtio Block Device)")
 
-        r.check_disk_row(dev, "/", "vda3", "1.70 GB", False, None, False, 4)
+        r.check_disk_row(dev, "/", "vda3", "1.70 GB", False)
         r.check_disk_mount_point_helper_text(dev, "/", "Needs at least")
 
         i.check_next_disabled()
@@ -477,7 +477,7 @@ class TestStorageCockpitIntegration(VirtInstallMachineCase, StorageCase):
 
         r.check_disk_row(dev, "/boot/efi", "vda1", "99.6 MB", False)
         r.check_disk_row(dev, "/boot", "vda2", "1.07 GB", False)
-        r.check_disk_row(dev, "/", "vda3", "14.9 GB", False, None, False, 4)
+        r.check_disk_row(dev, "/", "vda3", "14.9 GB", False)
 
         # Check fstab
         fstab = m.execute("cat /etc/fstab")
@@ -541,7 +541,7 @@ class TestStorageCockpitIntegration(VirtInstallMachineCase, StorageCase):
         r.check_disk(dev, "16.1 GB vda (Virtio Block Device)")
 
         r.check_disk_row(dev, "/boot", "vda2", "1.07 GB", False)
-        r.check_disk_row(dev, "/", "vda3", "15.0 GB", False, None, False, 4)
+        r.check_disk_row(dev, "/", "vda3", "15.0 GB", False)
         r.check_disk_row(dev, "/home", "vda3", "15.0 GB", False)
 
         # Check fstab

test/helpers/network.py

@@ -3,7 +3,9 @@
 
 import os
 import sys
+from types import SimpleNamespace
 
+from netlib import NetworkCase
 from testlib import wait
 
 HELPERS_DIR = os.path.dirname(__file__)
@@ -228,12 +230,12 @@ def preinstall_connection_test(self, installer, iface, configured=False):
         ])
 
     def configure_iface_setting(self, setting_title):
-        b = self.browser
-        b.click(f"dt:contains('{setting_title}') + dd button")
+        shim = SimpleNamespace(browser=self.browser)
+        NetworkCase.configure_iface_setting(shim, setting_title)
 
     def wait_for_iface_setting(self, setting_title, setting_value):
-        b = self.browser
-        b.wait_in_text(f"dt:contains('{setting_title}') + dd", setting_value)
+        shim = SimpleNamespace(browser=self.browser)
+        NetworkCase.wait_for_iface_setting(shim, setting_title, setting_value)
 
     def set_mtu_on_iface(self, iface, mtu):
         n = self

test/helpers/review.py

@@ -1,6 +1,7 @@
 # Copyright (C) 2022 Red Hat, Inc.
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
+import json
 import os
 import sys
 
@@ -60,18 +61,48 @@ def check_disk_row(
     ):
         action = f"format as {fs_type}" if reformat else action or "mount"
         encrypt_text = "encrypted" if is_encrypted and not reformat else "encrypt" if is_encrypted and reformat else ""
-        self.browser.wait_visible(
-            f"{prefix} table[aria-label={disk}] "
-            f"tbody{'' if rowIndex is None else f':nth-child({rowIndex})'} "
-            f"td:contains('{parent}') + "
-            f"td:contains('{size}') + "
-            f"td:contains('{action}') + "
-            f"td:contains('{encrypt_text}') + "
-            f"td:contains('{mount_point}')"
-        )
+        fragments = []
+        for part in (parent, str(size) if size != "" else "", action, encrypt_text, mount_point):
+            if part is not None and str(part) != "":
+                fragments.append(str(part))
+        table_selector = f"{prefix} #storage-review-table-{disk}".strip()
+        sel_json = json.dumps(table_selector)
+        frag_json = json.dumps(fragments)
+        if rowIndex is None:
+            cond = """(() => {
+              const table = document.querySelector(%s);
+              if (!table) return false;
+              const frags = %s;
+              const rows = table.querySelectorAll("tbody tr");
+              for (let i = 0; i < rows.length; i++) {
+                const t = rows[i].textContent;
+                if (frags.every(f => t.includes(f))) return true;
+              }
+              return false;
+            })()""" % (sel_json, frag_json)
+        else:
+            idx = int(rowIndex) - 1
+            cond = """(() => {
+              const table = document.querySelector(%s);
+              if (!table) return false;
+              const frags = %s;
+              const rows = table.querySelectorAll("tbody tr");
+              const tr = rows[%d];
+              if (!tr) return false;
+              const t = tr.textContent;
+              return frags.every(f => t.includes(f));
+            })()""" % (sel_json, frag_json, idx)
+        self.browser.wait_js_cond(cond)
 
     def check_disk_row_not_present(self, disk, mount):
-        self.browser.wait_not_present(f"table[aria-label={disk}] td:contains({mount})")
+        table_selector = f"#storage-review-table-{disk}".strip()
+        cond = """(() => {
+          const table = document.querySelector(%s);
+          if (!table) return true;
+          const needle = %s;
+          return !Array.from(table.querySelectorAll("tbody tr")).some(tr => tr.textContent.includes(needle));
+        })()""" % (json.dumps(table_selector), json.dumps(mount))
+        self.browser.wait_js_cond(cond)
 
     def check_deleted_system(self, os_name):
         self.browser.wait_in_text(f"#{self._step}-target-storage-note li", os_name)

test/helpers/storage.py

@@ -516,52 +516,139 @@ def set_scenario(self, scenario):
 
 
 class StorageReclaimDialog():
+    _TABLE = "#reclaim-space-modal-table"
+
     def __init__(self, browser):
         self.browser = browser
 
+    def _reclaim_js_each_row(self, device, rowIndex, body):
+        """Walk reclaim table rows. If rowIndex is set, it matches legacy CSS ``tbody:nth-child(rowIndex)``
+        (1-based index among the table's **direct** children), then ``tr`` containing ``device``.
+        If rowIndex is None, search all ``tbody tr``."""
+        tbl = json.dumps(self._TABLE)
+        dev = json.dumps(device)
+        nth_js = "null" if rowIndex is None else str(int(rowIndex))
+        return """(() => {
+          const table = document.querySelector(%s);
+          if (!table) return false;
+          const device = %s;
+          const tbodyNth = %s;
+          let rows;
+          if (tbodyNth === null) {
+            rows = table.querySelectorAll("tbody tr");
+          } else {
+            const child = table.children[tbodyNth - 1];
+            if (!child || child.tagName !== "TBODY") return false;
+            rows = child.querySelectorAll(":scope > tr");
+          }
+          for (let i = 0; i < rows.length; i++) {
+            const tr = rows[i];
+            if (!tr.textContent.includes(device)) continue;
+            %s
+          }
+          return false;
+        })()""" % (tbl, dev, nth_js, body)
+
+    def _reclaim_wait_row_button(self, device, aria_label, rowIndex=None, present=True, disabled=None):
+        """disabled: None = any, True = must be disabled, False = must be enabled."""
+        aria = json.dumps(aria_label)
+        inner = """
+            const ariaLabel = %s;
+            const btn = Array.from(tr.querySelectorAll("button")).find(
+              b => b.getAttribute("aria-label") === ariaLabel
+            );
+            if (!btn) continue;
+            const dis = btn.disabled || btn.getAttribute("aria-disabled") === "true";
+        """ % aria
+        if disabled is True:
+            inner += """
+            if (!dis) continue;
+            return true;
+            """
+        elif disabled is False:
+            inner += """
+            if (dis) continue;
+            return true;
+            """
+        else:
+            inner += "return true;\n"
+        cond = self._reclaim_js_each_row(device, rowIndex, inner)
+        if present:
+            self.browser.wait_js_cond(cond)
+        else:
+            self.browser.wait_js_cond("!(" + cond + ")")
+
+    def _reclaim_click_row_button(self, device, aria_label, rowIndex=None):
+        aria = json.dumps(aria_label)
+        inner = """
+            const ariaLabel = %s;
+            const btn = Array.from(tr.querySelectorAll("button")).find(
+              b => b.getAttribute("aria-label") === ariaLabel
+            );
+            if (!btn || btn.disabled || btn.getAttribute("aria-disabled") === "true") continue;
+            btn.click();
+            return true;
+        """ % aria
+        script = self._reclaim_js_each_row(device, rowIndex, inner)
+        self.browser.wait_js_cond(script)
+
     def reclaim_check_device_row(self, location, name=None, deviceType=None, space=None, locked=False):
-        self.browser.wait_visible(
-            "#reclaim-space-modal-table "
-            f"td[data-label=Location]:contains({location}) + " +
-            (f"td[data-label=Name]:contains({name}) + " if deviceType != "disk" else "") +
-            f"td[data-label=Type]:contains({deviceType}) + "
-            f"td[data-label=Space]:contains({space})"
-        )
+        loc = json.dumps(location or "")
+        nam = json.dumps("" if name is None else name)
+        dt = json.dumps(deviceType or "")
+        sp = json.dumps(space or "")
+        is_disk = "true" if deviceType == "disk" else "false"
+        cond = """(() => {
+          const table = document.querySelector(%s);
+          if (!table) return false;
+          const location = %s, name = %s, devType = %s, space = %s;
+          const isDisk = %s;
+          for (const tr of table.querySelectorAll("tbody tr")) {
+            const locEl = tr.querySelector('td[data-label="Location"]');
+            const nameEl = tr.querySelector('td[data-label="Name"]');
+            const typeEl = tr.querySelector('td[data-label="Type"]');
+            const spaceEl = tr.querySelector('td[data-label="Space"]');
+            if (!locEl || !typeEl || !spaceEl) continue;
+            if (!locEl.textContent.includes(location)) continue;
+            if (!isDisk && nameEl && !nameEl.textContent.includes(name)) continue;
+            if (!typeEl.textContent.includes(devType)) continue;
+            if (!spaceEl.textContent.includes(space)) continue;
+            return true;
+          }
+          return false;
+        })()""" % (json.dumps(self._TABLE), loc, nam, dt, sp, is_disk)
+        self.browser.wait_js_cond(cond)
         if locked:
-            self.browser.wait_visible(
-                f"#reclaim-space-modal-table tr:contains({name}) "
-                f"td[data-label=Type] .reclaim-space-modal-device-locked"
-            )
+            name_sub = json.dumps(name or location or "")
+            lock_cond = """(() => {
+              const table = document.querySelector(%s);
+              if (!table) return false;
+              const nameNeedle = %s;
+              for (const tr of table.querySelectorAll("tbody tr")) {
+                if (!tr.textContent.includes(nameNeedle)) continue;
+                const typeEl = tr.querySelector('td[data-label="Type"]');
+                if (typeEl && typeEl.querySelector(".reclaim-space-modal-device-locked")) return true;
+              }
+              return false;
+            })()""" % (json.dumps(self._TABLE), name_sub)
+            self.browser.wait_js_cond(lock_cond)
 
     def reclaim_remove_device(self, device):
-        self.browser.click(f"#reclaim-space-modal-table tr:contains('{device}') button[aria-label='delete']")
+        self._reclaim_click_row_button(device, "delete")
 
     def reclaim_check_action_button_present(self, device, action, present=True, disabled=False):
-        if action == "shrink":
-            disabled = ":disabled" if disabled else ":not(:disabled)"
-        else:
-            disabled = "[aria-disabled='true']" if disabled else ":not([aria-disabled='true'])"
-        selector = (
-            "#reclaim-space-modal-table "
-            f"tr:contains('{device}') "
-            f"button[aria-label='{action}']{disabled}"
-        )
-
-        if present:
-            self.browser.wait_visible(selector)
-        else:
-            self.browser.wait_not_present(selector)
+        if not present:
+            self._reclaim_wait_row_button(device, action, present=False, disabled=None)
+            return
+        want_dis = True if disabled else False
+        self._reclaim_wait_row_button(device, action, present=True, disabled=want_dis)
 
     def reclaim_modal_submit_and_check_warning(self, warning):
         self.browser.click("button:contains('Reclaim space')")
         self.browser.wait_in_text("#reclaim-space-modal .pf-v6-c-alert", warning)
 
     def reclaim_shrink_device(self, device, new_size, current_size=None, rowIndex=None, ariaLabel="shrink"):
-        self.browser.click(
-            "#reclaim-space-modal-table "
-            f"tbody{'' if rowIndex is None else f':nth-child({rowIndex})'} "
-            f"tr:contains('{device}') button[aria-label='{ariaLabel}']"
-        )
+        self._reclaim_click_row_button(device, ariaLabel, rowIndex=rowIndex)
         self.browser.wait_visible("#popover-reclaim-space-modal-shrink-body")
         if current_size is not None:
             self.browser.wait_val("#reclaim-space-modal-shrink-input", current_size)
@@ -577,19 +664,21 @@ def reclaim_shrink_device(self, device, new_size, current_size=None, rowIndex=No
         self.reclaim_check_action_present(device, ariaLabel, rowIndex=rowIndex)
 
     def reclaim_check_action_present(self, device, action, present=True, rowIndex=None):
-        selector = (
-            "#reclaim-space-modal-table "
-            f"tbody{'' if rowIndex is None else f':nth-child({rowIndex})'} "
-            f"tr:contains('{device}') "
-            "td:nth-child(5) "  # Actions column
-        )
+        act = json.dumps(action)
+        inner = """
+            const actions = tr.querySelector("td:nth-child(5)");
+            if (!actions) continue;
+            const actionNeedle = %s;
+            if (actions.textContent.includes(actionNeedle)) return true;
+        """ % act
+        cond = self._reclaim_js_each_row(device, rowIndex, inner)
         if present:
-            self.browser.wait_in_text(selector, action)
+            self.browser.wait_js_cond(cond)
         else:
-            self.browser.wait_not_in_text(selector, action)
+            self.browser.wait_js_cond("!(" + cond + ")")
 
     def reclaim_undo_action(self, device):
-        self.browser.click(f"#reclaim-space-modal-table tr:contains('{device}') button[aria-label='undo']")
+        self._reclaim_click_row_button(device, "undo")
 
     def reclaim_check_available_space(self, space):
         self.browser.wait_text("#reclaim-space-modal-hint-available-free-space", space)