Merge pull request #316 from nationalarchives/AYR-888/configure-brows…

…er-e2e Ayr 888/configure browser e2e
nationalarchives · Apr 8, 2024 · fb3089b · fb3089b
2 parents 9dcf96e + 7d9a270
commit fb3089b
Show file tree

Hide file tree

Showing 91 changed files with 138 additions and 36 deletions.
diff --git a/e2e_tests/conftest.py b/e2e_tests/conftest.py
@@ -1,23 +1,58 @@
 import os
 
 import pytest
-from playwright.sync_api import Page
+from playwright.sync_api import Page, Playwright
 
 
-@pytest.fixture()
-def aau_user_page(page) -> Page:
+@pytest.fixture(params=["firefox", "chromium", "webkit"])
+def aau_user_page(
+    request, playwright: Playwright, browser_context_args
+) -> Page:
+    browser_type = request.param
+    if browser_type == "firefox":
+        browser = playwright.firefox
+    elif browser_type == "chromium":
+        browser = playwright.chromium
+    elif browser_type == "webkit":
+        browser = playwright.webkit
+    else:
+        raise ValueError(f"Unsupported browser type: {browser_type}")
+
+    browser_instance = browser.launch()
+
+    context = browser_instance.new_context(**browser_context_args)
+    page = context.new_page()
     page.goto("/sign-in")
     page.get_by_label("Email address").fill(
         os.environ.get("AYR_AAU_USER_USERNAME")
     )
     page.get_by_label("Password").fill(os.environ.get("AYR_AAU_USER_PASSWORD"))
     page.get_by_role("button", name="Sign in").click()
     page.wait_for_url("/browse")
-    return page
+    yield page
 
+    context.close()
+    browser_instance.close()
 
-@pytest.fixture()
-def standard_user_page(page) -> Page:
+
+@pytest.fixture(params=["firefox", "chromium", "webkit"])
+def standard_user_page(
+    request, playwright: Playwright, browser_context_args
+) -> Page:
+    browser_type = request.param
+    if browser_type == "firefox":
+        browser = playwright.firefox
+    elif browser_type == "chromium":
+        browser = playwright.chromium
+    elif browser_type == "webkit":
+        browser = playwright.webkit
+    else:
+        raise ValueError(f"Unsupported browser type: {browser_type}")
+
+    browser_instance = browser.launch()
+
+    context = browser_instance.new_context(**browser_context_args)
+    page = context.new_page()
     page.goto("/sign-in")
     page.get_by_label("Email address").fill(
         os.environ.get("AYR_STANDARD_USER_USERNAME")
@@ -26,7 +61,10 @@ def standard_user_page(page) -> Page:
         os.environ.get("AYR_STANDARD_USER_PASSWORD")
     )
     page.get_by_role("button", name="Sign in").click()
-    return page
+    yield page
+
+    context.close()
+    browser_instance.close()
 
 
 @pytest.fixture(scope="session")

diff --git a/...ss_no_visual_regression/accessibility.png → ...ual_regression/chromium-accessibility.png b/...ss_no_visual_regression/accessibility.png → ...ual_regression/chromium-accessibility.png
diff --git a/.../test_css_no_visual_regression/browse.png → ..._no_visual_regression/chromium-browse.png b/.../test_css_no_visual_regression/browse.png → ..._no_visual_regression/chromium-browse.png
diff --git a/..._visual_regression/browse_consignment.png → ...egression/chromium-browse_consignment.png b/..._visual_regression/browse_consignment.png → ...egression/chromium-browse_consignment.png
diff --git a/...ss_no_visual_regression/browse_series.png → ...ual_regression/chromium-browse_series.png b/...ss_no_visual_regression/browse_series.png → ...ual_regression/chromium-browse_series.png
diff --git a/...l_regression/browse_transferring_body.png → ...ion/chromium-browse_transferring_body.png b/...l_regression/browse_transferring_body.png → ...ion/chromium-browse_transferring_body.png
diff --git a/...test_css_no_visual_regression/cookies.png → ...no_visual_regression/chromium-cookies.png b/...test_css_no_visual_regression/cookies.png → ...no_visual_regression/chromium-cookies.png
diff --git a/...al_regression/how_to_use_this_service.png → ...sion/chromium-how_to_use_this_service.png b/...al_regression/how_to_use_this_service.png → ...sion/chromium-how_to_use_this_service.png
diff --git a/...test_css_no_visual_regression/privacy.png → ...no_visual_regression/chromium-privacy.png b/...test_css_no_visual_regression/privacy.png → ...no_visual_regression/chromium-privacy.png
diff --git a/.../test_css_no_visual_regression/record.png → ..._no_visual_regression/chromium-record.png b/.../test_css_no_visual_regression/record.png → ..._no_visual_regression/chromium-record.png
diff --git a/...ual_regression/search_results_summary.png → ...ssion/chromium-search_results_summary.png b/...ual_regression/search_results_summary.png → ...ssion/chromium-search_results_summary.png
diff --git a/...l_regression/search_transferring_body.png → ...ion/chromium-search_transferring_body.png b/...l_regression/search_transferring_body.png → ...ion/chromium-search_transferring_body.png
diff --git a/...t_css_no_visual_regression/signed_out.png → ...visual_regression/chromium-signed_out.png b/...t_css_no_visual_regression/signed_out.png → ...visual_regression/chromium-signed_out.png
diff --git a/...n/test_css_no_visual_regression/start.png → ...s_no_visual_regression/chromium-start.png b/...n/test_css_no_visual_regression/start.png → ...s_no_visual_regression/chromium-start.png
diff --git a/...css_no_visual_regression/terms_of_use.png → ...sual_regression/chromium-terms_of_use.png b/...css_no_visual_regression/terms_of_use.png → ...sual_regression/chromium-terms_of_use.png
diff --git a/.../test_visual_regression/test_css_no_visual_regression/firefox-accessibility.png b/.../test_visual_regression/test_css_no_visual_regression/firefox-accessibility.png
diff --git a/...apshots/test_visual_regression/test_css_no_visual_regression/firefox-browse.png b/...apshots/test_visual_regression/test_css_no_visual_regression/firefox-browse.png
diff --git a/..._visual_regression/test_css_no_visual_regression/firefox-browse_consignment.png b/..._visual_regression/test_css_no_visual_regression/firefox-browse_consignment.png
diff --git a/.../test_visual_regression/test_css_no_visual_regression/firefox-browse_series.png b/.../test_visual_regression/test_css_no_visual_regression/firefox-browse_series.png
diff --git a/...l_regression/test_css_no_visual_regression/firefox-browse_transferring_body.png b/...l_regression/test_css_no_visual_regression/firefox-browse_transferring_body.png
diff --git a/...pshots/test_visual_regression/test_css_no_visual_regression/firefox-cookies.png b/...pshots/test_visual_regression/test_css_no_visual_regression/firefox-cookies.png
diff --git a/...al_regression/test_css_no_visual_regression/firefox-how_to_use_this_service.png b/...al_regression/test_css_no_visual_regression/firefox-how_to_use_this_service.png
diff --git a/...pshots/test_visual_regression/test_css_no_visual_regression/firefox-privacy.png b/...pshots/test_visual_regression/test_css_no_visual_regression/firefox-privacy.png
diff --git a/...apshots/test_visual_regression/test_css_no_visual_regression/firefox-record.png b/...apshots/test_visual_regression/test_css_no_visual_regression/firefox-record.png
diff --git a/...ual_regression/test_css_no_visual_regression/firefox-search_results_summary.png b/...ual_regression/test_css_no_visual_regression/firefox-search_results_summary.png
diff --git a/...l_regression/test_css_no_visual_regression/firefox-search_transferring_body.png b/...l_regression/test_css_no_visual_regression/firefox-search_transferring_body.png
diff --git a/...ots/test_visual_regression/test_css_no_visual_regression/firefox-signed_out.png b/...ots/test_visual_regression/test_css_no_visual_regression/firefox-signed_out.png
diff --git a/...napshots/test_visual_regression/test_css_no_visual_regression/firefox-start.png b/...napshots/test_visual_regression/test_css_no_visual_regression/firefox-start.png
diff --git a/...s/test_visual_regression/test_css_no_visual_regression/firefox-terms_of_use.png b/...s/test_visual_regression/test_css_no_visual_regression/firefox-terms_of_use.png
diff --git a/...s/test_visual_regression/test_css_no_visual_regression/webkit-accessibility.png b/...s/test_visual_regression/test_css_no_visual_regression/webkit-accessibility.png
diff --git a/...napshots/test_visual_regression/test_css_no_visual_regression/webkit-browse.png b/...napshots/test_visual_regression/test_css_no_visual_regression/webkit-browse.png
diff --git a/...t_visual_regression/test_css_no_visual_regression/webkit-browse_consignment.png b/...t_visual_regression/test_css_no_visual_regression/webkit-browse_consignment.png
diff --git a/...s/test_visual_regression/test_css_no_visual_regression/webkit-browse_series.png b/...s/test_visual_regression/test_css_no_visual_regression/webkit-browse_series.png
diff --git a/...al_regression/test_css_no_visual_regression/webkit-browse_transferring_body.png b/...al_regression/test_css_no_visual_regression/webkit-browse_transferring_body.png
diff --git a/...apshots/test_visual_regression/test_css_no_visual_regression/webkit-cookies.png b/...apshots/test_visual_regression/test_css_no_visual_regression/webkit-cookies.png
diff --git a/...ual_regression/test_css_no_visual_regression/webkit-how_to_use_this_service.png b/...ual_regression/test_css_no_visual_regression/webkit-how_to_use_this_service.png
diff --git a/...apshots/test_visual_regression/test_css_no_visual_regression/webkit-privacy.png b/...apshots/test_visual_regression/test_css_no_visual_regression/webkit-privacy.png
diff --git a/...napshots/test_visual_regression/test_css_no_visual_regression/webkit-record.png b/...napshots/test_visual_regression/test_css_no_visual_regression/webkit-record.png
diff --git a/...sual_regression/test_css_no_visual_regression/webkit-search_results_summary.png b/...sual_regression/test_css_no_visual_regression/webkit-search_results_summary.png
diff --git a/...al_regression/test_css_no_visual_regression/webkit-search_transferring_body.png b/...al_regression/test_css_no_visual_regression/webkit-search_transferring_body.png
diff --git a/...hots/test_visual_regression/test_css_no_visual_regression/webkit-signed_out.png b/...hots/test_visual_regression/test_css_no_visual_regression/webkit-signed_out.png
diff --git a/...snapshots/test_visual_regression/test_css_no_visual_regression/webkit-start.png b/...snapshots/test_visual_regression/test_css_no_visual_regression/webkit-start.png
diff --git a/...ts/test_visual_regression/test_css_no_visual_regression/webkit-terms_of_use.png b/...ts/test_visual_regression/test_css_no_visual_regression/webkit-terms_of_use.png
diff --git a/...egression_mobile/accessibility_mobile.png → ..._mobile/chromium-accessibility_mobile.png b/...egression_mobile/accessibility_mobile.png → ..._mobile/chromium-accessibility_mobile.png
diff --git a/...sion_mobile/browse_consignment_mobile.png → ...le/chromium-browse_consignment_mobile.png b/...sion_mobile/browse_consignment_mobile.png → ...le/chromium-browse_consignment_mobile.png
diff --git a/...isual_regression_mobile/browse_mobile.png → ...ression_mobile/chromium-browse_mobile.png b/...isual_regression_mobile/browse_mobile.png → ...ression_mobile/chromium-browse_mobile.png
diff --git a/...egression_mobile/browse_series_mobile.png → ..._mobile/chromium-browse_series_mobile.png b/...egression_mobile/browse_series_mobile.png → ..._mobile/chromium-browse_series_mobile.png
diff --git a/...obile/browse_transferring_body_mobile.png → ...omium-browse_transferring_body_mobile.png b/...obile/browse_transferring_body_mobile.png → ...omium-browse_transferring_body_mobile.png
diff --git a/...sual_regression_mobile/cookies_mobile.png → ...ession_mobile/chromium-cookies_mobile.png b/...sual_regression_mobile/cookies_mobile.png → ...ession_mobile/chromium-cookies_mobile.png
diff --git a/...mobile/how_to_use_this_service_mobile.png → ...romium-how_to_use_this_service_mobile.png b/...mobile/how_to_use_this_service_mobile.png → ...romium-how_to_use_this_service_mobile.png
diff --git a/...sual_regression_mobile/privacy_mobile.png → ...ession_mobile/chromium-privacy_mobile.png b/...sual_regression_mobile/privacy_mobile.png → ...ession_mobile/chromium-privacy_mobile.png
diff --git a/...isual_regression_mobile/record_mobile.png → ...ression_mobile/chromium-record_mobile.png b/...isual_regression_mobile/record_mobile.png → ...ression_mobile/chromium-record_mobile.png
diff --git a/..._mobile/search_results_summary_mobile.png → ...hromium-search_results_summary_mobile.png b/..._mobile/search_results_summary_mobile.png → ...hromium-search_results_summary_mobile.png
diff --git a/...obile/search_transferring_body_mobile.png → ...omium-search_transferring_body_mobile.png b/...obile/search_transferring_body_mobile.png → ...omium-search_transferring_body_mobile.png
diff --git a/...l_regression_mobile/signed_out_mobile.png → ...ion_mobile/chromium-signed_out_mobile.png b/...l_regression_mobile/signed_out_mobile.png → ...ion_mobile/chromium-signed_out_mobile.png
diff --git a/...visual_regression_mobile/start_mobile.png → ...gression_mobile/chromium-start_mobile.png b/...visual_regression_mobile/start_mobile.png → ...gression_mobile/chromium-start_mobile.png
diff --git a/...regression_mobile/terms_of_use_mobile.png → ...n_mobile/chromium-terms_of_use_mobile.png b/...regression_mobile/terms_of_use_mobile.png → ...n_mobile/chromium-terms_of_use_mobile.png
diff --git a/...egression/test_css_no_visual_regression_mobile/firefox-accessibility_mobile.png b/...egression/test_css_no_visual_regression_mobile/firefox-accessibility_mobile.png
diff --git a/...sion/test_css_no_visual_regression_mobile/firefox-browse_consignment_mobile.png b/...sion/test_css_no_visual_regression_mobile/firefox-browse_consignment_mobile.png
diff --git a/...isual_regression/test_css_no_visual_regression_mobile/firefox-browse_mobile.png b/...isual_regression/test_css_no_visual_regression_mobile/firefox-browse_mobile.png
diff --git a/...egression/test_css_no_visual_regression_mobile/firefox-browse_series_mobile.png b/...egression/test_css_no_visual_regression_mobile/firefox-browse_series_mobile.png
diff --git a/...est_css_no_visual_regression_mobile/firefox-browse_transferring_body_mobile.png b/...est_css_no_visual_regression_mobile/firefox-browse_transferring_body_mobile.png
diff --git a/...sual_regression/test_css_no_visual_regression_mobile/firefox-cookies_mobile.png b/...sual_regression/test_css_no_visual_regression_mobile/firefox-cookies_mobile.png
diff --git a/...test_css_no_visual_regression_mobile/firefox-how_to_use_this_service_mobile.png b/...test_css_no_visual_regression_mobile/firefox-how_to_use_this_service_mobile.png
diff --git a/...sual_regression/test_css_no_visual_regression_mobile/firefox-privacy_mobile.png b/...sual_regression/test_css_no_visual_regression_mobile/firefox-privacy_mobile.png
diff --git a/...isual_regression/test_css_no_visual_regression_mobile/firefox-record_mobile.png b/...isual_regression/test_css_no_visual_regression_mobile/firefox-record_mobile.png
diff --git a/.../test_css_no_visual_regression_mobile/firefox-search_results_summary_mobile.png b/.../test_css_no_visual_regression_mobile/firefox-search_results_summary_mobile.png
diff --git a/...est_css_no_visual_regression_mobile/firefox-search_transferring_body_mobile.png b/...est_css_no_visual_regression_mobile/firefox-search_transferring_body_mobile.png
diff --git a/...l_regression/test_css_no_visual_regression_mobile/firefox-signed_out_mobile.png b/...l_regression/test_css_no_visual_regression_mobile/firefox-signed_out_mobile.png
diff --git a/...visual_regression/test_css_no_visual_regression_mobile/firefox-start_mobile.png b/...visual_regression/test_css_no_visual_regression_mobile/firefox-start_mobile.png
diff --git a/...regression/test_css_no_visual_regression_mobile/firefox-terms_of_use_mobile.png b/...regression/test_css_no_visual_regression_mobile/firefox-terms_of_use_mobile.png
diff --git a/...regression/test_css_no_visual_regression_mobile/webkit-accessibility_mobile.png b/...regression/test_css_no_visual_regression_mobile/webkit-accessibility_mobile.png
diff --git a/...ssion/test_css_no_visual_regression_mobile/webkit-browse_consignment_mobile.png b/...ssion/test_css_no_visual_regression_mobile/webkit-browse_consignment_mobile.png
diff --git a/...visual_regression/test_css_no_visual_regression_mobile/webkit-browse_mobile.png b/...visual_regression/test_css_no_visual_regression_mobile/webkit-browse_mobile.png
diff --git a/...regression/test_css_no_visual_regression_mobile/webkit-browse_series_mobile.png b/...regression/test_css_no_visual_regression_mobile/webkit-browse_series_mobile.png
diff --git a/...test_css_no_visual_regression_mobile/webkit-browse_transferring_body_mobile.png b/...test_css_no_visual_regression_mobile/webkit-browse_transferring_body_mobile.png
diff --git a/...isual_regression/test_css_no_visual_regression_mobile/webkit-cookies_mobile.png b/...isual_regression/test_css_no_visual_regression_mobile/webkit-cookies_mobile.png
diff --git a/.../test_css_no_visual_regression_mobile/webkit-how_to_use_this_service_mobile.png b/.../test_css_no_visual_regression_mobile/webkit-how_to_use_this_service_mobile.png
diff --git a/...isual_regression/test_css_no_visual_regression_mobile/webkit-privacy_mobile.png b/...isual_regression/test_css_no_visual_regression_mobile/webkit-privacy_mobile.png
diff --git a/...visual_regression/test_css_no_visual_regression_mobile/webkit-record_mobile.png b/...visual_regression/test_css_no_visual_regression_mobile/webkit-record_mobile.png
diff --git a/...n/test_css_no_visual_regression_mobile/webkit-search_results_summary_mobile.png b/...n/test_css_no_visual_regression_mobile/webkit-search_results_summary_mobile.png
diff --git a/...test_css_no_visual_regression_mobile/webkit-search_transferring_body_mobile.png b/...test_css_no_visual_regression_mobile/webkit-search_transferring_body_mobile.png
diff --git a/...al_regression/test_css_no_visual_regression_mobile/webkit-signed_out_mobile.png b/...al_regression/test_css_no_visual_regression_mobile/webkit-signed_out_mobile.png
diff --git a/..._visual_regression/test_css_no_visual_regression_mobile/webkit-start_mobile.png b/..._visual_regression/test_css_no_visual_regression_mobile/webkit-start_mobile.png
diff --git a/..._regression/test_css_no_visual_regression_mobile/webkit-terms_of_use_mobile.png b/..._regression/test_css_no_visual_regression_mobile/webkit-terms_of_use_mobile.png
diff --git a/e2e_tests/test_browse.py b/e2e_tests/test_browse.py
@@ -193,6 +193,8 @@ def test_browse_date_filter_validation_date_from(self, aau_user_page: Page):
         aau_user_page.locator("#date_from_year").fill("2024")
         aau_user_page.get_by_role("button", name="Apply filters").click()
 
+        aau_user_page.wait_for_selector(".govuk-error-message")
+
         assert aau_user_page.get_by_text(
             "‘Date from’ must be in the past"
         ).is_visible()
@@ -204,6 +206,8 @@ def test_browse_date_filter_validation_to_date(self, aau_user_page: Page):
         aau_user_page.locator("#date_to_year").fill("2024")
         aau_user_page.get_by_role("button", name="Apply filters").click()
 
+        aau_user_page.wait_for_selector(".govuk-error-message")
+
         assert aau_user_page.get_by_text(
             "‘Date to’ must be in the past"
         ).is_visible()
@@ -220,6 +224,8 @@ def test_browse_date_filter_validation_date_from_and_to_date(
         aau_user_page.locator("#date_to_year").fill("2022")
         aau_user_page.get_by_role("button", name="Apply filters").click()
 
+        aau_user_page.wait_for_selector(".govuk-error-message")
+
         assert aau_user_page.get_by_text(
             "‘Date from’ must be the same as or before ‘31/12/2022’"
         ).is_visible()

diff --git a/e2e_tests/test_browse_consignment.py b/e2e_tests/test_browse_consignment.py
@@ -73,11 +73,11 @@ def test_browse_consignment_no_pagination(self, standard_user_page: Page):
 
         standard_user_page.get_by_role("button", name="Apply filters").click()
 
+        next_button = standard_user_page.locator(".govuk-pagination__next a")
+
         assert not standard_user_page.get_by_label("Page 1").is_visible()
         assert not standard_user_page.get_by_label("Page 2").is_visible()
-        assert not standard_user_page.get_by_role(
-            "link", name="Nextpage"
-        ).is_visible()
+        assert not next_button.is_visible()
 
     def test_browse_consignment_has_pagination_with_next_page(
         self, standard_user_page: Page
@@ -86,28 +86,32 @@ def test_browse_consignment_has_pagination_with_next_page(
 
         standard_user_page.get_by_role("button", name="Apply filters").click()
 
+        standard_user_page.wait_for_selector(".govuk-pagination")
+        next_button = standard_user_page.locator(".govuk-pagination__next a")
+        assert next_button.is_visible()
         assert standard_user_page.get_by_label("Page 1").is_visible()
         assert standard_user_page.get_by_label("Page 2").is_visible()
-        assert standard_user_page.get_by_role(
-            "link", name="Nextpage"
-        ).is_visible()
 
     def test_browse_consignment_has_pagination_with_previous_and_next_page(
         self, standard_user_page: Page
     ):
         standard_user_page.goto(f"{self.route_url}/{self.consignment_id}")
 
-        standard_user_page.get_by_role("link", name="Nextpage").click()
+        standard_user_page.wait_for_selector(".govuk-pagination")
 
-        assert standard_user_page.get_by_role(
-            "link", name="Previouspage"
-        ).is_visible()
+        previous_button = standard_user_page.locator(
+            ".govuk-pagination__prev a"
+        )
+        next_button = standard_user_page.locator(".govuk-pagination__next a")
+        next_button.click()
+
+        standard_user_page.wait_for_selector(".govuk-pagination")
+
+        assert previous_button.is_visible()
+        assert next_button.is_visible()
         assert standard_user_page.get_by_label("Page 1").is_visible()
         assert standard_user_page.get_by_label("Page 2").is_visible()
         assert standard_user_page.get_by_label("Page 3").is_visible()
-        assert standard_user_page.get_by_role(
-            "link", name="Nextpage"
-        ).is_visible()
 
     def test_browse_consignment_filter_functionality_with_query_string_parameters(
         self, standard_user_page: Page
@@ -262,6 +266,8 @@ def test_browse_consignment_date_validation_with_empty_date_fields_and_date_filt
             "button", name="Apply", exact=True
         ).click()
 
+        standard_user_page.wait_for_selector(".govuk-error-message")
+
         assert standard_user_page.get_by_text(
             "Please enter value(s) in ‘Date from’ or ‘Date to’ field"
         ).is_visible()
@@ -277,6 +283,8 @@ def test_browse_consignment_date_validation_with_date_fields_and_no_date_filter_
             "button", name="Apply", exact=True
         ).click()
 
+        standard_user_page.wait_for_selector(".govuk-error-message")
+
         assert standard_user_page.get_by_text(
             "Select either ‘Date of record’ or ‘Record opening date’"
         ).is_visible()
@@ -293,6 +301,8 @@ def test_browse_consignment_date_filter_validation_date_from(
         standard_user_page.locator("#date_from_year").fill("2024")
         standard_user_page.get_by_role("button", name="Apply filters").click()
 
+        standard_user_page.wait_for_selector(".govuk-error-message")
+
         assert standard_user_page.get_by_text(
             "‘Date from’ must be in the past"
         ).is_visible()
@@ -309,6 +319,8 @@ def test_browse_consignment_date_filter_validation_to_date(
         standard_user_page.locator("#date_to_year").fill("2024")
         standard_user_page.get_by_role("button", name="Apply filters").click()
 
+        standard_user_page.wait_for_selector(".govuk-error-message")
+
         assert standard_user_page.get_by_text(
             "‘Date to’ must be in the past"
         ).is_visible()
@@ -328,6 +340,8 @@ def test_browse_consignment_date_filter_validation_date_from_and_to_date(
         standard_user_page.locator("#date_to_year").fill("2022")
         standard_user_page.get_by_role("button", name="Apply filters").click()
 
+        standard_user_page.wait_for_selector(".govuk-error-message")
+
         assert standard_user_page.get_by_text(
             "‘Date from’ must be the same as or before ‘31/12/2022’"
         ).is_visible()

diff --git a/e2e_tests/test_browse_series.py b/e2e_tests/test_browse_series.py
@@ -103,6 +103,8 @@ def test_browse_series_sort_functionality_by_records_held_in_consignment_descend
             "button", name="Apply", exact=True
         ).click()
 
+        standard_user_page.wait_for_selector("#tbl_result")
+
         header_rows = standard_user_page.locator(
             "#tbl_result tr:visible"
         ).evaluate_all(
@@ -138,6 +140,8 @@ def test_browse_series_filter_functionality_with_date_filter(
         standard_user_page.locator("#date_from_year").fill("2024")
         standard_user_page.get_by_role("button", name="Apply filters").click()
 
+        standard_user_page.wait_for_selector("#tbl_result")
+
         header_rows = standard_user_page.locator(
             "#tbl_result tr:visible"
         ).evaluate_all(
@@ -169,6 +173,8 @@ def test_browse_series_date_filter_validation_date_from(
         standard_user_page.locator("#date_from_year").fill("2024")
         standard_user_page.get_by_role("button", name="Apply filters").click()
 
+        standard_user_page.wait_for_selector(".govuk-error-message")
+
         assert standard_user_page.get_by_text(
             "‘Date from’ must be in the past"
         ).is_visible()
@@ -182,6 +188,8 @@ def test_browse_series_date_filter_validation_to_date(
         standard_user_page.locator("#date_to_year").fill("2024")
         standard_user_page.get_by_role("button", name="Apply filters").click()
 
+        standard_user_page.wait_for_selector(".govuk-error-message")
+
         assert standard_user_page.get_by_text(
             "‘Date to’ must be in the past"
         ).is_visible()
@@ -198,6 +206,8 @@ def test_browse_series_date_filter_validation_date_from_and_to_date(
         standard_user_page.locator("#date_to_year").fill("2022")
         standard_user_page.get_by_role("button", name="Apply filters").click()
 
+        standard_user_page.wait_for_selector(".govuk-error-message")
+
         assert standard_user_page.get_by_text(
             "‘Date from’ must be the same as or before ‘31/12/2022’"
         ).is_visible()

diff --git a/e2e_tests/test_browse_transferring_body.py b/e2e_tests/test_browse_transferring_body.py
@@ -71,11 +71,11 @@ def test_browse_transferring_body_no_pagination(
 
         standard_user_page.get_by_role("button", name="Apply filters").click()
 
+        next_button = standard_user_page.locator(".govuk-pagination__next a")
+
         assert not standard_user_page.get_by_label("Page 1").is_visible()
         assert not standard_user_page.get_by_label("Page 2").is_visible()
-        assert not standard_user_page.get_by_role(
-            "link", name="Nextpage"
-        ).is_visible()
+        assert not next_button.is_visible()
 
     def test_browse_transferring_body_filter_functionality_with_query_string_parameters(
         self, standard_user_page: Page
@@ -127,6 +127,8 @@ def test_browse_transferring_body_sort_functionality_by_series_descending(
             "button", name="Apply", exact=True
         ).click()
 
+        standard_user_page.wait_for_selector("#tbl_result")
+
         header_rows = standard_user_page.locator(
             "#tbl_result tr:visible"
         ).evaluate_all(
@@ -162,6 +164,8 @@ def test_browse_transferring_body_filter_functionality_with_series_filter(
             "button", name="Apply", exact=True
         ).click()
 
+        standard_user_page.wait_for_selector("#tbl_result")
+
         header_rows = standard_user_page.locator(
             "#tbl_result tr:visible"
         ).evaluate_all(
@@ -194,6 +198,8 @@ def test_browse_transferring_body_filter_functionality_with_series_filter_wildca
         standard_user_page.locator("#series_filter").fill("1")
         standard_user_page.get_by_role("button", name="Apply filters").click()
 
+        standard_user_page.wait_for_selector("#tbl_result")
+
         header_rows = standard_user_page.locator(
             "#tbl_result tr:visible"
         ).evaluate_all(
@@ -228,6 +234,8 @@ def test_browse_transferring_body_filter_functionality_with_date_filter(
         standard_user_page.locator("#date_from_year").fill("2024")
         standard_user_page.get_by_role("button", name="Apply filters").click()
 
+        standard_user_page.wait_for_selector("#tbl_result")
+
         header_rows = standard_user_page.locator(
             "#tbl_result tr:visible"
         ).evaluate_all(
@@ -262,6 +270,8 @@ def test_browse_transferring_body_date_filter_validation_date_from(
         standard_user_page.locator("#date_from_year").fill("2024")
         standard_user_page.get_by_role("button", name="Apply filters").click()
 
+        standard_user_page.wait_for_selector(".govuk-error-message")
+
         assert standard_user_page.get_by_text(
             "‘Date from’ must be in the past"
         ).is_visible()
@@ -275,6 +285,8 @@ def test_browse_transferring_body_date_filter_validation_to_date(
         standard_user_page.locator("#date_to_year").fill("2024")
         standard_user_page.get_by_role("button", name="Apply filters").click()
 
+        standard_user_page.wait_for_selector(".govuk-error-message")
+
         assert standard_user_page.get_by_text(
             "‘Date to’ must be in the past"
         ).is_visible()
@@ -291,6 +303,8 @@ def test_browse_transferring_body_date_filter_validation_date_from_and_to_date(
         standard_user_page.locator("#date_to_year").fill("2022")
         standard_user_page.get_by_role("button", name="Apply filters").click()
 
+        standard_user_page.wait_for_selector(".govuk-error-message")
+
         assert standard_user_page.get_by_text(
             "‘Date from’ must be the same as or before ‘31/12/2022’"
         ).is_visible()