CCM-10442: Test fixes

Author: chris-elliott-nhsd

infrastructure/terraform/components/sandbox/README.md

@@ -47,8 +47,7 @@
 | <a name="output_sftp_poll_lambda_name"></a> [sftp\_poll\_lambda\_name](#output\_sftp\_poll\_lambda\_name) | n/a |
 | <a name="output_templates_table_name"></a> [templates\_table\_name](#output\_templates\_table\_name) | n/a |
 | <a name="output_test_email_bucket_name"></a> [test\_email\_bucket\_name](#output\_test\_email\_bucket\_name) | n/a |
-| <a name="output_test_proof_requested_email_prefix"></a> [test\_proof\_requested\_email\_prefix](#output\_test\_proof\_requested\_email\_prefix) | n/a |
-| <a name="output_test_template_submitted_email_prefix"></a> [test\_template\_submitted\_email\_prefix](#output\_test\_template\_submitted\_email\_prefix) | n/a |
+| <a name="output_test_email_bucket_prefix"></a> [test\_email\_bucket\_prefix](#output\_test\_email\_bucket\_prefix) | n/a |
 <!-- vale on -->
 <!-- markdownlint-enable -->
 <!-- END_TF_DOCS -->

infrastructure/terraform/components/sandbox/locals.tf

@@ -1,21 +1,6 @@
 locals {
-  mock_letter_supplier_name = "WTMMOCK"
-
-  use_sftp_letter_supplier_mock = lookup(var.letter_suppliers, local.mock_letter_supplier_name, null) != null
-
   email_domain                                           = "sandbox.${local.acct.dns_zone["name"]}"
   sandbox_letter_supplier_mock_proof_requested_sender    = "proof-requested-sender-${var.environment}@${local.email_domain}"
   sandbox_letter_supplier_mock_template_submitted_sender = "template-submitted-sender-${var.environment}@${local.email_domain}"
   sandbox_letter_supplier_mock_recipient                 = "supplier-recipient-${var.environment}@${local.email_domain}"
-
-  # var.letter_suppliers is defined at a point where we don't know what the environment is, so
-  # we need to add the environment-dependent test recipient separately here
-  letter_suppliers = local.use_sftp_letter_supplier_mock ? merge(
-    var.letter_suppliers,
-    { WTMMOCK = {
-      email_addresses  = concat(var.letter_suppliers.WTMMOCK.email_addresses, [local.sandbox_letter_supplier_mock_recipient])
-      enable_polling   = true
-      default_supplier = true
-    } }
-  ) : var.letter_suppliers
 }

infrastructure/terraform/components/sandbox/module_backend_api.tf

@@ -18,7 +18,13 @@ module "backend_api" {
   }
 
   enable_proofing  = true
-  letter_suppliers = local.letter_suppliers
+  letter_suppliers = {
+    WTMMOCK = {
+      email_addresses  = concat(var.letter_suppliers.WTMMOCK.email_addresses, [local.sandbox_letter_supplier_mock_recipient])
+      enable_polling   = true
+      default_supplier = true
+    }
+  }
 
   kms_key_arn = data.aws_kms_key.sandbox.arn
 

infrastructure/terraform/components/sandbox/outputs.tf

@@ -62,11 +62,6 @@ output "test_email_bucket_name" {
   value = local.acct["ses_testing_config"].bucket_name
 }
 
-output "test_proof_requested_email_prefix" {
-  value = "proof-requested-emails-${var.environment}"
-}
-
-
-output "test_template_submitted_email_prefix" {
-  value = "template-submitted-emails-${var.environment}"
+output "test_email_bucket_prefix" {
+  value = "emails-${var.environment}"
 }

…dbox/ses_receipt_rule_proof_requested.tf …m/components/sandbox/ses_receipt_rule.tfinfrastructure/terraform/components/sandbox/ses_receipt_rule_proof_requested.tf renamed to infrastructure/terraform/components/sandbox/ses_receipt_rule.tf infrastructure/terraform/components/sandbox/ses_receipt_rule_proof_requested.tf renamed to infrastructure/terraform/components/sandbox/ses_receipt_rule.tf

@@ -3,15 +3,15 @@ resource "aws_ses_receipt_rule" "proof_requested" {
   rule_set_name = local.acct["ses_testing_config"].rule_set_name
 
   # Despite being called "recipients", AWS appears to apply this check to the sender email
-  recipients    = [local.sandbox_letter_supplier_mock_proof_requested_sender]
+  recipients    = [local.sandbox_letter_supplier_mock_recipient]
   enabled       = true
   scan_enabled  = true
   tls_policy    = "Optional"
 
   s3_action {
     position          = 1
     bucket_name       = local.acct["ses_testing_config"].bucket_name
-    object_key_prefix = "proof-requested-emails-${var.environment}/"
+    object_key_prefix = "emails-${var.environment}/"
     iam_role_arn      = local.acct["ses_testing_config"].iam_role_arn
   }
 }

infrastructure/terraform/components/sandbox/ses_receipt_rule_template_submitted.tf

@@ -14,8 +14,7 @@ declare global {
       TEMPLATES_INTERNAL_BUCKET_NAME: string;
       TEMPLATES_QUARANTINE_BUCKET_NAME: string;
       TEMPLATES_DOWNLOAD_BUCKET_NAME: string;
-      TEST_TEMPLATE_SUBMITTED_EMAIL_PREFIX: string;
-      TEST_PROOF_REQUESTED_EMAIL_PREFIX: string;
+      TEST_EMAIL_BUCKET_PREFIX: string;
     }
   }
 

tests/test-team/global.d.ts

@@ -54,7 +54,8 @@ export class EmailHelper {
   async getEmailForTemplateId(
     prefix: string,
     templateId: string,
-    dateCutoff: Date
+    dateCutoff: Date,
+    extraTextToSearch: string,
   ) {
     const s3Items = await this.getAllS3Items(prefix);
 
@@ -82,7 +83,7 @@ export class EmailHelper {
 
       const content = await streamToString(Body);
 
-      if (content.includes(templateId)) {
+      if (content.includes(templateId) && content.includes(extraTextToSearch)) {
         return content;
       }
     }

tests/test-team/helpers/email-helper.ts

@@ -200,9 +200,10 @@ test.describe('POST /v1/template/:templateId/submit', () => {
 
       await expect(async () => {
         const emailContents = await emailHelper.getEmailForTemplateId(
-          process.env.TEST_TEMPLATE_SUBMITTED_EMAIL_PREFIX,
+          process.env.TEST_EMAIL_BUCKET_PREFIX,
           templateId,
-          start
+          start,
+          'template-submitted-sender'
         );
 
         expect(emailContents).toContain(templateId);

tests/test-team/template-mgmt-api-tests/submit-template.api.spec.ts

@@ -260,20 +260,22 @@ function submit(
 function checkEmail(
   expandedTemplateId: string,
   testStart: Date,
-  prefix: string,
-  emailTitle: string
+  emailTitle: string,
+  extraTextToSearch: string,
 ) {
   return test.step('check email', async () => {
     await expect(async () => {
       const emailContents = await emailHelper.getEmailForTemplateId(
-        prefix,
+        process.env.TEST_EMAIL_BUCKET_PREFIX,
         expandedTemplateId,
-        testStart
+        testStart,
+        extraTextToSearch,
       );
 
       expect(emailContents).toContain(expandedTemplateId);
       expect(emailContents).toContain('Valid Letter Template'); // template name
       expect(emailContents).toContain(emailTitle);
+      expect(emailContents).toContain(extraTextToSearch);
     }).toPass({ timeout: 60_000 });
   });
 }
@@ -322,17 +324,17 @@ test.describe('letter complete e2e journey', () => {
     await checkEmail(
       expandedTemplateId,
       testStart,
-      process.env.TEST_PROOF_REQUESTED_EMAIL_PREFIX,
-      'Proof Requested'
+      'Proof Requested',
+      'proof-requested-sender',
     );
 
     await submit(page, templateStorageHelper, templateKey);
 
     await checkEmail(
       expandedTemplateId,
       testStart,
-      process.env.TEST_TEMPLATE_SUBMITTED_EMAIL_PREFIX,
-      'Template Submitted'
+      'Template Submitted',
+      'template-submitted-sender',
     );
   });