MLPAB-1997 Fix attorney fixture when trust corporation wanting an ema…

…il (#1237) Also run cypress tests on image for weblate PRs
ministryofjustice · May 16, 2024 · 23d64d1 · 23d64d1
1 parent 92496df
commit 23d64d1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/workflow_pr.yml b/.github/workflows/workflow_pr.yml
@@ -97,7 +97,6 @@ jobs:
     with:
       run_against_image: true
       tag: ${{ needs.create_tags.outputs.version_tag }}
-      skip: ${{ contains(fromJSON('["weblate-pr"]'), github.head_ref) }}
       specs: 'cypress/e2e/**/*.cy.js'
     secrets:
       aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID_ACTIONS }}

diff --git a/internal/page/fixtures/attorney.go b/internal/page/fixtures/attorney.go
@@ -182,14 +182,11 @@ func Attorney(
 		}
 
 		if email != "" {
-			if isTrustCorporation {
-				if isReplacement {
-					donorDetails.ReplacementAttorneys.TrustCorporation.Email = email
-				} else {
-					donorDetails.Attorneys.TrustCorporation.Email = email
-				}
-			}
-			if isReplacement {
+			if isTrustCorporation && isReplacement {
+				donorDetails.ReplacementAttorneys.TrustCorporation.Email = email
+			} else if isTrustCorporation {
+				donorDetails.Attorneys.TrustCorporation.Email = email
+			} else if isReplacement {
 				donorDetails.ReplacementAttorneys.Attorneys[0].Email = email
 			} else {
 				donorDetails.Attorneys.Attorneys[0].Email = email