Skip to content

Commit d750440

Browse files
Vaccs report download fix
1 parent ff00bcf commit d750440

File tree

1 file changed

+9
-22
lines changed

1 file changed

+9
-22
lines changed

mavis/test/pages/reports/vaccination_report_page.py

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -51,30 +51,17 @@ def _download_and_verify_report_headers(self, expected_headers: str) -> None:
5151
download.save_as(_file_path)
5252
_actual_df = pd.read_csv(_file_path)
5353
except PlaywrightTimeoutError:
54-
# No download - check if CSV opened in a new page or current page
55-
try:
56-
# Check for new page
57-
new_page = self.page.context.pages[-1]
58-
if new_page != self.page:
59-
new_page.wait_for_load_state("load", timeout=10000)
60-
pre_element = new_page.locator("pre")
61-
csv_content = pre_element.inner_text(timeout=5000)
62-
new_page.close()
63-
_actual_df = pd.read_csv(StringIO(csv_content))
64-
else:
65-
# No new page, so treat as current page case
66-
self.page.wait_for_load_state("load", timeout=10000)
67-
pre_element = self.page.locator("pre")
68-
csv_content = pre_element.inner_text(timeout=10000)
69-
self.page.go_back()
70-
_actual_df = pd.read_csv(StringIO(csv_content))
71-
except (PlaywrightTimeoutError, IndexError):
72-
# CSV opened in current page
54+
# No download - CSV opened in browser (new page or current page)
55+
new_page = self.page.context.pages[-1]
56+
if new_page != self.page:
57+
new_page.wait_for_load_state("load", timeout=10000)
58+
csv_content = new_page.locator("pre").inner_text(timeout=5000)
59+
new_page.close()
60+
else:
7361
self.page.wait_for_load_state("load", timeout=10000)
74-
pre_element = self.page.locator("pre")
75-
csv_content = pre_element.inner_text(timeout=10000)
62+
csv_content = self.page.locator("pre").inner_text(timeout=10000)
7663
self.page.go_back()
77-
_actual_df = pd.read_csv(StringIO(csv_content))
64+
_actual_df = pd.read_csv(StringIO(csv_content))
7865
else:
7966
with self.page.expect_download() as download_info:
8067
self.click_download_report()

0 commit comments

Comments
 (0)