From e6c8eadc8cd2b2489229733a37b76b4922e54ebe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Mon, 15 Jan 2024 11:00:33 +0000
Subject: [PATCH] Improve test smtp mail E2E test

---
 tests/e2e/Scopes/Scope.php                    |  9 +++--
 .../Projects/ProjectsConsoleClientTest.php    | 35 ++++++++++++++-----
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/tests/e2e/Scopes/Scope.php b/tests/e2e/Scopes/Scope.php
index 14eb83897b..84eacdc91d 100644
--- a/tests/e2e/Scopes/Scope.php
+++ b/tests/e2e/Scopes/Scope.php
@@ -25,14 +25,19 @@ abstract class Scope extends TestCase
         $this->client = null;
     }
 
-    protected function getLastEmail(): array
+    protected function getLastEmail(int $limit = 1): array
     {
         sleep(3);
 
         $emails = json_decode(file_get_contents('http://maildev:1080/email'), true);
 
         if ($emails && is_array($emails)) {
-            return end($emails);
+            if($limit === 1) {
+                return end($emails);
+            } else {
+                $lastEmails = array_slice($emails, -1 * $limit);
+                return $lastEmails;
+            }
         }
 
         return [];
diff --git a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
index b58d387470..1dcdb443a8 100644
--- a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
+++ b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
@@ -579,25 +579,45 @@ class ProjectsConsoleClientTest extends Scope
 
     /**
      * @group smtpAndTemplates
-     * @depends testUpdateProjectSMTP
+     * @depends testCreateProject
      */
     public function testCreateProjectSMTPTests($data): array
     {
         $id = $data['projectId'];
-        $email = 'mailer@appwrite.io';
         $response = $this->client->call(Client::METHOD_POST, '/projects/' . $id . '/smtp/tests', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'email' => $email,
+            'emails' => [ 'testuser@appwrite.io', 'testusertwo@appwrite.io' ],
+            'senderEmail' => 'custommailer@appwrite.io',
+            'senderName' => 'Custom Mailer',
+            'replyTo' => 'reply@appwrite.io',
+            'host' => 'maildev',
+            'port' => 1025,
+            'username' => '',
+            'password' => '',
         ]);
 
         $this->assertEquals(204, $response['headers']['status-code']);
 
-        $lastEmail = $this->getLastEmail();
-var_dump($lastEmail);
-        $this->assertEquals($email, $lastEmail['to'][0]['address']);
-        $this->assertEquals('SMTP test email from Appwrite', $lastEmail['subject']);
+        $emails = $this->getLastEmail(2);
+        $this->assertCount(2, $emails);
+        $this->assertEquals('custommailer@appwrite.io', $emails[0]['from'][0]['address']);
+        $this->assertEquals('Custom Mailer', $emails[0]['from'][0]['name']);
+        $this->assertEquals('reply@appwrite.io', $emails[0]['replyTo'][0]['address']);
+        $this->assertEquals('Custom Mailer', $emails[0]['replyTo'][0]['name']);
+        $this->assertEquals('Custom SMTP email from Appwrite', $emails[0]['subject']);
+        $this->assertStringContainsStringIgnoringCase('good to go', $emails[0]['text']);
+        $this->assertStringContainsStringIgnoringCase('good to go', $emails[0]['html']);
+
+        $to = [
+            $emails[0]['to'][0]['address'],
+            $emails[1]['to'][0]['address']
+        ];
+        \sort($to);
+
+        $this->assertEquals('testuser@appwrite.io', $to[0]);
+        $this->assertEquals('testusertwo@appwrite.io', $to[1]);
 
         return $data;
     }
@@ -1686,7 +1706,6 @@ var_dump($lastEmail);
 
         foreach ($response['body'] as $key => $value) {
             if (\preg_match($pattern, $key)) {
-                \var_dump('Matched key: ' . $key);
                 $matches[$key] = $value;
             }
         }