From 821ac895b95d09ceaa6f27c92d864406ec249869 Mon Sep 17 00:00:00 2001
From: Arthur Morrow <133667008+amorrow-flexion@users.noreply.github.com>
Date: Thu, 26 Dec 2024 12:01:25 -0500
Subject: [PATCH] corrected naming, e2e workflow, and dependency if condition
 (#1082)

 corrected naming, e2e workflow, and dependency if condition, removed skips from e2e

Co-authored-by: Arthur Morrow <133667008+amorrow-flexion@users.noreply.github.com>
Co-authored-by: James Brooks <12275865+jamesobrooks@users.noreply.github.com>
---
 .github/workflows/continuous-deployment.yml      | 6 +++---
 .github/workflows/e2e-test.yml                   | 3 +--
 .github/workflows/reusable-backend-slot.yml      | 2 +-
 .github/workflows/sub-deploy-code-slot.yml       | 7 ++++++-
 .github/workflows/sub-deploy-slot-resources.yml  | 6 +++---
 .github/workflows/sub-deploy.yml                 | 4 ++--
 test/e2e/playwright/consolidation-orders.spec.ts | 4 ++--
 7 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/continuous-deployment.yml b/.github/workflows/continuous-deployment.yml
index 6be07d770..c80069d65 100644
--- a/.github/workflows/continuous-deployment.yml
+++ b/.github/workflows/continuous-deployment.yml
@@ -125,7 +125,7 @@ jobs:
         unit-test-backend,
         unit-test-common,
       ]
-    if:
+    if: |
       ((github.ref == 'refs/heads/main') || (github.ref == 'refs/heads/dependency-updates-auto') ||
       (inputs.deployBranch == 'true'))
     with:
@@ -135,7 +135,7 @@ jobs:
       stackName: ${{ needs.setup.outputs.stackName }}
       apiFunctionName: ${{ needs.setup.outputs.apiFunctionName }}
       migrationFunctionName: ${{ needs.setup.outputs.migrationFunctionName }}
-      webAppName: ${{ needs.setup.outputs.webappName }}
+      webappName: ${{ needs.setup.outputs.webappName }}
       environmentHash: ${{ needs.setup.outputs.environmentHash }}
       deployVnet: ${{ needs.setup.outputs.deployVnet }}
       slotName: ${{ needs.setup.outputs.slotName }}
@@ -153,7 +153,7 @@ jobs:
       stackName: ${{ needs.setup.outputs.stackName }}
       apiFunctionName: ${{ needs.setup.outputs.apiFunctionName }}
       migrationFunctionName: ${{ needs.setup.outputs.migrationFunctionName }}
-      webAppName: ${{ needs.setup.outputs.webappName }}
+      webappName: ${{ needs.setup.outputs.webappName }}
       environmentHash: ${{ needs.setup.outputs.environmentHash }}
       slotName: ${{ needs.setup.outputs.slotName }}
       e2eCosmosDbExists: ${{ needs.deploy.outputs.e2eCosmosDbExists }}
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index 051afadd8..df80b2cc0 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -12,13 +12,12 @@ jobs:
     with:
       environment: ${{ endsWith(github.ref,'refs/heads/main') && 'Main-Gov' || 'Develop' }}
       enableBicepDeployment: "true"
-      deployVnet: "false"
 
   execute-e2e-test:
     needs: [setup]
     uses: ./.github/workflows/reusable-e2e.yml
     with:
-      apiName: ${{ needs.setup.outputs.apiFunctionName }}
+      apiFunctionName: ${{ needs.setup.outputs.apiFunctionName }}
       slotName: ${{ needs.setup.outputs.slotName }}
       webappName: ${{ needs.setup.outputs.webappName }}
       stackName: ${{ needs.setup.outputs.stackName }}
diff --git a/.github/workflows/reusable-backend-slot.yml b/.github/workflows/reusable-backend-slot.yml
index 696a58a99..af6badd42 100644
--- a/.github/workflows/reusable-backend-slot.yml
+++ b/.github/workflows/reusable-backend-slot.yml
@@ -3,7 +3,7 @@ name: Azure Deployment - Backend Slot Creation
 on:
   workflow_call:
     inputs:
-      webAppName:
+      webappName:
         required: true
         type: string
       apiFunctionName:
diff --git a/.github/workflows/sub-deploy-code-slot.yml b/.github/workflows/sub-deploy-code-slot.yml
index 05bed12ea..f523c95f9 100644
--- a/.github/workflows/sub-deploy-code-slot.yml
+++ b/.github/workflows/sub-deploy-code-slot.yml
@@ -271,7 +271,12 @@ jobs:
           az functionapp stop -g ${{ steps.rgApp.outputs.out }} --name ${{ inputs.migrationFunctionName }} --slot ${{ inputs.slotName }}
 
   endpoint-test-application-post-swap:
-    needs: [swap-nodeapi-deployment-slot, swap-webapp-deployment-slot]
+    needs:
+      [
+        swap-nodeapi-deployment-slot,
+        swap-webapp-deployment-slot,
+        swap-migration-app-deployment-slot,
+      ]
     uses: ./.github/workflows/reusable-endpoint-test.yml
     with:
       stackName: ${{ inputs.stackName }}
diff --git a/.github/workflows/sub-deploy-slot-resources.yml b/.github/workflows/sub-deploy-slot-resources.yml
index 026fcaeea..e51cf7ae4 100644
--- a/.github/workflows/sub-deploy-slot-resources.yml
+++ b/.github/workflows/sub-deploy-slot-resources.yml
@@ -3,7 +3,7 @@ name: Azure Deployment - Backend Slot Creation
 on:
   workflow_call:
     inputs:
-      webAppName:
+      webappName:
         required: true
         type: string
       apiFunctionName:
@@ -31,7 +31,7 @@ jobs:
   deploy-frontend-slot-resources:
     uses: ./.github/workflows/reusable-frontend-slot.yml
     with:
-      webAppName: ${{ inputs.webAppName }}
+      webappName: ${{ inputs.webappName }}
       apiFunctionName: ${{ inputs.apiFunctionName }}
       ghaEnvironment: ${{ inputs.ghaEnvironment }}
       azResourceGrpAppEncrypted: ${{ inputs.azResourceGrpAppEncrypted }}
@@ -42,7 +42,7 @@ jobs:
   deploy-backend-slot-resources:
     uses: ./.github/workflows/reusable-backend-slot.yml
     with:
-      webAppName: ${{ inputs.webAppName }}
+      webappName: ${{ inputs.webappName }}
       apiFunctionName: ${{ inputs.apiFunctionName }}
       migrationFunctionName: ${{ inputs.migrationFunctionName }}
       ghaEnvironment: ${{ inputs.ghaEnvironment }}
diff --git a/.github/workflows/sub-deploy.yml b/.github/workflows/sub-deploy.yml
index d8374fab4..bcdcc0d6b 100644
--- a/.github/workflows/sub-deploy.yml
+++ b/.github/workflows/sub-deploy.yml
@@ -21,7 +21,7 @@ on:
       migrationFunctionName:
         required: true
         type: string
-      webAppName:
+      webappName:
         required: true
         type: string
       environmentHash:
@@ -81,7 +81,7 @@ jobs:
     needs: [deploy-infra]
     if: ((github.ref == 'refs/heads/main') || (inputs.deployBranch == 'true'))
     with:
-      webAppName: ${{ inputs.webappName }}
+      webappName: ${{ inputs.webappName }}
       apiFunctionName: ${{ inputs.apiFunctionName }}
       migrationFunctionName: ${{ inputs.migrationFunctionName }}
       ghaEnvironment: ${{ inputs.ghaEnvironment }}
diff --git a/test/e2e/playwright/consolidation-orders.spec.ts b/test/e2e/playwright/consolidation-orders.spec.ts
index 39d3dd27d..4be0eb6a5 100644
--- a/test/e2e/playwright/consolidation-orders.spec.ts
+++ b/test/e2e/playwright/consolidation-orders.spec.ts
@@ -32,7 +32,7 @@ test.describe('Consolidation Orders', () => {
     await logout(page);
   });
 
-  test.skip('should select correct consolidationType radio when approving a consolidation', async ({
+  test('should select correct consolidationType radio when approving a consolidation', async ({
     page,
   }) => {
     // get pending consolidation order id
@@ -97,7 +97,7 @@ test.describe('Consolidation Orders', () => {
     );
   });
 
-  test.skip('should open case-not-listed form, fill form and click validate button', async ({
+  test('should open case-not-listed form, fill form and click validate button', async ({
     page,
   }) => {
     // get pending consolidation order id