Merge branch 'main' of https://github.com/NHSDigital/eps-prescription-tracker-ui into AEA-4655-user-has-no-access-to-cpts

Author: kris-szlapa

.github/workflows/regression_tests.yml

@@ -69,7 +69,7 @@ jobs:
         uses: asdf-vm/actions/setup@05e0d2ed97b598bfce82fd30daf324ae0c4570e6
 
       - name: Cache asdf
-        uses: actions/cache@a2ed59d39b352305bdd2f628719a53b2cc4f9613
+        uses: actions/cache@v4
         with:
           path: |
             ~/.asdf
@@ -83,7 +83,7 @@ jobs:
           PYTHON_CONFIGURE_OPTS: --enable-shared
 
       - name: Cache Virtualenv
-        uses: actions/cache@a2ed59d39b352305bdd2f628719a53b2cc4f9613
+        uses: actions/cache@v4
         id: cache-venv
         with:
           path: .venv
@@ -163,7 +163,7 @@ jobs:
           repositories: "electronic-prescription-service-api-regression-tests,eps-test-reports"
 
       - name: Report failure on test failure
-        if: steps.tests.outcome != 'success' || ( steps.sha1_tests.outcome != 'success' && steps.sha1_tests.outcome != 'skipped' ) 
+        if: steps.tests.outcome != 'success' || ( steps.sha1_tests.outcome != 'success' && steps.sha1_tests.outcome != 'skipped' )
         run: |
           poetry run python scripts/send_test_results.py --token=${{ steps.generate-token.outputs.token }} --run_id ${{GITHUB.RUN_ID}}
           echo The regression tests step failed, this likely means there are test failures.

features/cpts_ui/search_for_a_prescription.feature

@@ -1,7 +1,12 @@
-@cpts_ui @home @regression @blocker @smoke @ui
+@cpts_ui @search_for_a_prescription @regression @blocker @smoke @ui
 @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4460
 Feature: I can visit the Clinical Prescription Tracker Service Website
 
+  @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4656
+  Scenario: User is redirected to the Search For A Prescription Page
+      Given I am logged in with a single access role
+      Then I am on the search for a prescription page
+
   @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4516
   Scenario: User can view the Search For A Prescription Page
     Given I am on the homepage

features/cpts_ui/select_your_role.feature

@@ -5,20 +5,24 @@ Feature: Role selection page renders roles properly when logged in
     @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4653
     Scenario: User can navigate to the select your role page
         Given I am logged in
-        And I am on the select your role page
+        Then I am on the select your role page
+
+    @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4656
+    Scenario: User is redirected to the select your role page
+        Given I am logged in
         Then I am on the select your role page
 
     @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4653
     Scenario: User can see the summary container, but not the table contents by default
         Given I am logged in
-        And I am on the select your role page
+        Then I am on the select your role page
         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-4653
     Scenario: User can expand the summary table to see the contents. Clicking again hides it
         Given I am logged in
-        And I am on the select your role page
+        Then I am on the select your role page
         When I click on the summary expander
         Then I can see the summary table body
         And I can see the table body has a header row
@@ -30,40 +34,40 @@ Feature: Role selection page renders roles properly when logged in
     @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4651
     Scenario: User can see roles with access cards
         Given I am logged in
-        And I am on the select your role page
+        Then I am on the select your role page
         Then I can see the roles with access cards
 
     @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4651
     Scenario: User can navigate to the your_selected_role page
         Given I am logged in
-        And I am on the select your role page
+        Then I am on the select your role page
         Then I can navigate to the your selected role page by clicking a card
 
     @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4655
     Scenario: User without access can see the header on the select your role page
         Given I am logged in without access
-        And I am on the select your role page
+        Then I am on the select your role page
         Then I cannot see the your selected role subheader
         And I can see the no access header
 
     @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4655
     Scenario: User without access can see the message on the select your role page
         Given I am logged in without access
-        And I am on the select your role page
+        Then I am on the select your role page
         Then I cannot see the your selected role subheader
         And I can see the no access message
 
     @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4655
     Scenario: User without access can see the summary container, but not the table contents by default
         Given I am logged in without access
-        And I am on the select your role page
+        Then I am on the select your role page
         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-4655
     Scenario: User without access can expand the summary table to see the contents. Clicking again hides it
         Given I am logged in without access
-        And I am on the select your role page
+        Then I am on the select your role page
         When I click on the summary expander
         Then I can see the summary table body
         And I can see the table body has a header row

features/environment.py

@@ -50,8 +50,10 @@
     "dispenser": {"user_id": "555260695103", "role_id": "555265434108"},
 }
 LOGIN_USERS = {"user_id": "9449304130"}
-MOCK_CIS2_LOGIN_ID_1 = "555073103100"
-MOCK_CIS2_LOGIN_ID_2 = "555083343101"
+MOCK_CIS2_LOGIN_ID_MULTIPLE_ACCESS_ROLES = "555073103100"
+MOCK_CIS2_LOGIN_ID_NO_ACCESS_ROLE = "555083343101"
+MOCK_CIS2_LOGIN_ID_SINGLE_ACCESS_ROLE = "555043300081"
+MOCK_CIS2_LOGIN_ID_NO_ROLES = "555073103101"
 
 REPOS = {
     "CPTS-UI": "https://github.com/NHSDigital/eps-prescription-tracker-ui",

features/steps/cpts_ui/search_for_a_prescription_steps.py

@@ -4,6 +4,16 @@
 
 from pages.home import Home
 from pages.search_for_a_prescription import SearchForAPrescription
+from features.environment import MOCK_CIS2_LOGIN_ID_SINGLE_ACCESS_ROLE
+
+
+@given("I am logged in with a single access role")
+def login_single_role(context):
+    context.page.goto(context.cpts_ui_base_url + "site/auth_demo.html")
+    context.page.get_by_role("button", name="Log in with mock CIS2").click()
+    context.page.get_by_label("Username").fill(MOCK_CIS2_LOGIN_ID_SINGLE_ACCESS_ROLE)
+    context.page.get_by_role("button", name="Sign In").click()
+    context.page.wait_for_url("**/searchforaprescription")
 
 
 @when("I go to the search for a prescription page")
@@ -21,7 +31,8 @@ def go_to_search_prescription_page(context):
 
 @then("I am on the search for a prescription page")
 def i_am_on_the_search_prescription_page(context):
-    expect(context.page).to_have_title("Search for a prescription")
+    search_for_a_prescription = SearchForAPrescription(context.page)
+    expect(search_for_a_prescription.temp_text).to_be_visible()
 
 
 @when("I click on tab {}")

features/steps/cpts_ui/select_your_role_steps.py

@@ -3,7 +3,10 @@
 from playwright.sync_api import expect
 
 from pages.select_your_role import SelectYourRole
-from features.environment import MOCK_CIS2_LOGIN_ID_1, MOCK_CIS2_LOGIN_ID_2
+from features.environment import (
+    MOCK_CIS2_LOGIN_ID_MULTIPLE_ACCESS_ROLES,
+    MOCK_CIS2_LOGIN_ID_NO_ACCESS_ROLE,
+)
 
 
 @when("I go to the select your role page")
@@ -28,18 +31,18 @@ def verify_on_select_your_role_page(context):
 def login(context):
     context.page.goto(context.cpts_ui_base_url + "site/auth_demo.html")
     context.page.get_by_role("button", name="Log in with mock CIS2").click()
-    context.page.get_by_label("Username").fill(MOCK_CIS2_LOGIN_ID_1)
+    context.page.get_by_label("Username").fill(MOCK_CIS2_LOGIN_ID_MULTIPLE_ACCESS_ROLES)
     context.page.get_by_role("button", name="Sign In").click()
-    context.page.wait_for_url("**/auth_demo.html")
+    context.page.wait_for_url("**/selectyourrole.html")
 
 
 @given("I am logged in without access")
 def login_without_access(context):
     context.page.goto(context.cpts_ui_base_url + "site/auth_demo.html")
     context.page.get_by_role("button", name="Log in with mock CIS2").click()
-    context.page.get_by_label("Username").fill(MOCK_CIS2_LOGIN_ID_2)
+    context.page.get_by_label("Username").fill(MOCK_CIS2_LOGIN_ID_NO_ACCESS_ROLE)
     context.page.get_by_role("button", name="Sign In").click()
-    context.page.wait_for_url("**/auth_demo.html")
+    context.page.wait_for_url("**/selectyourrole.html")
 
 
 @then("I can see the summary container")

pages/search_for_a_prescription.py

@@ -5,6 +5,9 @@ class SearchForAPrescription:
 
     def __init__(self, page: Page):
         self.page = page
+        self.temp_text = (
+            page.locator("div").filter(has_text="Search for a prescription").nth(2)
+        )
         self.hero_banner = page.get_by_test_id("hero-heading")
         self.prescription_id_search_tab = page.get_by_role(
             "tab", name="Prescription ID search"