CCM-17012: test pr proxy e2e tests

.github/actions/acceptance-tests/action.yml

@@ -25,15 +25,15 @@ runs:
   steps:
 
     - name: Run component tests
-      if: ${{ inputs.testType != 'e2e' }}
+      if: ${{ inputs.testType == 'component' }}
       uses: ./.github/actions/acceptance-tests-component
       with:
         testType: ${{ inputs.testType }}
         targetEnvironment: ${{ inputs.targetEnvironment }}
         targetComponent: ${{ inputs.targetComponent }}
 
     - name: Run e2e tests
-      if: ${{ inputs.testType == 'e2e' && inputs.targetEnvironment == 'main' }}
+      if: ${{ inputs.testType == 'e2e' }}
       uses: ./.github/actions/acceptance-tests-e2e
       with:
         targetEnvironment: ${{ inputs.targetEnvironment }}

.github/actions/build-proxies/action.yml

@@ -118,4 +118,5 @@ runs:
           --apimEnvironment "${{ env.APIM_ENV }}" \
           --boundedContext "notify-supplier" \
           --targetDomain "$TARGET_DOMAIN" \
-          --version "${{ inputs.version }}"
+          --version "${{ inputs.version }}" \
+          --internalRef "feature/CCM-17012" # TO BE REMOVED - used to trigger workflow until internal branch merges

.github/workflows/deploy-dynamic-env-proxy.yaml

@@ -1,3 +1,4 @@
+# Test
 name: Deploy dynamic PR environment proxy
 run-name: Deploy proxy for PR environment on internal-dev by @${{ github.actor }}
 

tests/component-tests/integration-tests/urgent-letter-priority.spec.ts

@@ -1,7 +1,6 @@
 import { expect, test } from "@playwright/test";
 import getRestApiGatewayBaseUrl from "tests/helpers/aws-gateway-helper";
 import { pollForLetterStatus } from "tests/helpers/poll-for-letters-helper";
-import { getLettersFromQueueViaIndex } from "tests/helpers/generate-fetch-test-data";
 import {
   getVariantsWithUrgency,
   sendEventsForVariants,
@@ -44,12 +43,6 @@ test.describe("Urgent Letter Priority Tests", () => {
     await verifyAllocationLogsContainPriority(urgencyNineLetterIds, 9);
     await verifyAllocationLogsContainPriority(urgencyTenLetterIds, 10);
 
-    const lettersFromQueue = await getLettersFromQueueViaIndex(supplier);
-
-    const letterIdsFromQueue = lettersFromQueue.map(
-      (letter) => letter.letterId,
-    );
-
     const header = createValidRequestHeaders(supplier);
     const response = await request.get(`${baseUrl}/${SUPPLIER_LETTERS}`, {
       headers: header,
@@ -63,10 +56,9 @@ test.describe("Urgent Letter Priority Tests", () => {
       GetLettersResponseSchema.parse(responseBody);
 
     const letterIds = getLettersResponse.data.map((letter) => letter.id);
-    expect(letterIds).toEqual(letterIdsFromQueue);
 
     verifyIndexPositionOfLetterVariants(
-      letterIdsFromQueue,
+      letterIds,
       urgencyTenLetterIds,
       urgencyNineLetterIds,
     );

tests/e2e-tests/api/data/test_get_letter_data.py

@@ -11,10 +11,11 @@
 @pytest.mark.devtest
 @pytest.mark.inttest
 @pytest.mark.prodtest
-def test_200_get_letter_status(url, authentication_secret):
+def test_200_get_letter_data(url, authentication_secret):
     headers = Generators.generate_valid_headers(authentication_secret)
     ids = get_pending_letter_ids(url, headers, LETTERS_ENDPOINT, limit=1)
 
+    print(f"calling GET {url}/{LETTERS_ENDPOINT}/{ids[0]}/data with headers {headers}")
     get_letter_data = requests.get(f"{url}/{LETTERS_ENDPOINT}/{ids[0]}/data", headers=headers)
 
     ErrorHandler.handle_retry(get_letter_data)

tests/e2e-tests/api/letters/test_get_letter_status.py

@@ -16,12 +16,12 @@ def test_200_get_letter_status(url, authentication_secret):
     ids = get_pending_letter_ids(url, headers, LETTERS_ENDPOINT, limit=1)
     letter_id = ids[0]
 
+    print(f"calling GET {url}/{LETTERS_ENDPOINT}/{letter_id} with headers {headers}")
     get_message_response = requests.get(f"{url}/{LETTERS_ENDPOINT}/{letter_id}", headers=headers)
 
     ErrorHandler.handle_retry(get_message_response)
     assert get_message_response.status_code == 200, f"Response: {get_message_response.status_code}: {get_message_response.text}"
 
-
 @pytest.mark.test
 @pytest.mark.devtest
 @pytest.mark.inttest

tests/e2e-tests/lib/letters.py

@@ -75,6 +75,7 @@ def get_pending_letter_ids(
             response.raise_for_status()
             data.extend(response.json().get("data", []))
             if len(data) >= limit:
+                print(f"Created and found letters with IDs {[item.get('id') for item in data]}")
                 return [item.get("id") for item in data]
             time.sleep(interval_s)