From bbdb9ba9d405a0dfcaa1ee94d1f4eb93461ded7f Mon Sep 17 00:00:00 2001 From: Chirag Aggarwal Date: Thu, 25 Jun 2026 17:13:45 +0530 Subject: [PATCH] Fix email template e2e test isolation --- tests/e2e/Services/Project/TemplatesBase.php | 64 ++++++++++++-------- 1 file changed, 38 insertions(+), 26 deletions(-) diff --git a/tests/e2e/Services/Project/TemplatesBase.php b/tests/e2e/Services/Project/TemplatesBase.php index 9e329dfc3b..40f93e19a4 100644 --- a/tests/e2e/Services/Project/TemplatesBase.php +++ b/tests/e2e/Services/Project/TemplatesBase.php @@ -221,27 +221,33 @@ trait TemplatesBase { $this->ensureSMTPEnabled(); + $runId = \uniqid(); + $firstSubject = "First subject {$runId}"; + $firstBody = "First body {$runId}"; + $secondSubject = "Second subject {$runId}"; + $secondBody = "Second body {$runId}"; + $first = $this->updateEmailTemplate( templateId: 'otpSession', locale: 'en', - subject: 'First subject', - message: 'First body', + subject: $firstSubject, + message: $firstBody, ); $this->assertSame(200, $first['headers']['status-code']); $second = $this->updateEmailTemplate( templateId: 'otpSession', locale: 'en', - subject: 'Second subject', - message: 'Second body', + subject: $secondSubject, + message: $secondBody, ); $this->assertSame(200, $second['headers']['status-code']); - $this->assertSame('Second subject', $second['body']['subject']); - $this->assertSame('Second body', $second['body']['message']); + $this->assertSame($secondSubject, $second['body']['subject']); + $this->assertSame($secondBody, $second['body']['message']); $get = $this->getEmailTemplate('otpSession', 'en'); - $this->assertSame('Second subject', $get['body']['subject']); - $this->assertSame('Second body', $get['body']['message']); + $this->assertSame($secondSubject, $get['body']['subject']); + $this->assertSame($secondBody, $get['body']['message']); } public function testUpdateEmailTemplatePartialAfterSeed(): void @@ -281,32 +287,36 @@ trait TemplatesBase { $this->ensureSMTPEnabled(); + $runId = \uniqid(); + $enSubject = "English subject {$runId}"; + $frSubject = "Sujet francais {$runId}"; + $enUpdate = $this->updateEmailTemplate( templateId: 'invitation', locale: 'en', - subject: 'English subject', + subject: $enSubject, message: 'English body', ); $this->assertSame(200, $enUpdate['headers']['status-code']); $this->assertSame('en', $enUpdate['body']['locale']); - $this->assertSame('English subject', $enUpdate['body']['subject']); + $this->assertSame($enSubject, $enUpdate['body']['subject']); $frUpdate = $this->updateEmailTemplate( templateId: 'invitation', locale: 'fr', - subject: 'Sujet francais', + subject: $frSubject, message: 'Corps francais', ); $this->assertSame(200, $frUpdate['headers']['status-code']); $this->assertSame('fr', $frUpdate['body']['locale']); - $this->assertSame('Sujet francais', $frUpdate['body']['subject']); + $this->assertSame($frSubject, $frUpdate['body']['subject']); // Locales remain independent. $enGet = $this->getEmailTemplate('invitation', 'en'); - $this->assertSame('English subject', $enGet['body']['subject']); + $this->assertSame($enSubject, $enGet['body']['subject']); $frGet = $this->getEmailTemplate('invitation', 'fr'); - $this->assertSame('Sujet francais', $frGet['body']['subject']); + $this->assertSame($frSubject, $frGet['body']['subject']); } public function testUpdateEmailTemplateResponseModel(): void @@ -729,19 +739,21 @@ trait TemplatesBase $response = $this->listEmailTemplates(); $this->assertSame(200, $response['headers']['status-code']); - $foundEn = false; - $foundFr = false; - foreach ($response['body']['templates'] as $template) { - if ($template['templateId'] === 'recovery' && $template['locale'] === 'en' && $template['subject'] === $enSubject) { - $foundEn = true; - } - if ($template['templateId'] === 'recovery' && $template['locale'] === 'fr' && $template['subject'] === $frSubject) { - $foundFr = true; - } - } + $foundEn = \array_filter( + $response['body']['templates'], + fn ($template) => $template['templateId'] === 'recovery' + && $template['locale'] === 'en' + && $template['subject'] === $enSubject + ); + $foundFr = \array_filter( + $response['body']['templates'], + fn ($template) => $template['templateId'] === 'recovery' + && $template['locale'] === 'fr' + && $template['subject'] === $frSubject + ); - $this->assertTrue($foundEn, 'recovery/en must appear in the list'); - $this->assertTrue($foundFr, 'recovery/fr must appear in the list'); + $this->assertNotEmpty($foundEn, 'recovery/en must appear in the list'); + $this->assertNotEmpty($foundFr, 'recovery/fr must appear in the list'); } public function testListEmailTemplatesUpdateDoesNotDuplicate(): void