download restructure

Author: chinmaymudholkar1

mavis/test/pages/header_component.py

@@ -1,3 +1,5 @@
+import re
+
 from playwright.sync_api import Page
 
 from mavis.test.annotations import step
@@ -32,36 +34,14 @@ def __init__(self, page: Page) -> None:
         self.your_team_link = menu.get_by_role("link", name="Your Team", exact=True)
 
     def ensure_menu_visible(self) -> None:
-        """Expand mobile menu if needed (e.g., 'Browse More' button)."""
-        # Look for "Browse More" button
-        # (has newline between words on mobile)
-        try:
-            # Find button containing both Browse and More
-            buttons = self.page.get_by_role("button")
-            for i in range(buttons.count()):
-                try:
-                    btn_text = buttons.nth(i).inner_text(timeout=100)
-                    # Check if button contains both Browse and More
-                    if "browse" in btn_text.lower() and "more" in btn_text.lower():
-                        button = buttons.nth(i)
-                        if button.is_visible(timeout=100):
-                            # Check if button is expanded already
-                            aria_expanded = button.get_attribute("aria-expanded")
-                            if aria_expanded != "true":
-                                button.click()
-                                # Wait for the menu to become visible
-                                self.page.wait_for_selector(
-                                    '[aria-label="Menu"] [role="link"]',
-                                    state="visible",
-                                    timeout=2000,
-                                )
-                            return
-                except (TimeoutError, Exception):  # noqa: BLE001, S112
-                    # Playwright may raise TimeoutError or generic Error if element is
-                    # detached or not interactable
-                    continue  # Button check failed, try next
-        except (TimeoutError, Exception):  # noqa: BLE001, S110
-            pass  # Browse More button not found or menu already expanded
+        browse_button = self.page.get_by_role(
+            "button", name=re.compile(r"browse\s*more", re.IGNORECASE)
+        )
+        if (
+            browse_button.count() > 0
+            and browse_button.get_attribute("aria-expanded") != "true"
+        ):
+            browse_button.click()
 
     @step("Click on Manage vaccinations in schools")
     def click_mavis(self) -> None:

mavis/test/pages/reports/vaccination_report_page.py

@@ -39,35 +39,28 @@ def _download_and_verify_report_headers(self, expected_headers: str) -> None:
             getattr(browser, "browser_type", None), "name", None
         )
 
-        # Playwright's webkit browser may open CSVs in the browser
-        # unlike Chromium and Firefox, but behavior varies by environment
-        if browser_type_name == "webkit":
-            # WebKit behavior varies: may download file, open in new page,
-            # or open in current page. Try download first (macOS CI behavior)
-            try:
-                with self.page.expect_download(timeout=5000) as download_info:
-                    self.click_download_report()
-                download = download_info.value
-                download.save_as(_file_path)
-                _actual_df = pd.read_csv(_file_path)
-            except PlaywrightTimeoutError:
-                # No download - CSV opened in browser (new page or current page)
-                new_page = self.page.context.pages[-1]
-                if new_page != self.page:
-                    new_page.wait_for_load_state("load", timeout=10000)
-                    csv_content = new_page.locator("pre").inner_text(timeout=5000)
-                    new_page.close()
-                else:
-                    self.page.wait_for_load_state("load", timeout=10000)
-                    csv_content = self.page.locator("pre").inner_text(timeout=10000)
-                    self.page.go_back()
-                _actual_df = pd.read_csv(StringIO(csv_content))
-        else:
-            with self.page.expect_download() as download_info:
+        # Try to download the file (set shorter timeout for WebKit)
+        download_timeout = 5000 if browser_type_name == "webkit" else None
+        page_load_timeout = 10000 if browser_type_name == "webkit" else None
+        try:
+            with self.page.expect_download(timeout=download_timeout) as download_info:
                 self.click_download_report()
             download = download_info.value
             download.save_as(_file_path)
             _actual_df = pd.read_csv(_file_path)
+        except PlaywrightTimeoutError:
+            # WebKit may open CSV in browser - read from <pre> element
+            pages = self.page.context.pages
+            page_to_read = pages[-1] if len(pages) > 1 else self.page
+            page_to_read.wait_for_load_state("load", timeout=page_load_timeout)
+            csv_content = page_to_read.locator("pre").inner_text()
+            _actual_df = pd.read_csv(StringIO(csv_content))
+
+            # Clean up: close new page or go back on current page
+            if page_to_read != self.page:
+                page_to_read.close()
+            else:
+                self.page.go_back()
 
         expected_set = set(expected_headers.split(","))
         actual_set = set(_actual_df.columns)