use contains

Author: anthony-nhs

features/eps_fhir/validator.feature

@@ -20,4 +20,4 @@ Feature: I can call the validator endpoint
     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 HAPI-1861: Failed to parse JSON encoded FHIR content: HAPI-1859: Content does not appear to be FHIR JSON, first non-whitespace character was: '\"' (must be '{') 
+    And the validator response has error with diagnostic containing HAPI-1861

features/eps_fhir_dispensing/validator.feature

@@ -20,4 +20,4 @@ Feature: I can call the validator endpoint
     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 HAPI-1861: Failed to parse JSON encoded FHIR content: HAPI-1859: Content does not appear to be FHIR JSON, first non-whitespace character was: '\"' (must be '{')
+    And the validator response has error with diagnostic containing HAPI-1861

features/eps_fhir_prescribing/validator.feature

@@ -20,4 +20,4 @@ Feature: I can call the validator endpoint
     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 HAPI-1861: Failed to parse JSON encoded FHIR content: HAPI-1859: Content does not appear to be FHIR JSON, first non-whitespace character was: '\"' (must be '{')
+    And the validator response has error with diagnostic containing HAPI-1861

features/steps/eps_api_steps.py

@@ -216,12 +216,12 @@ def validator_response_has_n_issues_of_type(context, expected_issue_count, issue
         assert_that(int(expected_issue_count)).is_equal_to(actual_issue_count)
 
 
-@then("the validator response has error with diagnostic {diagnostic}")
+@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")
     actual_issue_count = sum(
-        p["severity"] == "error" and p["diagnostics"] == diagnostic
+        p["severity"] == "error" and diagnostic in p["diagnostics"]
         for p in json_response["issue"]
     )
     assert_that(actual_issue_count).is_equal_to(1)