From 78b6a1d0e3febfd77cd056d30f9c1c611e1e9f0e Mon Sep 17 00:00:00 2001 From: "rachel.kennedy13" Date: Fri, 11 Apr 2025 15:40:44 +0100 Subject: [PATCH 1/2] CCM-9690: Fix apim e2e --- tests/end_to_end/test_email.py | 23 +++++++++++++---------- tests/end_to_end/test_letter.py | 24 ++++++++++++++---------- tests/end_to_end/test_nhsapp.py | 31 +++++++++++++++++-------------- tests/end_to_end/test_sms.py | 24 ++++++++++++++---------- tests/lib/helper.py | 14 ++++---------- 5 files changed, 62 insertions(+), 54 deletions(-) diff --git a/tests/end_to_end/test_email.py b/tests/end_to_end/test_email.py index 3c29dde15..bd2f52c56 100644 --- a/tests/end_to_end/test_email.py +++ b/tests/end_to_end/test_email.py @@ -7,21 +7,22 @@ @pytest.mark.e2e @pytest.mark.devtest -def test_email_end_to_end_internal_dev(nhsd_apim_proxy_url, bearer_token_internal_dev): +def test_email_end_to_end_internal_dev(url, bearer_token): """ .. include:: ../../partials/happy_path/test_email_end_to_end_internal_dev.rst """ + headers = Generators.generate_valid_headers(bearer_token.value) resp = Helper.send_single_message( - nhsd_apim_proxy_url, - {"Authorization": bearer_token_internal_dev.value}, + url, + headers, Generators.generate_send_message_body("email", "internal-dev") ) message_id = resp.json().get("data").get("id") Helper.poll_get_message( - url=nhsd_apim_proxy_url, - auth={"Authorization": bearer_token_internal_dev.value}, + url=url, + headers=headers, message_id=message_id ) @@ -33,21 +34,23 @@ def test_email_end_to_end_internal_dev(nhsd_apim_proxy_url, bearer_token_interna @pytest.mark.e2e @pytest.mark.uattest -def test_email_end_to_end_uat(nhsd_apim_proxy_url, bearer_token_internal_dev): +def test_email_end_to_end_uat(url, bearer_token): """ .. include:: ../../partials/happy_path/test_email_end_to_end_uat.rst """ + headers = Generators.generate_valid_headers(bearer_token.value) + resp = Helper.send_single_message( - nhsd_apim_proxy_url, - {"Authorization": bearer_token_internal_dev.value}, + url, + headers, Generators.generate_send_message_body("email", "internal-qa") ) message_id = resp.json().get("data").get("id") Helper.poll_get_message( - url=nhsd_apim_proxy_url, - auth={"Authorization": bearer_token_internal_dev.value}, + url=url, + headers=headers, message_id=message_id ) diff --git a/tests/end_to_end/test_letter.py b/tests/end_to_end/test_letter.py index 909ec3f97..2d2f00a86 100644 --- a/tests/end_to_end/test_letter.py +++ b/tests/end_to_end/test_letter.py @@ -7,21 +7,23 @@ @pytest.mark.e2e @pytest.mark.devtest -def test_letter_end_to_end_internal_dev(nhsd_apim_proxy_url, bearer_token_internal_dev): +def test_letter_end_to_end_internal_dev(url, bearer_token): """ .. include:: ../../partials/happy_path/test_letter_end_to_end_internal_dev.rst """ + headers = Generators.generate_valid_headers(bearer_token.value) + resp = Helper.send_single_message( - nhsd_apim_proxy_url, - {"Authorization": bearer_token_internal_dev.value}, + url, + headers, Generators.generate_send_message_body("letter", "internal-dev"), ) message_id = resp.json().get("data").get("id") Helper.poll_get_message( - url=nhsd_apim_proxy_url, - auth={"Authorization": bearer_token_internal_dev.value}, + url=url, + headers=headers, message_id=message_id, end_state="sending", poll_time=595, @@ -37,21 +39,23 @@ def test_letter_end_to_end_internal_dev(nhsd_apim_proxy_url, bearer_token_intern @pytest.mark.e2e @pytest.mark.uattest -def test_letter_end_to_end_uat(nhsd_apim_proxy_url, bearer_token_internal_dev): +def test_letter_end_to_end_uat(url, bearer_token): """ .. include:: ../../partials/happy_path/test_letter_end_to_end_uat.rst """ + headers = Generators.generate_valid_headers(bearer_token.value) + resp = Helper.send_single_message( - nhsd_apim_proxy_url, - {"Authorization": bearer_token_internal_dev.value}, + url, + headers, Generators.generate_send_message_body("letter", "internal-qa"), ) message_id = resp.json().get("data").get("id") Helper.poll_get_message( - url=nhsd_apim_proxy_url, - auth={"Authorization": bearer_token_internal_dev.value}, + url=url, + headers=headers, message_id=message_id, end_state="sending", poll_time=595, diff --git a/tests/end_to_end/test_nhsapp.py b/tests/end_to_end/test_nhsapp.py index 6a4a89bcf..0db9241c1 100644 --- a/tests/end_to_end/test_nhsapp.py +++ b/tests/end_to_end/test_nhsapp.py @@ -6,28 +6,30 @@ @pytest.mark.e2e @pytest.mark.devtest -def test_nhsapp_end_to_end(nhsd_apim_proxy_url, bearer_token_internal_dev): +def test_nhsapp_end_to_end(url, headers): """ .. include:: ../../partials/happy_path/test_nhsapp_end_to_end_internal_dev.rst """ + headers = Generators.generate_valid_headers(bearer_token.value) + resp = Helper.send_single_message( - nhsd_apim_proxy_url, - {"Authorization": bearer_token_internal_dev.value}, + url, + headers, Generators.generate_send_message_body("nhsapp", "internal-dev") ) message_id = resp.json().get("data").get("id") Helper.poll_get_message( - url=nhsd_apim_proxy_url, - auth={"Authorization": bearer_token_internal_dev.value}, + url=url, + headers=headers, message_id=message_id ) Assertions.assert_get_message_status( Helper.get_message( - nhsd_apim_proxy_url, - {"Authorization": bearer_token_internal_dev.value}, + url, + headers, message_id ), "delivered" @@ -36,31 +38,32 @@ def test_nhsapp_end_to_end(nhsd_apim_proxy_url, bearer_token_internal_dev): @pytest.mark.e2e @pytest.mark.uattest -def test_nhsapp_end_to_end_uat(nhsd_apim_proxy_url, bearer_token_internal_dev): +def test_nhsapp_end_to_end_uat(url, bearer_token): """ .. include:: ../../partials/happy_path/test_nhsapp_end_to_end_uat.rst """ + headers = Generators.generate_valid_headers(bearer_token.value) personalisation = str(uuid.uuid1()) resp = Helper.send_single_message( - nhsd_apim_proxy_url, - {"Authorization": bearer_token_internal_dev.value}, + url, + headers, Generators.generate_send_message_body("nhsapp", "internal-qa", personalisation) ) message_id = resp.json().get("data").get("id") Helper.poll_get_message( - url=nhsd_apim_proxy_url, - auth={"Authorization": bearer_token_internal_dev.value}, + url=url, + headers=headers, message_id=message_id, end_state="sending" ) Assertions.assert_get_message_status( Helper.get_message( - nhsd_apim_proxy_url, - {"Authorization": bearer_token_internal_dev.value}, + url, + headers, message_id ), "sending" diff --git a/tests/end_to_end/test_sms.py b/tests/end_to_end/test_sms.py index 44eb71c7f..7b304cd86 100644 --- a/tests/end_to_end/test_sms.py +++ b/tests/end_to_end/test_sms.py @@ -7,21 +7,23 @@ @pytest.mark.e2e @pytest.mark.devtest -def test_sms_end_to_end_internal_dev(nhsd_apim_proxy_url, bearer_token_internal_dev): +def test_sms_end_to_end_internal_dev(url, bearer_token): """ .. include:: ../../partials/happy_path/test_sms_end_to_end_internal_dev.rst """ + headers = Generators.generate_valid_headers(bearer_token.value) + resp = Helper.send_single_message( - nhsd_apim_proxy_url, - {"Authorization": bearer_token_internal_dev.value}, + url, + headers, Generators.generate_send_message_body("sms", "internal-dev") ) message_id = resp.json().get("data").get("id") Helper.poll_get_message( - url=nhsd_apim_proxy_url, - auth={"Authorization": bearer_token_internal_dev.value}, + url=url, + headers=headers, message_id=message_id ) @@ -33,21 +35,23 @@ def test_sms_end_to_end_internal_dev(nhsd_apim_proxy_url, bearer_token_internal_ @pytest.mark.e2e @pytest.mark.uattest -def test_sms_end_to_end_uat(nhsd_apim_proxy_url, bearer_token_internal_dev): +def test_sms_end_to_end_uat(url, bearer_token): """ .. include:: ../../partials/happy_path/test_sms_end_to_end_uat.rst """ + headers = Generators.generate_valid_headers(bearer_token.value) + resp = Helper.send_single_message( - nhsd_apim_proxy_url, - {"Authorization": bearer_token_internal_dev.value}, + url, + headers, Generators.generate_send_message_body("sms", "internal-qa") ) message_id = resp.json().get("data").get("id") Helper.poll_get_message( - url=nhsd_apim_proxy_url, - auth={"Authorization": bearer_token_internal_dev.value}, + url=url, + headers=headers, message_id=message_id ) diff --git a/tests/lib/helper.py b/tests/lib/helper.py index f605e16d8..b958fdfa1 100644 --- a/tests/lib/helper.py +++ b/tests/lib/helper.py @@ -24,27 +24,21 @@ def send_single_message(url, auth, body): return resp @staticmethod - def get_message(url, auth, message_id): - resp = requests.get(f"{url}{MESSAGES_ENDPOINT}/{message_id}", headers={ - **auth, - "Accept": DEFAULT_CONTENT_TYPE - }) + def get_message(url, headers, message_id): + resp = requests.get(f"{url}{MESSAGES_ENDPOINT}/{message_id}", headers=headers) error_handler.handle_retry(resp) assert resp.status_code == 200 return resp @staticmethod - def poll_get_message(url, auth, message_id, end_state="delivered", poll_time=300): + def poll_get_message(url, headers, message_id, end_state="delivered", poll_time=300): message_status = None end_time = int(time.time()) + poll_time while message_status != end_state and int(time.time()) < end_time: get_message_response = requests.get( f"{url}{MESSAGES_ENDPOINT}/{message_id}", - headers={ - **auth, - "Accept": DEFAULT_CONTENT_TYPE - }, + headers=headers, ) if get_message_response.status_code == 200: From f2c351644a1f76b2bb3db797eca882f9c50eefec Mon Sep 17 00:00:00 2001 From: "rachel.kennedy13" Date: Fri, 11 Apr 2025 16:02:52 +0100 Subject: [PATCH 2/2] CCM-9690: Fix apim e2e --- tests/end_to_end/test_nhsapp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/end_to_end/test_nhsapp.py b/tests/end_to_end/test_nhsapp.py index 0db9241c1..8eed80424 100644 --- a/tests/end_to_end/test_nhsapp.py +++ b/tests/end_to_end/test_nhsapp.py @@ -6,7 +6,7 @@ @pytest.mark.e2e @pytest.mark.devtest -def test_nhsapp_end_to_end(url, headers): +def test_nhsapp_end_to_end(url, bearer_token): """ .. include:: ../../partials/happy_path/test_nhsapp_end_to_end_internal_dev.rst """