Merge branch 'main' into aea-4645-pre-role-jw

jonathanwelch1-nhs · web-flow · commit 8a8cf951a69c · 2025-01-21T15:35:38.000Z
diff --git a/README.md b/README.md
@@ -79,7 +79,7 @@ For example:
 product=cpts-ui env=internal-dev PULL_REQUEST_ID=pr-300 tags=cpt-ui HEADLESS=true make run-tests
 ```
 
-Note that CPT-UI supports localhost testing. To do this, use the `env=localhost` variable. Make sure your localhost server is running!
+Note that CPT-UI supports localhost testing. To do this, use the `env=localhost` variable - but ensure you have *not* set the `PULL_REQUEST_ID` variable, as it is not needed and will break the tests. Make sure your localhost server is running!
 
 ### Method 4 (Not Recommended):
 Run the tests by running `behave` in a command prompt or terminal window.
diff --git a/features/cpts_ui/confirm_your_role.feature b/features/cpts_ui/confirm_your_role.feature
@@ -0,0 +1,31 @@
+@cpts_ui @confirm_role @regression @blocker @smoke @ui
+@allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4537
+Feature: When the user selects a role, they see a confirmation page
+
+    Background:
+        Given I am logged in
+    
+    Scenario:
+        Given I go to the select your role page
+        And I have a selected role
+        Then I see the 'confirm your role' page
+    
+    Scenario:
+        Given I am on the change your role page
+        When I click a change role role card
+        Then I see the 'confirm your role' page
+
+    Scenario:
+        Given I am on the confirm your role page
+        When I click the change link next to the role text
+        Then I am on the change role page
+
+    Scenario:
+        Given I am on the confirm your role page
+        When I click the change link next to the org text
+        Then I am on the change role page
+
+    Scenario:
+        Given I am on the confirm your role page
+        When I click the confirm and continue button on the confirm role page
+        Then I am on the search for a prescription page
diff --git a/features/environment.py b/features/environment.py
@@ -136,7 +136,7 @@ def before_all(context):
         context.pfp_base_url = os.path.join(select_apigee_base_url(env), PFP_SUFFIX)
         context.psu_base_url = os.path.join(select_apigee_base_url(env), PSU_SUFFIX)
 
-        if PULL_REQUEST_ID:
+        if PULL_REQUEST_ID and env != "LOCALHOST":
             print(f"--- Using pull request id: '{PULL_REQUEST_ID}'")
             pull_request_id = PULL_REQUEST_ID.lower()
             if "pr-" in pull_request_id:
diff --git a/features/eps_fhir/validator.feature b/features/eps_fhir/validator.feature
@@ -0,0 +1,29 @@
+@eps_fhir @smoke @regression @blocker @validator
+@allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4895
+Feature: I can call the validator endpoint
+
+  Scenario: I can call the validator endpoint with valid fhir with x-show-validation-warnings set to false
+    Given I am an authorised prescriber
+    When I make a valid request to the eps_fhir validator endpoint with show validation set to false
+    Then the response indicates a success
+    And the validator response has 1 information issue
+
+  Scenario: I can call the validator endpoint with valid fhir with x-show-validation-warnings set to true
+    Given I am an authorised prescriber
+    When I make a valid request to the eps_fhir validator endpoint with show validation set to true
+    Then the response indicates a bad request
+    And the validator response has many information issue
+    And the validator response has 0 error issue
+
+  Scenario: I can call the validator endpoint with valid fhir with x-show-validation-warnings set to false
+    Given I am an authorised prescriber
+    When I make a valid request to the eps_fhir validator endpoint with show validation set to unset
+    Then the response indicates a success
+    And the validator response has 1 information issue
+
+  Scenario: I can call the validator endpoint with invalid fhir
+    Given I am an authorised prescriber
+    When I make a invalid request to the eps_fhir validator endpoint with show validation set to false
+    Then the response indicates a bad request
+    And the validator response has many error issue
+    And the validator response has error with diagnostic containing Failed to parse JSON encoded FHIR content
diff --git a/features/eps_fhir_dispensing/validator.feature b/features/eps_fhir_dispensing/validator.feature
@@ -0,0 +1,29 @@
+@eps_fhir_dispensing @smoke @regression @validator
+@allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4895
+Feature: I can call the validator endpoint
+
+  Scenario: I can call the validator endpoint with valid fhir with x-show-validation-warnings set to false
+    Given I am an authorised dispenser
+    When I make a valid request to the eps_fhir_dispensing validator endpoint with show validation set to false
+    Then the response indicates a success
+    And the validator response has 1 information issue
+
+  Scenario: I can call the validator endpoint with valid fhir with x-show-validation-warnings set to true
+    Given I am an authorised dispenser
+    When I make a valid request to the eps_fhir_dispensing validator endpoint with show validation set to true
+    Then the response indicates a bad request
+    And the validator response has many information issue
+    And the validator response has 0 error issue
+
+  Scenario: I can call the validator endpoint with valid fhir with x-show-validation-warnings set to unset
+    Given I am an authorised dispenser
+    When I make a valid request to the eps_fhir_dispensing validator endpoint with show validation set to unset
+    Then the response indicates a success
+    And the validator response has 1 information issue
+
+  Scenario: I can call the validator endpoint with invalid fhir
+    Given I am an authorised dispenser
+    When I make a invalid request to the eps_fhir_dispensing validator endpoint with show validation set to false
+    Then the response indicates a bad request
+    And the validator response has many error issue
+    And the validator response has error with diagnostic containing Failed to parse JSON encoded FHIR content
diff --git a/features/eps_fhir_prescribing/validator.feature b/features/eps_fhir_prescribing/validator.feature
@@ -0,0 +1,29 @@
+@eps_fhir_prescribing @smoke @regression @validator
+@allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4895
+Feature: I can call the validator endpoint
+
+  Scenario: I can call the validator endpoint with valid fhir with x-show-validation-warnings set to false
+    Given I am an authorised prescriber
+    When I make a valid request to the eps_fhir_prescribing validator endpoint with show validation set to false
+    Then the response indicates a success
+    And the validator response has 1 information issue
+
+  Scenario: I can call the validator endpoint with valid fhir with x-show-validation-warnings set to true
+    Given I am an authorised prescriber
+    When I make a valid request to the eps_fhir_prescribing validator endpoint with show validation set to true
+    Then the response indicates a bad request
+    And the validator response has many information issue
+    And the validator response has 0 error issue
+
+  Scenario: I can call the validator endpoint with valid fhir with x-show-validation-warnings set to false
+    Given I am an authorised prescriber
+    When I make a valid request to the eps_fhir_prescribing validator endpoint with show validation set to unset
+    Then the response indicates a success
+    And the validator response has 1 information issue
+
+  Scenario: I can call the validator endpoint with invalid fhir
+    Given I am an authorised prescriber
+    When I make a invalid request to the eps_fhir_prescribing validator endpoint with show validation set to false
+    Then the response indicates a bad request
+    And the validator response has many error issue
+    And the validator response has error with diagnostic containing Failed to parse JSON encoded FHIR content
diff --git a/features/steps/__init__.py b/features/steps/__init__.py
@@ -5,3 +5,4 @@
 from cpts_ui.change_role_steps import *  # noqa: F403,F401
 from cpts_ui.logout_steps import *  # noqa: F403,F401
 from cpts_ui.header_steps import *  # noqa: F403,F401
+from cpts_ui.confirm_role_steps import *  # noqa: F403,F401
diff --git a/features/steps/common_steps.py b/features/steps/common_steps.py
@@ -34,6 +34,13 @@ def indicate_record_created(context):
     common.the_expected_response_code_is_returned(context, 201)
 
 
+@then("the response indicates a bad request")
+def indicate_bad_request_response(context):
+    if "sandbox" in context.config.userdata["env"].lower():
+        return
+    common.the_expected_response_code_is_returned(context, 400)
+
+
 @then("I can see the version information in the response")
 def i_see_version_in_response(context):
     response = context.response.json()
diff --git a/features/steps/cpts_ui/change_role_steps.py b/features/steps/cpts_ui/change_role_steps.py
@@ -19,9 +19,7 @@
 @given("I am on the change your role page")
 def given_i_am_on_the_change_role_page(context):
     context.execute_steps("when I go to change my role")
-    change_role_page = ChangeRole(context.page)
-
-    expect(change_role_page.change_role_title).to_be_visible(timeout=60000)
+    context.execute_steps("then I am on the change role page")
 
 
 @given("the summary table body is displayed")
@@ -85,6 +83,12 @@ def i_go_to_change_my_role(context):
 ############################################################################
 
 
+@then("I am on the change role page")
+def i_am_on_the_change_role_page(context):
+    change_role_page = ChangeRole(context.page)
+    expect(change_role_page.change_role_title).to_be_visible(timeout=60000)
+
+
 @then("I see the change role roles without access table")
 def then_i_see_the_roles_without_access_table(context):
     change_role_page = ChangeRole(context.page)
diff --git a/features/steps/cpts_ui/confirm_role_steps.py b/features/steps/cpts_ui/confirm_role_steps.py
@@ -0,0 +1,58 @@
+# pylint: disable=no-name-in-module
+from behave import given, when, then  # pyright: ignore [reportAttributeAccessIssue]
+from playwright.sync_api import expect
+
+from pages.confirm_role import ConfirmRole
+
+
+############################################################################
+# GIVEN STEPS
+############################################################################
+
+
+@given("I am on the confirm your role page")
+def i_am_on_the_confirm_your_role_page(context):
+    context.execute_steps("given I go to the select your role page")
+    context.execute_steps("given I have a selected role")
+    context.execute_steps("then I see the 'confirm your role' page")
+
+
+############################################################################
+# WHEN STEPS
+############################################################################
+
+
+@when("I click the change link next to the role text")
+def i_click_the_change_link_next_to_the_role_text(context):
+    confirm_role_page = ConfirmRole(context.page)
+    confirm_role_page.role_change_role.click()
+
+
+@when("I click the change link next to the org text")
+def i_click_the_change_link_next_to_the_org_text(context):
+    confirm_role_page = ConfirmRole(context.page)
+    confirm_role_page.org_change_role.click()
+
+
+@when("I click the confirm and continue button on the confirm role page")
+def i_click_the_confirm_and_continue_button_on_the_confirm_role_page(context):
+    confirm_role_page = ConfirmRole(context.page)
+    confirm_role_page.confirm_button.click()
+
+
+############################################################################
+# THEN STEPS
+############################################################################
+
+
+@then("I see the 'confirm your role' page")
+def i_see_the_confirm_your_role_page(context):
+    confirm_role_page = ConfirmRole(context.page)
+
+    expect(confirm_role_page.header).to_be_visible()
+    expect(confirm_role_page.role_label_cell).to_be_visible()
+    expect(confirm_role_page.org_label_cell).to_be_visible()
+    expect(confirm_role_page.org_text_cell).to_be_visible()
+    expect(confirm_role_page.role_text_cell).to_be_visible()
+    expect(confirm_role_page.role_change_role).to_be_visible()
+    expect(confirm_role_page.org_change_role).to_be_visible()
diff --git a/features/steps/eps_api_steps.py b/features/steps/eps_api_steps.py
@@ -12,9 +12,11 @@
     release_signed_prescription,
     return_prescription,
     withdraw_dispense_notification,
+    call_validator,
 )
 from methods.shared.common import assert_that, get_auth
 from utils.random_nhs_number_generator import generate_single
+from messages.eps_fhir.prescription import Prescription
 
 
 @given("I successfully prepare and sign a prescription")
@@ -166,3 +168,43 @@ def i_can_see_an_informational_operation_outcome_in_the_response(context):
     assert_that(json_response["resourceType"]).is_equal_to("OperationOutcome")
     assert_that(json_response["issue"][0]["code"]).is_equal_to("informational")
     assert_that(json_response["issue"][0]["severity"]).is_equal_to("information")
+
+
+@when(
+    "I make a {validity} request to the {product} validator endpoint with show validation set to {show_validation}"
+)
+def i_make_a_request_to_the_validator_endpoint(
+    context, validity, product, show_validation
+):
+    if validity == "valid":
+        context.nhs_number = generate_single()
+        context.nomination_code = "0004"
+        validate_body = Prescription(context).body
+    else:
+        validate_body = "foo"
+    call_validator(context, product, show_validation, validate_body)
+
+
+@then("the validator response has {expected_issue_count} {issue_type} issue")
+def validator_response_has_n_issues_of_type(context, expected_issue_count, issue_type):
+    json_response = json.loads(context.response.content)
+    assert_that(json_response["resourceType"]).is_equal_to("OperationOutcome")
+    actual_issue_count = sum(
+        p["severity"] == issue_type for p in json_response["issue"]
+    )
+    if expected_issue_count == "many":
+        assert_that(actual_issue_count).is_greater_than(0)
+    else:
+        assert_that(int(expected_issue_count)).is_equal_to(actual_issue_count)
+
+
+@then("the validator response has error with diagnostic containing {diagnostic}")
+def validator_response_has_error_issue_with_diagnostic(context, diagnostic):
+    json_response = json.loads(context.response.content)
+    assert_that(json_response["resourceType"]).is_equal_to("OperationOutcome")
+    print(f"expected diagnostic: {diagnostic}")
+    actual_issue_count = sum(
+        p["severity"] == "error" and diagnostic in p["diagnostics"]
+        for p in json_response["issue"]
+    )
+    assert_that(actual_issue_count).is_equal_to(1)
diff --git a/methods/api/eps_api_methods.py b/methods/api/eps_api_methods.py
@@ -110,3 +110,24 @@ def return_prescription(context):
 
     context.return_body = Return(context).body
     post(data=context.return_body, url=url, context=context, headers=headers)
+
+
+def call_validator(context, product, show_validation, validate_body):
+    if product == "eps_fhir_dispensing":
+        base_url = context.eps_fhir_dispensing_base_url
+    elif product == "eps_fhir_prescribing":
+        base_url = context.eps_fhir_prescribing_base_url
+    else:
+        base_url = context.eps_fhir_base_url
+    url = f"{base_url}/FHIR/R4/$validate"
+    if show_validation == "false" or show_validation == "true":
+        additional_headers = {
+            "Content-Type": "application/json",
+            "x-show-validation-warnings": show_validation,
+        }
+    else:
+        additional_headers = {"Content-Type": "application/json"}
+    headers = get_headers(context, additional_headers)
+
+    context.validate_body = validate_body
+    post(data=context.validate_body, url=url, context=context, headers=headers)
diff --git a/pages/confirm_role.py b/pages/confirm_role.py
@@ -0,0 +1,15 @@
+from playwright.sync_api import Page
+
+
+class ConfirmRole:
+    def __init__(self, page: Page):
+        self.page = page
+
+        self.header = page.get_by_test_id("eps_header_yourSelectedRole")
+        self.role_label_cell = page.get_by_test_id("role-label")
+        self.org_label_cell = page.get_by_test_id("org-label")
+        self.org_text_cell = page.get_by_test_id("org-text")
+        self.role_text_cell = page.get_by_test_id("role-text")
+        self.role_change_role = page.get_by_test_id("role-change-role-cell")
+        self.org_change_role = page.get_by_test_id("org-change-role-cell")
+        self.confirm_button = page.get_by_test_id("confirm-and-continue")
