Use 'window manager' naming for selenium helpers

The earlier rename commit replaced 'WinBox' with 'scratchbook' in the
selenium helper docstrings and the frame() context manager, which just
swapped one inconsistent name for another. Converge on 'window manager'
for everything I'm touching here.
This commit is contained in:
Dannon Baker
2026-04-30 23:10:29 -05:00
committed by Ahmed Awan
parent a5667572fb
commit 5f037decc4
2 changed files with 19 additions and 19 deletions
+12 -12
View File
@@ -2307,11 +2307,11 @@ class NavigatesGalaxy(HasDriverProxy[WaitType]):
return self.components.masthead.window_manager.has_class("toggle")
def window_manager_window_count(self) -> int:
"""Return number of open scratchbook windows."""
"""Return number of open window manager windows."""
return len(self.find_elements_by_selector(".window-manager-window"))
def window_manager_wait_for_window_count(self, expected_count: int):
"""Wait until the expected number of scratchbook windows exist."""
"""Wait until the expected number of window manager windows exist."""
def check_count(driver=None):
count = len(self.find_elements_by_selector(".window-manager-window"))
@@ -2320,15 +2320,15 @@ class NavigatesGalaxy(HasDriverProxy[WaitType]):
self._wait_on(check_count, f"window count to be {expected_count}")
@contextlib.contextmanager
def scratchbook_frame(self, index=0):
"""Context manager to switch into a scratchbook window iframe by index.
def window_manager_frame(self, index=0):
"""Context manager to switch into a window manager iframe by index.
Usage:
with self.scratchbook_frame(0):
with self.window_manager_frame(0):
self.wait_for_selector_visible(".dataset-view")
"""
iframes = self.find_elements_by_selector(".window-manager-window iframe")
assert len(iframes) > index, f"Expected at least {index + 1} scratchbook iframes, found {len(iframes)}"
assert len(iframes) > index, f"Expected at least {index + 1} window manager iframes, found {len(iframes)}"
try:
self.switch_to_frame(iframes[index])
yield
@@ -2336,22 +2336,22 @@ class NavigatesGalaxy(HasDriverProxy[WaitType]):
self.switch_to_default_content()
def window_manager_get_titles(self) -> list:
"""Return list of window titles from all open scratchbook windows."""
"""Return list of window titles from all open window manager windows."""
elements = self.components.window_manager.title.all()
return [el.text for el in elements]
def window_manager_close_window(self, index=0):
"""Close a specific scratchbook window by index."""
"""Close a specific window manager window by index."""
close_buttons = self.components.window_manager.close_button.all()
assert len(close_buttons) > index, f"Expected at least {index + 1} close buttons, found {len(close_buttons)}"
close_buttons[index].click()
def window_manager_get_focused_title(self) -> str:
"""Return the title text of the currently focused scratchbook window."""
"""Return the title text of the currently focused window manager window."""
return self.components.window_manager.focused_title.wait_for_text()
def window_manager_click_focus_overlay(self, index=0):
"""Click the focus overlay of a scratchbook window to switch focus.
"""Click the focus overlay of a window manager window to switch focus.
Uses fire_mousedown to match the event the overlay actually listens for.
"""
@@ -2360,13 +2360,13 @@ class NavigatesGalaxy(HasDriverProxy[WaitType]):
self.fire_mousedown(overlays[index])
def window_manager_get_iframe_src(self, index=0) -> str:
"""Return the src attribute of a scratchbook window iframe by index."""
"""Return the src attribute of a window manager iframe by index."""
iframes = self.components.window_manager.iframe.all()
assert len(iframes) > index, f"Expected at least {index + 1} iframes, found {len(iframes)}"
return iframes[index].get_attribute("src") or ""
def window_manager_focused_count(self) -> int:
"""Return the number of focused scratchbook windows."""
"""Return the number of focused window manager windows."""
return len(self.components.window_manager.focused.all())
# avoids problematic ID and classes on markup
@@ -1,4 +1,4 @@
"""E2E tests for Galaxy's scratchbook (floating window manager)."""
"""E2E tests for Galaxy's window manager (floating windows)."""
from .framework import (
managed_history,
@@ -32,7 +32,7 @@ class TestWindowManager(SeleniumTestCase):
@selenium_test
@managed_history
def test_open_dataset_in_window(self):
"""Display a dataset with WM active — a scratchbook window should appear."""
"""Display a dataset with WM active — a window manager window should appear."""
self.perform_upload(self.get_filename("1.fasta"))
self.history_panel_wait_for_hid_ok(1)
@@ -43,7 +43,7 @@ class TestWindowManager(SeleniumTestCase):
item = self.history_panel_item_component(hid=1)
item.display_button.wait_for_and_click()
# A scratchbook window should appear
# A window manager window should appear
self.components.window_manager._.wait_for_visible()
assert self.window_manager_window_count() == 1
self.screenshot("window_manager_dataset_opened")
@@ -56,7 +56,7 @@ class TestWindowManager(SeleniumTestCase):
@selenium_test
@managed_history
def test_window_content_loads(self):
"""Content inside the scratchbook iframe should render the dataset view."""
"""Content inside the window manager iframe should render the dataset view."""
self.perform_upload(self.get_filename("1.fasta"))
self.history_panel_wait_for_hid_ok(1)
@@ -66,14 +66,14 @@ class TestWindowManager(SeleniumTestCase):
self.components.window_manager._.wait_for_visible()
# Switch into the iframe and verify dataset view rendered
with self.scratchbook_frame(0):
with self.window_manager_frame(0):
self.wait_for_selector_visible(".dataset-view")
self.screenshot("window_manager_iframe_content")
@selenium_test
@managed_history
def test_multiple_windows(self):
"""Opening multiple datasets creates multiple scratchbook windows with correct focus."""
"""Opening multiple datasets creates multiple window manager windows with correct focus."""
for _i in range(3):
self.perform_upload(self.get_filename("1.fasta"))
self.history_panel_wait_for_hid_ok(3)
@@ -102,7 +102,7 @@ class TestWindowManager(SeleniumTestCase):
@selenium_test
@managed_history
def test_close_window(self):
"""Closing a scratchbook window removes it from DOM."""
"""Closing a window manager window removes it from DOM."""
self.perform_upload(self.get_filename("1.fasta"))
self.perform_upload(self.get_filename("1.bed"))
self.history_panel_wait_for_hid_ok(2)