As per PR # 98 review comments, code change is implemented.

Author: vidhya-chandra1

pages/organisations/organisations_page.py

@@ -53,7 +53,7 @@ def go_to_bureau_page(self) -> None:
 
 
 class OrganisationSwitchPage:
-    """Organisation Switch Page locators and methods for interacting with the page."""
+    """Organisation Switch Page locators and methods for interacting with the page"""
 
     def __init__(self, page: Page):
         self.page = page
@@ -67,8 +67,8 @@ def __init__(self, page: Page):
     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")
+        for int in range(radios.count()):
+            org_id = radios.nth(int).get_attribute("id")
             if org_id:
                 org_ids.append(org_id)
         return org_ids

tests/regression/organisation_regression_tests_user/test_change_organisation_regression_user.py

@@ -6,7 +6,6 @@
 
 
 @pytest.mark.regression
-@pytest.mark.organisation_switch
 def test_user_can_switch_between_organisations(page: Page) -> None:
     """
     Feature: Change Organisation
@@ -17,7 +16,7 @@ def test_user_can_switch_between_organisations(page: Page) -> None:
       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")
+    UserTools.user_login(page, "Specialist Screening Practitioner at BCS009 & BCS001")
     org_switch_page = OrganisationSwitchPage(page)
 
     # Get the list of available organisation IDs

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

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