Merge pull request #388 from NHSDigital/fix-safari-downloads

Fix Safari tests

Author: jf-x-dev

mavis/test/pages/programmes.py

@@ -1,5 +1,6 @@
 import pandas as pd
 from playwright.sync_api import Page, expect
+from io import StringIO
 
 from ..data import TestData
 from ..models import ReportFormat, Programme
@@ -129,12 +130,24 @@ def verify_report_format(self, programme: Programme, report_format: ReportFormat
     def _download_and_verify_report_headers(self, expected_headers: str):
         _file_path = f"working/rpt_{get_current_datetime()}.csv"
 
-        with self.page.expect_download() as download_info:
-            self.continue_button.click()
-        download = download_info.value
-        download.save_as(_file_path)
+        browser = getattr(self.page.context, "browser", None)
+        browser_type_name = getattr(
+            getattr(browser, "browser_type", None), "name", None
+        )
+
+        # Playwrights webkit browser always opens CSVs in the browser, unlike Chromium and Firefox
+        if browser_type_name == "webkit":
+            self.click_continue()
+            csv_content = self.page.locator("pre").inner_text()
+            _actual_df = pd.read_csv(StringIO(csv_content))
+            self.page.go_back()
+        else:
+            with self.page.expect_download() as download_info:
+                self.click_continue()
+            download = download_info.value
+            download.save_as(_file_path)
+            _actual_df = pd.read_csv(_file_path)
 
-        _actual_df = pd.read_csv(_file_path)
         actual_headers = ",".join(_actual_df.columns.tolist())
         _e_not_a = [
             h for h in expected_headers.split(",") if h not in actual_headers.split(",")

mavis/test/pages/school_moves.py

@@ -1,6 +1,8 @@
 from datetime import date
-from pathlib import Path
 from typing import Optional
+import pandas as pd
+from pandas import DataFrame
+from io import StringIO
 
 from ..step import step
 
@@ -67,10 +69,22 @@ def enter_date_range(
 
         self.continue_button.click()
 
-    def confirm(self) -> Path:
-        with self.page.expect_download() as download_info:
+    def confirm(self) -> DataFrame:
+        browser = getattr(self.page.context, "browser", None)
+        browser_type_name = getattr(
+            getattr(browser, "browser_type", None), "name", None
+        )
+
+        # Playwrights webkit browser always opens CSVs in the browser, unlike Chromium and Firefox
+        if browser_type_name == "webkit":
             self.confirm_button.click()
-        return download_info.value.path()
+            csv_content = self.page.locator("pre").inner_text()
+            self.page.go_back()
+            return pd.read_csv(StringIO(csv_content))
+        else:
+            with self.page.expect_download() as download_info:
+                self.confirm_button.click()
+            return pd.read_csv(download_info.value.path())
 
 
 class ReviewSchoolMovePage:

tests/test_school_moves.py

@@ -1,4 +1,3 @@
-import pandas
 from playwright.sync_api import expect
 from mavis.test.data import ClassFileMapping
 import pytest
@@ -91,9 +90,9 @@ def test_download(
 ):
     school_moves_page.click_download()
     download_school_moves_page.enter_date_range()
-    path = download_school_moves_page.confirm()
+    school_moves_csv = download_school_moves_page.confirm()
 
-    actual_headers = set(pandas.read_csv(path).columns)
+    actual_headers = set(school_moves_csv.columns)
     expected_headers = {
         "NHS_REF",
         "SURNAME",