Seperated some of the OrganisationSwitchPage class methods to allow assertions to be made on the test script after each iteration.

Added assertions to the test script.

# Conflicts:
#	pages/organisations/organisations_page.py
#	tests/regression/organisation_regression_tests_user/test_change_organisation_regression_user.py

Author: Andyg79

pages/organisations/organisations_page.py

@@ -1,7 +1,6 @@
 from playwright.sync_api import Page
-from playwright.sync_api import sync_playwright
 from pages.base_page import BasePage
-from typing import List
+
 
 class OrganisationsPage(BasePage):
     """Organisations Page locators, and methods for interacting with the page."""
@@ -52,65 +51,34 @@ def go_to_bureau_page(self) -> None:
         """Clicks the 'Bureau' link."""
         self.click(self.bureau_page)
 
-class NoOrganisationAvailableError(Exception):
-    pass
-
-class OrganisationNotSelectedError(Exception):
-    pass
-
-class ContinueButtonNotFoundError(Exception):
-    pass
-
 
 class OrganisationSwitchPage:
     def __init__(self, page: Page):
         self.page = page
         self.radio_selector = "input[name='organisation']"
         self.select_org_link = "a:has-text('Select Organisation')"
 
-    def get_available_organisation_ids(self) -> List[str]:
-        self.page.wait_for_selector(self.radio_selector, timeout=10000)
-        radios = self.page.locator(self.radio_selector)
-        org_ids = [
-            org_id for i in range(radios.count())
-            if (org_id := radios.nth(i).get_attribute("id")) is not None
-        ]
-        if len(org_ids) < 2:
-            raise NoOrganisationAvailableError("Fewer than two organisations available.")
+    RADIO_SELECTOR = "input[type='radio']"
+    SELECT_ORG_LINK_TEXT = "Select Org"
+    LOGIN_INFO_SELECTOR = "td.loginInfo"
+
+    def get_available_organisation_ids(self) -> list[str]:
+        radios = self.page.locator(self.RADIO_SELECTOR)
+        org_ids = []
+        for i in range(radios.count()):
+            org_id = radios.nth(i).get_attribute("id")
+            if org_id:
+                org_ids.append(org_id)
         return org_ids
 
     def select_organisation_by_id(self, org_id: str) -> None:
-        radio = self.page.locator(f"{self.radio_selector}#{org_id}")
-        radio.wait_for(state="visible", timeout=5000)
-        radio.check(force=True)
-
-    def select_first_available_organisation(self) -> None:
-        for selector in ['#BCS009', '#BCS001']:
-            radio = self.page.locator(selector)
-            if radio.is_enabled():
-                radio.check()
-                return
-        raise OrganisationNotSelectedError("No available organisation radio buttons to select.")
-
-    def get_selected_organisation_id(self) -> str:
-        selected = self.page.locator(f"{self.radio_selector}:checked")
-        try:
-            selected.wait_for(state="attached", timeout=5000)
-        except Exception:
-            raise OrganisationNotSelectedError("No organisation is currently selected.")
-        org_id = selected.get_attribute("id")
-        if not org_id:
-            raise OrganisationNotSelectedError("No organisation is currently selected.")
-        return org_id
-
-    def click_continue_button(self) -> None:
-        try:
-            self.page.get_by_role("button", name="Continue").click()
-            self.page.wait_for_load_state("networkidle")
-        except Exception:
-            raise ContinueButtonNotFoundError("Could not find or click the 'Continue' button.")
-
-    def return_to_change_org_page(self) -> None:
-        self.page.get_by_role("link", name="Select Org").click()
-        self.page.wait_for_url("**/changeorg**", timeout=10000)
-        self.page.wait_for_selector(self.radio_selector, timeout=10000)
+        self.page.locator(f"#{org_id}").check()
+
+    def click_continue(self) -> None:
+        self.page.get_by_role("button", name="Continue").click()
+
+    def click_select_org_link(self) -> None:
+        self.page.get_by_role("link", name=self.SELECT_ORG_LINK_TEXT).click()
+
+    def get_logged_in_text(self) -> str:
+        return self.page.locator(self.LOGIN_INFO_SELECTOR).inner_text()

tests/regression/organisation_regression_tests_user/test_change_organisation_regression_user.py

@@ -1,49 +1,38 @@
 import pytest
-from playwright.sync_api import Page
+import logging
 from utils.user_tools import UserTools
-from pages.organisations.organisations_page import (
-    OrganisationSwitchPage,
-    NoOrganisationAvailableError,
-    OrganisationNotSelectedError,
-    ContinueButtonNotFoundError,
-)
+from playwright.sync_api import Page
+from pages.organisations.organisations_page import OrganisationSwitchPage
 
 @pytest.mark.regression
 @pytest.mark.organisation_switch
-def test_user_can_switch_between_two_organisations_using_continue_button(page: Page):
+def test_user_can_switch_between_organisations(page: Page) -> None:
     """
     Scenario:
     User switches from Org 1 → Continue → Home → 'Select Organisation' → Org 2 → Continue → Home → Return.
     Verifies switch success using aria role-based 'Continue' button logic.
     """
+    # Log in as a user with multiple organisations
     UserTools.user_login(page, "Specialist Screening Practitioner at BCS009")
-    org_page = OrganisationSwitchPage(page)
+    org_switch_page = OrganisationSwitchPage(page)
 
-    try:
-        org_ids = org_page.get_available_organisation_ids()
-        org1, org2 = org_ids[:2]
+    # Get the list of available organisation IDs
+    org_ids = org_switch_page.get_available_organisation_ids()
 
-        # Select Org 1 → Continue → Home
-        org_page.select_organisation_by_id(org1)
-        org_page.click_continue_button()
-        selected_1 = org_page.get_selected_organisation_id()
-        assert selected_1 == org1, f"Expected org '{org1}', got '{selected_1}'"
+    # Select available organisations in turn and verify the switch
+    for org_id in org_ids:
+        # Select the organisation
+        org_switch_page.select_organisation_by_id(org_id)
 
-        # Return to Change Org screen
-        org_page.return_to_change_org_page()
+        # Click continue
+        org_switch_page.click_continue()
 
-        # Select Org 2 → Continue → Home
-        org_page.select_organisation_by_id(org2)
-        org_page.click_continue_button()
-        selected_2 = org_page.get_selected_organisation_id()
-        assert selected_2 == org2, f"Expected org '{org2}', got '{selected_2}'"
-        assert selected_1 != selected_2, "Organisation switch did not occur."
+        # Assert logged-in org matches expected
+        login_text = org_switch_page.get_logged_in_text()
+        logging.info(f"The user's current organisation is: {login_text}")
+        assert (
+            org_id in login_text
+        ), f"Expected to be logged in as '{org_id}', but got: {login_text}"
 
-    except NoOrganisationAvailableError:
-        pytest.skip("Skipping test — fewer than two organisations available.")
-    except (ContinueButtonNotFoundError, OrganisationNotSelectedError) as e:
-        page.screenshot(path="org_switch_failure.png")
-        pytest.fail(f"Test failed: {e}")
-    except Exception as e:
-        page.screenshot(path="unexpected_error.png")
-        pytest.fail(f"Unexpected error: {e}")
+        # Return to selection screen
+        org_switch_page.click_select_org_link()