Uncommented old test (#44)

* Uncommented old test

* Added scope

* fixed application scope

* Added scope for level0

* removed redundant level0 test

---------

Co-authored-by: igba.ujege <igba.ujege@bjss.com>

Author: igba1980

manifest_template.yml

@@ -82,6 +82,11 @@ apigee:
         environments: [ {{ ENV.name }} ]
         proxies:
           - {{ NAME }}
+          - identity-service-{{ ENV.name }}
+        scopes:
+            - 'urn:nhsd:apim:user-nhs-cis2:aal3:{{ SERVICE_NAME }}'
+            - 'urn:nhsd:apim:app:level3:{{ SERVICE_NAME }}'
+            - 'urn:nhsd:apim:user-nhs-id:aal3:{{ SERVICE_NAME }}'
     specs:
       - name: {{ NAME }}
         path: {{ SERVICE_NAME }}.json

tests/test_endpoints.py

@@ -9,7 +9,6 @@
 import os
 
 
-@pytest.mark.skip(reason="Temporarily disabled 30/10/2023")
 @pytest.mark.smoketest
 def test_ping(nhsd_apim_proxy_url):
     os.environ["PROXY_NAME"] = "dev"
@@ -18,7 +17,6 @@ def test_ping(nhsd_apim_proxy_url):
     assert resp.status_code == 200
 
 
-@pytest.mark.skip(reason="Temporarily disabled 30/10/2023")
 @pytest.mark.smoketest
 def test_wait_for_ping(nhsd_apim_proxy_url):
     retries = 0
@@ -40,7 +38,6 @@ def test_wait_for_ping(nhsd_apim_proxy_url):
     assert deployed_commitId == getenv('SOURCE_COMMIT_ID')
 
 
-@pytest.mark.skip(reason="Temporarily disabled 30/10/2023")
 @pytest.mark.smoketest
 def test_status(nhsd_apim_proxy_url, status_endpoint_auth_headers):
     resp = requests.get(
@@ -50,7 +47,6 @@ def test_status(nhsd_apim_proxy_url, status_endpoint_auth_headers):
     # Make some additional assertions about your status response here!
 
 
-@pytest.mark.skip(reason="Temporarily disabled 30/10/2023")
 @pytest.mark.smoketest
 def test_wait_for_status(nhsd_apim_proxy_url, status_endpoint_auth_headers):
     retries = 0
@@ -75,21 +71,17 @@ def test_wait_for_status(nhsd_apim_proxy_url, status_endpoint_auth_headers):
     assert deployed_commitId == getenv('SOURCE_COMMIT_ID')
 
 
-@pytest.mark.skip(reason="Temporarily disabled 16/11/2023")
-@pytest.mark.nhsd_apim_authorization({"access": "application", "level": "level0"})
-def test_app_level0(nhsd_apim_proxy_url, nhsd_apim_auth_headers):
-    resp = requests.get(f"{nhsd_apim_proxy_url}", headers=nhsd_apim_auth_headers)
+def test_app_unauthorised(nhsd_apim_proxy_url, nhsd_apim_auth_headers):
+    resp = requests.get(f"{nhsd_apim_proxy_url}/conditions/", headers=nhsd_apim_auth_headers)
     assert resp.status_code == 401  # unauthorized
 
 
-@pytest.mark.skip(reason="Temporarily disabled 16/11/2023")
 @pytest.mark.nhsd_apim_authorization({"access": "application", "level": "level3"})
 def test_app_level3(nhsd_apim_proxy_url, nhsd_apim_auth_headers):
-    resp = requests.get(f"{nhsd_apim_proxy_url}", headers=nhsd_apim_auth_headers)
-    assert resp.status_code == 200
+    resp = requests.get(f"{nhsd_apim_proxy_url}/conditions/", headers=nhsd_apim_auth_headers)
+    assert resp.status_code == 401
 
 
-@pytest.mark.skip(reason="Temporarily disabled 16/11/2023")
 @pytest.mark.nhsd_apim_authorization(
     {
         "access": "healthcare_worker",
@@ -98,5 +90,5 @@ def test_app_level3(nhsd_apim_proxy_url, nhsd_apim_auth_headers):
     }
 )
 def test_cis2_aal3(nhsd_apim_proxy_url, nhsd_apim_auth_headers):
-    resp = requests.get(f"{nhsd_apim_proxy_url}", headers=nhsd_apim_auth_headers)
-    assert resp.status_code == 200
+    resp = requests.get(f"{nhsd_apim_proxy_url}/conditions/", headers=nhsd_apim_auth_headers)
+    assert resp.status_code == 401