bug/10301-rachael-detox-fix-error-in-e2e-mapping (#10302)

department-of-veterans-affairs · Dec 4, 2024 · b4f65c3 · b4f65c3
1 parent f4de77a
commit b4f65c3
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 21 deletions.
diff --git a/.github/workflows/e2e_detox_mapping.yml b/.github/workflows/e2e_detox_mapping.yml
@@ -60,6 +60,8 @@ jobs:
       - name: Check if directory/file is in detox mapping
         id: detox_mapping_check
         run: |
+          directoryFound="false"
+          noFileFound="false"
           fileNames=$(jq -r '.files' ${{ github.workspace }}/VAMobile/e2e/detoxMapping.json)
           directoryNames=$(jq -r '.directory' ${{ github.workspace }}/VAMobile/e2e/detoxMapping.json)
           for file in ${{steps.changed_files_file_name.outputs.all_changed_and_modified_files}}; do
@@ -68,15 +70,21 @@ jobs:
             fileFound=$(echo $fileNames | jq --arg fileName "$baseFile" '.[$fileName]')
             if [[ "$fileFound" == "null" ]]; then
               fileDirectory=$(dirname $file)
-              baseDirectory=$(echo $fileDirectory | sed 's#.*/##')
-              baseDirectory=$(echo $baseDirectory | sed 's/ //g')
-              directoryFound=$(echo $directoryNames | jq --arg fileName "$baseDirectory" '.[$fileName]')
-              if [[ "$directoryFound" == "null" ]]; then
+              for directory in $(echo $directoryNames | jq -r 'keys | .[]'); do
+                if [[ $fileDirectory =~ $directory ]]; then
+                  directoryFound="true"
+                  break
+                fi
+              done
+              if [[ "$directoryFound" == "false" ]]; then
                 echo "Missing File: $file or missing directory: $fileDirectory"
-                exit 1
+                noFileFound="true"
               fi
             fi
           done
+          if [[ "$noFileFound" == "true" ]]; then
+            exit 1
+          fi
       - name: Check if directory/file is spelled correctly
         id: detox_mapping_spell_check
         run: |
@@ -131,17 +139,20 @@ jobs:
             fileFound=$(echo $fileNames | jq --arg fileName "$baseFile" '.[$fileName]')
             if [[ "$fileFound" == "null" ]]; then
               fileDirectory=$(dirname $file)
-              baseDirectory=$(echo $fileDirectory | sed 's#.*/##')
-              baseDirectory=$(echo $baseDirectory | sed 's/ //g')
-              directoryFound=$(echo $directoryNames | jq --arg fileName "$baseDirectory" '.[$fileName]')
-              if [[ "$firstInstanceFile" == "true" ]]; then
-                test_matrix=$directoryFound
-                test_matrix=$(echo $test_matrix | jq -c '.')
-                firstInstanceFile="false"
-              else
-                test_matrix=$(echo $test_matrix | jq -c '.')
-                test_matrix=$(echo $test_matrix | jq --argjson matrix "$directoryFound" '. += $matrix')
-              fi
+              for directory in $(echo $directoryNames | jq -r 'keys | .[]'); do
+                if [[ "$fileDirectory" =~ "$directory" ]]; then
+                  directoryFound=$(echo $directoryNames | jq --arg fileName "$directory" -r '.[$fileName]')
+                  if [[ "$firstInstanceFile" == "true" ]]; then
+                    test_matrix=$directoryFound
+                    test_matrix=$(echo $test_matrix | jq -c '.')
+                    firstInstanceFile="false"
+                  else
+                    test_matrix=$(echo $test_matrix | jq -c '.')
+                    test_matrix=$(echo $test_matrix | jq --argjson matrix "$directoryFound" '. += $matrix')
+                  fi
+                  break
+                fi
+              done
             else
               if [[ "$firstInstanceFile" == "true" ]]; then
                 test_matrix=$fileFound

diff --git a/VAMobile/e2e/detoxMapping.json b/VAMobile/e2e/detoxMapping.json
@@ -100,15 +100,12 @@
     "ClaimsScreen": ["Appeals", "AppealsExpanded", "Claims"],
     "DisabilityRatingsScreen": ["DisabilityRatings", "VeteranStatusCard"],
     "Letters": ["VALetters"],
-    "BenefitsScreen": ["DisabilityRatings", "Claims", "Appeals", "VALetters"],
-    "HealthScreen": ["Appointments", "AppointmentsExpanded", "Cerner", "Prescriptions", "Messages", "VaccineRecords"],
     "Appointments": ["Appointments", "AppointmentsExpanded"],
     "CernerAlert": ["Cerner"],
     "HealthHelp": ["Cerner"],
     "Pharmacy": ["Prescriptions"],
     "SecureMessaging": ["Messages"],
     "Vaccines": ["VaccineRecords"],
-    "HomeScreen": ["HomeScreen", "ProfileScreen", "VeteranStatusCard"],
     "ContactVAScreen": ["HomeScreen"],
     "ProfileScreen": [
       "ProfileScreen",
@@ -122,14 +119,17 @@
     "ContactInformationScreen": ["ContactInformation", "VALetters"],
     "MilitaryInformationScreen": ["MilitaryInformation", "VeteranStatusCard"],
     "PersonalInformationScreen": ["PersonalInformationScreen", "VeteranStatusCard", "HomeScreen", "ProfileScreen"],
-    "SettingsScreen": ["SettingsScreen"],
     "VeteransCrisisLineScreen": ["VeteransCrisisLine", "SignIn"],
     "VeteranStatusScreen": ["VeteranStatusCard"],
     "OnboardingCarousel": ["Onboarding"],
-    "PaymentsScreen": ["Payments", "DirectDeposit"],
     "DirectDepositScreen": ["DirectDeposit"],
     "PaymentHistory": ["Payments"],
     "SplashScreen": ["Onboarding", "LoginScreen"],
+    "BenefitsScreen": ["DisabilityRatings", "Claims", "Appeals", "VALetters"],
+    "HealthScreen": ["Appointments", "AppointmentsExpanded", "Cerner", "Prescriptions", "Messages", "VaccineRecords"],
+    "HomeScreen": ["HomeScreen", "ProfileScreen", "VeteranStatusCard"],
+    "SettingsScreen": ["SettingsScreen"],
+    "PaymentsScreen": ["Payments", "DirectDeposit"],
     "slices": [
       "Appeals",
       "AppealsExpanded",
@@ -368,6 +368,34 @@
       "VeteransCrisisLine",
       "VeteranStatusCard"
     ],
+    "App.tsx": [
+      "Appeals",
+      "AppealsExpanded",
+      "Appointments",
+      "AppointmentsExpanded",
+      "AvailabilityFramework",
+      "Cerner",
+      "Claims",
+      "ContactInformation",
+      "DecisionLetters",
+      "DirectDeposit",
+      "DisabilityRatings",
+      "HomeScreen",
+      "LoginScreen",
+      "Messages",
+      "MilitaryInformation",
+      "Navigation",
+      "Onboarding",
+      "Payments",
+      "PersonalInformationScreen",
+      "Prescriptions",
+      "ProfileScreen",
+      "SettingsScreen",
+      "VaccineRecords",
+      "VALetters",
+      "VeteransCrisisLine",
+      "VeteranStatusCard"
+    ],
     "analytics.ts": [],
     "backButtonLabels.ts": [],
     "documentTypes.ts": [],