feat(test): FTRS-1883 Tidying up tests

Author: tamaragoldschmidt

tests/service_automation/tests/features/is_api_features/dos_search_apim.feature

@@ -9,7 +9,7 @@ Feature: API DoS Service Search APIM
 
 
 
-  Scenario Outline:I send a request to the dos-search Organization Endpoint by ODS Code via APIM with valid headers and query parameters
+  Scenario Outline:I send a request to the dos-search organization endpoint by ODS Code via APIM with valid headers and query parameters
     When I request data from the APIM endpoint "Organization" with header "<params>" and query params "_revinclude=Endpoint:organization&identifier=odsOrganisationCode|M00081046"
     Then I receive a status code "200" in response
     And the response body contains a bundle
@@ -22,7 +22,7 @@ Feature: API DoS Service Search APIM
 
 
 @manual
-  Scenario Outline:I send a request to the dos-search Organization Endpoint by ODS Code via APIM with invalid header and valid query parameters
+  Scenario Outline:I send a request to the dos-search organization endpoint by ODS Code via APIM with invalid header and valid query parameters
     When I request data from the APIM endpoint "Organization" with header "<params>" and query params "_revinclude=Endpoint:organization&identifier=odsOrganisationCode|M00081046"
     Then I receive a status code "400" in response
     And the response body contains an "OperationOutcome" resource
@@ -37,15 +37,15 @@ Feature: API DoS Service Search APIM
 
 
 
-  Scenario:I send a request to the dos-search Organization Endpoint by ODS Code via APIM with valid query parameters
+  Scenario:I send a request to the dos-search organization endpoint by ODS Code via APIM with valid query parameters
     When I request data from the APIM endpoint "Organization" with query params "_revinclude=Endpoint:organization&identifier=odsOrganisationCode|M00081046"
     Then I receive a status code "200" in response
     And the response body contains a bundle
     And the bundle contains "1" "Organization" resources
     And the bundle contains "4" "Endpoint" resources
 
 
-  Scenario Outline:I send a request to the dos-search Organization Endpoint via APIM with invalid ODS code
+  Scenario Outline:I send a request to the dos-search organization endpoint via APIM with invalid ODS code
     When I request data from the APIM endpoint "Organization" with query params "<params>"
     Then I receive a status code "400" in response
     And the response body contains an "OperationOutcome" resource
@@ -62,7 +62,7 @@ Feature: API DoS Service Search APIM
       | identifier=odsOrganisationCode\|123@@@&_revinclude=Endpoint:organization        | 123@@@        |
 
 
-  Scenario Outline:I send a request to the dos-search Organization Endpoint with via APIM invalid _revinclude value
+  Scenario Outline:I send a request to the dos-search organization endpoint with via APIM invalid _revinclude value
     When I request data from the APIM endpoint "Organization" with query params "<params>"
     Then I receive a status code "400" in response
     And the response body contains an "OperationOutcome" resource
@@ -78,7 +78,7 @@ Feature: API DoS Service Search APIM
       | identifier=odsOrganisationCode\|M00081046&_revinclude=ENDPOINT:ORGANIZATION |
 
 
-  Scenario Outline:I send a request to the dos-search Organization Endpoint with via APIM invalid identifier system
+  Scenario Outline:I send a request to the dos-search organization endpoint with via APIM invalid identifier system
     When I request data from the APIM endpoint "Organization" with query params "<params>"
     Then I receive a status code "400" in response
     And the response body contains an "OperationOutcome" resource
@@ -94,7 +94,7 @@ Feature: API DoS Service Search APIM
       | identifier=odsOrganisationCodeInvalid\|M00081046&_revinclude=Endpoint:organization | odsOrganisationCodeInvalid |
 
 
-  Scenario Outline:I send a request to the dos-search Organization Endpoint via APIM with 1 missing parameter
+  Scenario Outline:I send a request to the dos-search organization endpoint via APIM with 1 missing parameter
     When I request data from the APIM endpoint "Organization" with query params "<params>"
     Then I receive a status code "400" in response
     And the response body contains an "OperationOutcome" resource
@@ -109,7 +109,7 @@ Feature: API DoS Service Search APIM
       | _revinclude=Endpoint:organization         | identifier    |
 
 
-  Scenario:I send a request to the dos-search Organization Endpoint via APIM with 2 missing parameters
+  Scenario:I send a request to the dos-search organization endpoint via APIM with 2 missing parameters
     When I request data from the APIM endpoint "Organization" with query params ""
     Then I receive a status code "400" in response
     And the response body contains an "OperationOutcome" resource

tests/service_automation/tests/features/is_api_features/dos_search_apim_security.feature

@@ -8,25 +8,25 @@ Feature: API DoS Service Search Is Secured
     And I create a model in the repo from json file "Organisation/organisation-with-4-endpoints.json"
 
 
-  Scenario: I can access APIM for the 'ping' Endpoint and no access is required
+  Scenario: I can access APIM for the dos-search'ping' Endpoint and no access is required
     When I request data from the APIM endpoint "_ping" with query params "" without authentication
     Then I receive a status code "200" in response
 
 
-  Scenario: I can access APIM for the 'status' Endpoint and access is required
+  Scenario: I can access APIM for the dos-search 'status' Endpoint and access is required
     When I request data from the APIM endpoint "_status" with query params "" with status token
     Then I receive a status code "200" in response
 
 
-  Scenario: I search APIM for GP Endpoint by ODS Code with valid query parameters and a valid access token
+  Scenario: I search APIM for the dos-search organization endpoint by ODS Code with valid query parameters and a valid access token
     When I request data from the APIM endpoint "Organization" with query params "_revinclude=Endpoint:organization&identifier=odsOrganisationCode|M00081046"
     Then I receive a status code "200" in response
     And the response body contains a bundle
     And the bundle contains "1" "Organization" resources
     And the bundle contains "4" "Endpoint" resources
 
 
-  Scenario: I cannot search APIM for GP Endpoint with invalid access token
+  Scenario: I cannot search APIM for the dos-search organization endpoint with invalid access token
     When I request data from the APIM endpoint "Organization" with query params "_revinclude=Endpoint:organization&identifier=odsOrganisationCode|M00081046" with invalid token
     Then I receive a status code "401" in response
     And the response body contains an "OperationOutcome" resource
@@ -36,7 +36,7 @@ Feature: API DoS Service Search Is Secured
     And the OperationOutcome contains an issue with diagnostics "Invalid or missing authentication token"
     And the OperationOutcome contains an issue with details for INVALID_AUTH_CODING coding
 
-  Scenario: I cannot search APIM for GP Endpoint without authentication
+  Scenario: I cannot search APIM for the dos-search organization endpoint without authentication
     When I request data from the APIM endpoint "Organization" with query params "_revinclude=Endpoint:organization&identifier=odsOrganisationCode|M00081046" without authentication
     Then I receive a status code "401" in response
     And the response body contains an "OperationOutcome" resource

tests/service_automation/tests/features/is_api_features/dos_search_backend_gateway_errors.feature

@@ -8,13 +8,13 @@ Feature: API DoS Service Search Backend Gateway Errors
     And I create a model in the repo from json file "Organisation/organisation-with-4-endpoints.json"
 
 
-  Scenario:I send a request to the dos-search Organization Endpoint by ODS Code with valid query parameters but missing mtls credentials and receive a connection reset error
+  Scenario:I send a request to the dos-search organization endpoint by ODS Code with valid query parameters but missing mtls credentials and receive a connection reset error
     When I attempt to request data from the "dos-search" endpoint "Organization" without authentication but with valid query params "_revinclude=Endpoint:organization&identifier=odsOrganisationCode|M000081046"
     Then I receive a connection reset error
 
 
 
-  Scenario:I send a request to the dos-search Organization Endpoint for a endpoint that does not exist and the api-gateway returns a 404 error
+  Scenario:I send a request to the dos-search organization endpoint for a endpoint that does not exist and the api-gateway returns a 404 error
     When I request data from the "dos-search" endpoint "DoesNotExist" with query params "_revinclude=Endpoint:organization&identifier=odsOrganisationCode|M000081046"
     Then I receive a status code "404" in response
     And the response body contains an "OperationOutcome" resource

tests/service_automation/tests/features/is_api_features/dos_search_backend_headers.feature

@@ -8,7 +8,7 @@ Feature: API DoS Service Search Backend Gateway Headers
     And I create a model in the repo from json file "Organisation/organisation-with-4-endpoints.json"
 
 
-  Scenario Outline:I send a request to the dos-search Organization Endpoint by ODS Code with valid query parameters and valid headers
+  Scenario Outline:I send a request to the dos-search organization endpoint by ODS Code with valid query parameters and valid headers
     When I request data from the "dos-search" endpoint "Organization" with header "<params>" with query params "_revinclude=Endpoint:organization&identifier=odsOrganisationCode|M00081046"
     Then I receive a status code "200" in response
     And the response body contains a bundle
@@ -40,15 +40,15 @@ Feature: API DoS Service Search Backend Gateway Headers
       |NHSD-Request-ID=req-987654321, NHSD-Api-Version=1.0 |
 
 
-  Scenario:I send a request to the dos-search Organization Endpoint by ODS Code with valid query parameters and no headers
+  Scenario:I send a request to the dos-search organization endpoint by ODS Code with valid query parameters and no headers
     When I request data from the "dos-search" endpoint "Organization" with query params "_revinclude=Endpoint:organization&identifier=odsOrganisationCode|M00081046"
     Then I receive a status code "200" in response
     And the response body contains a bundle
     And the bundle contains "1" "Organization" resources
     And the bundle contains "4" "Endpoint" resources
 
 
-  Scenario Outline:I send a request to the dos-search Organization Endpoint by ODS Code with valid query parameters and invalid headers
+  Scenario Outline:I send a request to the dos-search organization endpoint by ODS Code with valid query parameters and invalid headers
     When I request data from the "dos-search" endpoint "Organization" with header "<params>" with query params "_revinclude=Endpoint:organization&identifier=odsOrganisationCode|M00081046"
     Then I receive a status code "400" in response
     And the response body contains an "OperationOutcome" resource

tests/service_automation/tests/features/is_api_features/dos_search_backend_parameters.feature

@@ -7,15 +7,15 @@ Feature: API DoS Service Search Backend Request Parameters
     And I have a organisation repo
     And I create a model in the repo from json file "Organisation/organisation-with-4-endpoints.json"
 
-  Scenario:I send a request to the dos-search Organization Endpoint by ODS Code with for an ODS code that does not exist
+  Scenario:I send a request to the dos-search organization endpoint by ODS Code with for an ODS code that does not exist
     When I request data from the "dos-search" endpoint "Organization" with query params "_revinclude=Endpoint:organization&identifier=odsOrganisationCode|X000081046"
     Then I receive a status code "200" in response
     And the response body contains a bundle
     And the bundle contains "0" "Organization" resources
     And the bundle contains "0" "Endpoint" resources
 
 
-  Scenario Outline:I send a request to the dos-search Organization Endpoint with invalid ODS code
+  Scenario Outline:I send a request to the dos-search organization endpoint with invalid ODS code
     When I request data from the "dos-search" endpoint "Organization" with query params "<params>"
     Then I receive a status code "400" in response
     And the response body contains an "OperationOutcome" resource
@@ -32,7 +32,7 @@ Feature: API DoS Service Search Backend Request Parameters
       | identifier=odsOrganisationCode\|123@@@&_revinclude=Endpoint:organization        | 123@@@        |
 
 
-  Scenario Outline:I send a request to the dos-search Organization Endpoint with invalid _revinclude value
+  Scenario Outline:I send a request to the dos-search organization endpoint with invalid _revinclude value
     When I request data from the "dos-search" endpoint "Organization" with query params "<params>"
     Then I receive a status code "400" in response
     And the response body contains an "OperationOutcome" resource
@@ -48,7 +48,7 @@ Feature: API DoS Service Search Backend Request Parameters
       | identifier=odsOrganisationCode\|M00081046&_revinclude=ENDPOINT:ORGANIZATION |
 
 
-  Scenario Outline:I send a request to the dos-search Organization Endpoint with invalid identifier system
+  Scenario Outline:I send a request to the dos-search organization endpoint with invalid identifier system
     When I request data from the "dos-search" endpoint "Organization" with query params "<params>"
     Then I receive a status code "400" in response
     And the response body contains an "OperationOutcome" resource
@@ -64,7 +64,7 @@ Feature: API DoS Service Search Backend Request Parameters
       | identifier=odsOrganisationCodeInvalid\|M00081046&_revinclude=Endpoint:organization | odsOrganisationCodeInvalid |
 
 
-  Scenario Outline:I send a request to the dos-search Organization Endpoint with 1 missing parameter
+  Scenario Outline:I send a request to the dos-search organization endpoint with 1 missing parameter
     When I request data from the "dos-search" endpoint "Organization" with query params "<params>"
     Then I receive a status code "400" in response
     And the response body contains an "OperationOutcome" resource
@@ -80,7 +80,7 @@ Feature: API DoS Service Search Backend Request Parameters
 
 
 
-  Scenario:I send a request to the dos-search Organization Endpoint with 2 missing parameters
+  Scenario:I send a request to the dos-search organization endpoint with 2 missing parameters
     When I request data from the "dos-search" endpoint "Organization" with query params ""
     Then I receive a status code "400" in response
     And the response body contains an "OperationOutcome" resource
@@ -92,7 +92,7 @@ Feature: API DoS Service Search Backend Request Parameters
     And the OperationOutcome contains an issue with details for INVALID_SEARCH_DATA coding
 
 
-  Scenario Outline:I send a request to the dos-search Organization Endpoint by ODS Code with unexpected query parameter
+  Scenario Outline:I send a request to the dos-search organization endpoint by ODS Code with unexpected query parameter
     When I request data from the "dos-search" endpoint "Organization" with query params "_revinclude=Endpoint:organization&identifier=odsOrganisationCode|M00081046&<unexpected_param>=<unexpected_value>"
     Then I receive a status code "400" in response
     And the response body contains an "OperationOutcome" resource
@@ -109,6 +109,6 @@ Feature: API DoS Service Search Backend Request Parameters
 
 @test
   # New health check scenario for GET /_status
-  Scenario: I request a healthcheck of the GP Endpoint and receive a 200 response
+  Scenario: I request a healthcheck of the organization endpoint and receive a 200 response
     When I request data from the "dos-search" endpoint "_status" with query params ""
     Then I receive a status code "200" in response