feat(test): FTRS-18830 FTRS-1883 Adding in smoke tests

Author: tamaragoldschmidt

tests/service_automation/tests/conftest.py

@@ -232,8 +232,8 @@ def env() -> str:
 
 
 @pytest.fixture(scope="module")
-def apigee_token() -> str:
-    return _get_env_var("APIGEE_ACCESS_TOKEN")
+def apim_token() -> str:
+    return _get_env_var("APIM_ACCESS_TOKEN")
 
 
 @pytest.fixture(scope="session", autouse=True)

tests/service_automation/tests/features/is_api_features/dos_search_apim_headers.feature

@@ -1,6 +1,12 @@
 @is-apim @integrated-search @dos-search-ods-code-api
 @nhsd_apim_authorization(access="application",level="level3")
 Feature: API DoS Service validates headers
+# Add tests to check that the headers are not case sensitive
+# Add tests to check for valid and invalid headers combos are handled correctly
+# Add tests that allowed headers are allowed  0 check for differences between apim and apig
+
+
+
 
   Background: Set stack and seed repo
     Given that the stack is "dos-search"

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

@@ -7,7 +7,7 @@ Feature: API DoS Service Search Is Secured
     And I have a organisation repo
     And I create a model in the repo from json file "Organisation/organisation-with-4-endpoints.json"
 
-
+@test
   Scenario: I can access APIM for the '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

tests/service_automation/tests/features/is_api_features/dos_search_smoke_tests.feature

@@ -15,11 +15,11 @@ Background: Set stack and select ODS code for testing from the organisation dyna
     And the response is valid against the dos-search schema for endpoint "/Organization"
 
 
-  Scenario: I can access APIM for the dos-search'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 an odscode from dynamo organisation table but without authentication
     Then I receive a status code "200" in response
 
-@test
+#DOn't think that the starus endpoint is accessible by a enduser
   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 an odscode from dynamo organisation table and with status token
     Then I receive a status code "200" in response

tests/service_automation/tests/step_definitions/common_steps/api_steps.py

@@ -7,7 +7,7 @@
 
 @then(parsers.parse('I receive a status code "{status_code:d}" in response'))
 def status_code(fresponse, status_code):
-    logger.info(f"Received status code: {fresponse.json()}")
+    # logger.info(f"Received status code: {fresponse.json()}")
     assert fresponse.status == status_code
 
 

tests/service_automation/tests/step_definitions/is_api_steps/dos_search_response_steps.py

@@ -84,7 +84,7 @@ def api_check_resource_type_boolean_value(
     """Verify {resource_type}.{field_name} has the expected boolean value.
     Accepts 'true' or 'false' (case-insensitive).
     """
-    expected_bool = expected_value.lower() == "true"
+    expected_bool = expected_value == "true"
     response = fresponse.json()
     resource_entries = [
         e

tests/service_automation/tests/step_definitions/is_api_steps/test_dos_search_api.py

@@ -218,22 +218,6 @@ def send_to_apim_invalid_token_with_ods_code(
     return _send_api_request(api_request_context, url, params, headers)
 
 
-@when(
-    parsers.re(
-        r'I request data from the APIM endpoint "(?P<resource_name>.*?)" with an odscode from dynamo organisation table and with status token'
-    ),
-    target_fixture="fresponse",
-)
-def send_to_apim_status_token(
-    apim_request_context,
-    status_endpoint_auth_headers,
-    dos_search_service_url,
-    resource_name,
-):
-    url = dos_search_service_url + "/" + resource_name
-    return _send_api_request(apim_request_context, url, status_endpoint_auth_headers)
-
-
 @when(
     parsers.re(
         r'I request data from the APIM endpoint "(?P<resource_name>.*?)" with query params "(?P<params>.*?)" with status token'
@@ -294,15 +278,15 @@ def api_check_operation_outcome_any_issue_details_coding(fresponse, coding_type)
     target_fixture="fresponse",
 )
 def send_to_apim_get_with_ods_code_from_dynamo(
-    api_request_context, dos_search_service_url, resource_name, ods_code, apigee_token
+    api_request_context, dos_search_service_url, resource_name, ods_code, apim_token
 ):
     logger.info(
         f"Requesting APIM URL: {dos_search_service_url}/{resource_name} with ODS code: {ods_code}"
     )
     url = dos_search_service_url + "/" + resource_name
     headers = {
         **MANDATORY_APIM_REQUEST_HEADERS,
-        "Authorization": f"Bearer {apigee_token}",
+        "Authorization": f"Bearer {apim_token}",
     }
     params = f"_revinclude=Endpoint:organization&identifier=https://fhir.nhs.uk/Id/ods-organization-code|{ods_code}"
     # logger.info(f"Requesting URL: {url} with params: {params} with headers: {headers}")