Merge branch 'main' into feature/BCSS-20605-regression-tests-subject-notes

Author: mepr1

pages/organisations/organisations_page.py

@@ -1,6 +1,6 @@
 from playwright.sync_api import Page
 from pages.base_page import BasePage
-
+from typing import List
 
 class OrganisationsPage(BasePage):
     """Organisations Page locators, and methods for interacting with the page."""
@@ -50,3 +50,76 @@ def go_to_upload_nacs_data_bureau_page(self) -> None:
     def go_to_bureau_page(self) -> None:
         """Clicks the 'Bureau' link."""
         self.click(self.bureau_page)
+
+class OrganisationSwitchPage:
+    """Page Object Model for interacting with the Organisation Switch page."""
+
+    def __init__(self, page: Page):
+        """
+        Initializes the OrganisationSwitchPage with locators for key elements.
+
+        Args:
+            page (Page): The Playwright Page object representing the browser page.
+        """
+        self.page = page
+        self.radio_buttons = self.page.locator("input[type='radio']")
+        self.selected_radio = self.page.locator("input[name='organisation']:checked")
+        self.continue_button = self.page.get_by_role("button", name="Continue")
+        self.select_org_link = self.page.get_by_role("link", name="Select Org")
+        self.login_info = self.page.locator("td.loginInfo")
+
+    def click(self, locator) -> None:
+        """
+        Clicks the given locator element.
+
+        Args:
+            locator: A Playwright Locator object to be clicked.
+        """
+        locator.click()
+
+    def get_available_organisation_ids(self) -> List[str]:
+        """
+        Retrieves the list of available organisation IDs from the radio button on the page.
+
+        Returns:
+            List[str]: A list of organisation ID strings.
+        """
+        org_ids = []
+        count = self.radio_buttons.count()
+        for element in range(count):
+            org_id = self.radio_buttons.nth(element).get_attribute("id")
+            if org_id:
+                org_ids.append(org_id)
+        return org_ids
+
+    def select_organisation_by_id(self, org_id: str) -> None:
+        """
+        Selects an organisation radio button by its ID.
+
+        Args:
+            org_id (str): The ID of the organisation to select.
+        """
+        self.click(self.page.locator(f"#{org_id}"))
+
+    def click_continue(self) -> None:
+        """
+        Clicks the 'Continue' button on the page.
+        """
+        self.click(self.continue_button)
+
+    def click_select_org_link(self) -> None:
+        """
+        Clicks the 'Select Org' link to return to the organisation selection page.
+        """
+        self.click(self.select_org_link)
+
+    def get_logged_in_text(self) -> str:
+        """
+        Retrieves the logged-in user information from the login info section.
+
+        Returns:
+            str: The text indicating the logged-in user's role or name.
+        """
+        return self.login_info.inner_text()
+
+

tests/regression/organisation_regression_tests_user/test_change_organisation_regression_user.py

@@ -0,0 +1,41 @@
+import pytest
+import logging
+from utils.user_tools import UserTools
+from playwright.sync_api import Page
+from pages.organisations.organisations_page import OrganisationSwitchPage
+
+
+@pytest.mark.regression
+def test_user_can_switch_between_organisations(page: Page) -> None:
+    """
+    Feature: Change Organisation
+    Scenario: Check that an English user with multiple organisations is able to switch between them
+    Given I log in to BCSS "England" as user role "MultiOrgUser"
+    When I change organisation
+    Then I will be logged in as the alternative organisation.
+    """
+
+    # Log in as a user with multiple organisations
+    UserTools.user_login(page, "Specialist Screening Practitioner at BCS009 & BCS001")
+    org_switch_page = OrganisationSwitchPage(page)
+
+    # Get the list of available organisation IDs
+    org_ids = org_switch_page.get_available_organisation_ids()
+
+    # 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)
+
+        # Click continue
+        org_switch_page.click_continue()
+
+        # 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}"
+
+        # Return to selection screen
+        org_switch_page.click_select_org_link()

tests/regression/subject_search_criteria/test_screening_subject_search_criteria_page_regression.py

@@ -9,7 +9,6 @@
 )
 
 @pytest.mark.regression
-@pytest.mark.subject_search
 def test_user_can_search_for_subject_and_results_are_returned(page: Page):
     """
     Verify that User can log in to BCSS "England" as user role "Hub Manager - State Registered"

users.json

@@ -42,5 +42,12 @@
     "roles": [
       "Hub Manager, Southern Bowel Cancer Screening Programme Hub"
     ]
+  },
+  "Specialist Screening Practitioner at BCS009 & BCS001": {
+    "username": "BCSS120",
+    "roles": [
+      "Coventry and Warwickshire Bowel Cancer Screening Centre, MultiOrgUser",
+      "Wolverhampton Bowel Cancer Screening Centre, MultiOrgUser"
+    ]
   }
 }