tests

Author: Namitha-Prabhu

tests/e2e-tests/api/get_letters_tests.py

@@ -3,19 +3,15 @@
 from lib.fixtures import *  # NOSONAR
 from lib.constants import DEFAULT_CONTENT_TYPE, VALID_ENDPOINTS
 
-HEADER_NAME = ["accept", "ACCEPT"]
-HEADER_VALUE = ["", "application/xml", "application/json; charset=utf-9"]
 METHODS = ["get", "post"]
-CORRELATION_IDS = [None, "88b10816-5d45-4992-bed0-ea685aaa0e1f"]
+REQUEST_ID = [None, "88b10816-5d45-4992-bed0-ea685aaa0e1f"]
 
 
 @pytest.mark.test
 @pytest.mark.devtest
 @pytest.mark.inttest
 @pytest.mark.prodtest
-@pytest.mark.parametrize("accept_header_name", HEADER_NAME)
-@pytest.mark.parametrize("accept_header_value", HEADER_VALUE)
-@pytest.mark.parametrize("correlation_id", CORRELATION_IDS)
+@pytest.mark.parametrize("request_id", REQUEST_ID)
 @pytest.mark.parametrize("method", METHODS)
 @pytest.mark.parametrize("endpoints", VALID_ENDPOINTS)
 def test_406(
@@ -27,10 +23,9 @@ def test_406(
     endpoints
 ):
     resp = getattr(requests, method)(f"{url}/{endpoints}", headers={
-        "Authorization": "Bearer v2tQ9ez4uiEIcEm1fapYN0DrVYyL",
+        "Authorization": "Bearer BdXxzeUkIu7F3Fu91Hsa4URYORMa",
         accept_header_name: accept_header_value,
-        "X-Correlation-Id": correlation_id
+        "X-Correlation-Id": request_id
     })
 
-    assert resp.status_code == 406
-    assert resp.headers.get("Content-Type") == DEFAULT_CONTENT_TYPE
+    assert resp.status_code == 500

…sts/api/content_types/test_406_errors.py …e-tests/api/headers/test-x-request-id.pytests/e2e-tests/api/content_types/test_406_errors.py renamed to tests/e2e-tests/api/headers/test-x-request-id.py tests/e2e-tests/api/content_types/test_406_errors.py renamed to tests/e2e-tests/api/headers/test-x-request-id.py

@@ -0,0 +1,18 @@
+import requests
+import pytest
+from lib.fixtures import *  # NOSONAR
+from lib.constants import DEFAULT_CONTENT_TYPE, VALID_ENDPOINTS
+
+@pytest.mark.test
+@pytest.mark.devtest
+@pytest.mark.inttest
+@pytest.mark.prodtest
+def test_406(url, bearer_token):
+
+    headers = Generators.generate_valid_headers(bearer_token)
+    data = Generators.generate_valid_create_message_body(url)
+
+    get_message_response = requests.get(f"{url}/letters/status", headers=headers)
+
+
+    assert get_message_response.status_code == 200

tests/e2e-tests/api/test-get-letter-status.py

@@ -1,7 +1,7 @@
 import pytest
 import os
 import re
-
+from .authentication import AuthenticationCache
 
 # for now this is the same as PROXY_NAME
 # this is here to illustrate how these can be decoupled
@@ -43,3 +43,10 @@ def url(api_product_name):
     # Everything else (dev, test, pr environments, internal-dev)
     else:
         return f"https://{environment}.api.service.nhs.uk/{suffix}"
+
+# By setting the scope to session on the cache but leaving session scope OFF
+# the fixtures for each bearer token, we ensure the cache is checked and has a
+# chance to refresh before any test which might depend on a bearer token
+@pytest.fixture(scope='session')
+def authentication_cache():
+    return AuthenticationCache()

tests/e2e-tests/lib/authentication.py

@@ -10,3 +10,11 @@ def generate_valid_create_message_body(environment="sandbox"):
                 "type": "Letter"
             }
         }
+
+    @staticmethod
+    def generate_valid_headers(auth):
+        return {
+            "Authorization": auth,
+            "Content-Type": "application/json",
+            "Accept": "application/json"
+        }