Merge branch 'main' into aea-4535-rbac-banner

Author: wildjames

features/cpts_ui/select_your_role.feature

@@ -77,3 +77,10 @@ Feature: Role selection page renders roles properly when logged in
         When I click on the summary expander
         Then I can see the summary container
         And I cannot see the summary table body
+
+
+    @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4645
+    Scenario: User with a pre selected role sees their pre selected role
+        Given I am logged in as a user with a pre selected role
+        And I go to the select your role page
+        Then I can see the role that has been pre selected

features/environment.py

@@ -57,6 +57,7 @@
 MOCK_CIS2_LOGIN_ID_NO_ACCESS_ROLE = "555083343101"
 MOCK_CIS2_LOGIN_ID_SINGLE_ACCESS_ROLE = "555043300081"
 MOCK_CIS2_LOGIN_ID_NO_ROLES = "555073103101"
+MOCK_CIS2_LOGIN_ID_MULTIPLE_ACCESS_ROLES_WITH_SELECTED_ROLE = "555043304334"
 
 REPOS = {
     "CPTS-UI": "https://github.com/NHSDigital/eps-prescription-tracker-ui",

features/steps/cpts_ui/common_steps.py

@@ -6,6 +6,7 @@
     MOCK_CIS2_LOGIN_ID_MULTIPLE_ACCESS_ROLES,
     MOCK_CIS2_LOGIN_ID_NO_ACCESS_ROLE,
     MOCK_CIS2_LOGIN_ID_SINGLE_ACCESS_ROLE,
+    MOCK_CIS2_LOGIN_ID_MULTIPLE_ACCESS_ROLES_WITH_SELECTED_ROLE,
 )
 
 select_your_role_url_pattern = re.compile(r".*/selectyourrole(?:/|\.html)$")
@@ -65,6 +66,17 @@ def login_single_role(context):
     context.page.wait_for_url(select_your_role_url_pattern)
 
 
+@given("I am logged in as a user with a pre selected role")
+def login_pre_role_selected(context):
+    context.execute_steps("given I am on the login page")
+    context.page.get_by_role("button", name="Log in with mock CIS2").click()
+    context.page.get_by_label("Username").fill(
+        MOCK_CIS2_LOGIN_ID_MULTIPLE_ACCESS_ROLES_WITH_SELECTED_ROLE
+    )
+    context.page.get_by_role("button", name="Sign In").click()
+    context.page.wait_for_url(select_your_role_url_pattern)
+
+
 ###############################################################################
 # WHEN
 ###############################################################################

features/steps/cpts_ui/select_your_role_steps.py

@@ -102,3 +102,12 @@ def i_can_see_the_no_access_table_body_data(context):
     select_your_role_page = SelectYourRole(context.page)
     expect(select_your_role_page.first_row_org_name_no_access).to_be_visible()
     expect(select_your_role_page.first_row_role_name_no_access).to_be_visible()
+
+
+@then("I can see the role that has been pre selected")
+def i_see_logged_in_message(context):
+    select_your_role_page = SelectYourRole(context.page)
+    pre_selected_element = select_your_role_page.page.get_by_test_id(
+        "eps_select_your_role_pre_role_selected"
+    )
+    expect(pre_selected_element).to_be_visible()

pages/select_your_role.py

@@ -46,15 +46,3 @@ def __init__(self, page: Page):
         self.first_row_role_name_no_access = page.get_by_role(
             "cell", name="General Medical Practitioner"
         ).first
-
-        self.no_access_header = page.locator(".nhsuk-heading-xl")
-        self.no_access_message = page.get_by_text("None of the roles on your")
-        self.roles_without_access_header = page.get_by_role(
-            "heading", name="Your roles without access"
-        )
-        self.first_row_org_name_no_access = page.get_by_role(
-            "cell", name="NO ORG NAME (ODS: A21464)"
-        ).first
-        self.first_row_role_name_no_access = page.get_by_role(
-            "cell", name="General Medical Practitioner"
-        ).first