Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve test coverage

Browse Source
This commit is contained in:
Matej Bačo
2026-04-20 16:11:22 +02:00
parent 848f09956e
commit dfec2b3cb7
3 changed files with 154 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Appwrite/Platform/Modules/Project/Http/Project/SMTP/Tests/Create.php
-4
View File
@@ -123,10 +123,6 @@ class Create extends Action
$secure = $smtp['secure'] ?? '';
}
if (empty($senderName)) {
throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'SMTP sender name must be configured on the project to send a test email.');
}
if (empty($senderEmail)) {
throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'SMTP sender email must be configured on the project to send a test email.');
}
src/Appwrite/Platform/Modules/Project/Http/Project/SMTP/Update.php
+4 -2
View File
@@ -115,7 +115,7 @@ class Update extends Action
}
// Validate SMTP credentials
if ($smtp['enabled'] === true) {
if (\is_null($smtp['enabled'] ?? null) || $smtp['enabled'] === true) {
$mail = new PHPMailer(true);
$mail->isSMTP();
@@ -150,7 +150,9 @@ class Update extends Action
$smtp['enabled'] = true;
}
} catch (Throwable $error) {
throw new Exception(Exception::PROJECT_SMTP_CONFIG_INVALID, $error->getMessage());
if (($smtp['enabled'] ?? null) === true) {
throw new Exception(Exception::PROJECT_SMTP_CONFIG_INVALID, $error->getMessage());
}
}
}
tests/e2e/Services/Project/SMTPBase.php
+150
View File
@@ -656,6 +656,156 @@ trait SMTPBase
$this->assertSame(false, $response['body']['smtpEnabled']);
}
public function testUpdateSMTPRequiredFieldsOptionalAfterConfigured(): void
{
// Seed with a known configuration so required fields (host, port, senderEmail) are stored.
$this->updateSMTP(
senderName: 'Initial Sender',
senderEmail: 'initial@example.com',
host: 'maildev',
port: 1025,
enabled: true,
);
// Partial update: only update senderName, omitting host/port/senderEmail.
// Required fields should not be re-required because they are already stored.
$response = $this->updateSMTP(senderName: 'Updated Sender');
$this->assertSame(200, $response['headers']['status-code']);
$this->assertSame('Updated Sender', $response['body']['smtpSenderName']);
$this->assertSame('initial@example.com', $response['body']['smtpSenderEmail']);
$this->assertSame('maildev', $response['body']['smtpHost']);
$this->assertSame(1025, $response['body']['smtpPort']);
// Cleanup
$this->updateSMTP(enabled: false);
}
public function testUpdateSMTPAllParamsOptionalAfterConfigured(): void
{
// Seed a configuration so all fields are stored.
$this->updateSMTP(
senderName: 'Test Sender',
senderEmail: 'sender@example.com',
host: 'maildev',
port: 1025,
enabled: true,
);
// Issue a PATCH with no params at all. Once previously configured, this must succeed.
$response = $this->updateSMTP();
$this->assertSame(200, $response['headers']['status-code']);
// Previously-set values are preserved
$this->assertSame('Test Sender', $response['body']['smtpSenderName']);
$this->assertSame('sender@example.com', $response['body']['smtpSenderEmail']);
$this->assertSame('maildev', $response['body']['smtpHost']);
$this->assertSame(1025, $response['body']['smtpPort']);
// Cleanup
$this->updateSMTP(enabled: false);
}
public function testUpdateSMTPEnabledTrueWithInvalidCredentials(): void
{
// Explicitly enabling SMTP with unreachable host/port must throw.
$response = $this->updateSMTP(
senderName: 'Test',
senderEmail: 'sender@example.com',
host: 'localhost',
port: 12345,
enabled: true,
);
$this->assertSame(400, $response['headers']['status-code']);
$this->assertSame('project_smtp_config_invalid', $response['body']['type']);
}
public function testUpdateSMTPEnabledFalseWithInvalidCredentials(): void
{
// enabled=false means SMTP is not in use, so invalid credentials must be accepted.
$response = $this->updateSMTP(
senderName: 'Test',
senderEmail: 'sender@example.com',
host: 'localhost',
port: 12345,
enabled: false,
);
$this->assertSame(200, $response['headers']['status-code']);
$this->assertSame(false, $response['body']['smtpEnabled']);
$this->assertSame('localhost', $response['body']['smtpHost']);
$this->assertSame(12345, $response['body']['smtpPort']);
// Cleanup (restore valid disabled config)
$this->updateSMTP(
senderName: 'Test Sender',
senderEmail: 'sender@example.com',
host: 'maildev',
port: 1025,
enabled: false,
);
}
public function testUpdateSMTPEnabledNullWithInvalidCredentialsDoesNotThrow(): void
{
// Ensure SMTP is currently disabled so we aren't enforcing validation on an enabled config.
$this->updateSMTP(
senderName: 'Test',
senderEmail: 'sender@example.com',
host: 'maildev',
port: 1025,
enabled: false,
);
// With enabled omitted (null) and invalid credentials, the request must not throw.
// SMTP remains disabled because the credentials could not be validated.
$response = $this->updateSMTP(
senderName: 'Test',
senderEmail: 'sender@example.com',
host: 'localhost',
port: 12345,
);
$this->assertSame(200, $response['headers']['status-code']);
$this->assertSame(false, $response['body']['smtpEnabled']);
// Cleanup (restore valid disabled config)
$this->updateSMTP(
senderName: 'Test Sender',
senderEmail: 'sender@example.com',
host: 'maildev',
port: 1025,
enabled: false,
);
}
public function testUpdateSMTPEnabledNullWithValidCredentialsAutoEnables(): void
{
// Start from a disabled state.
$this->updateSMTP(
senderName: 'Test Sender',
senderEmail: 'sender@example.com',
host: 'maildev',
port: 1025,
enabled: false,
);
// With enabled omitted (null) and valid credentials, SMTP must be auto-enabled.
$response = $this->updateSMTP(
senderName: 'Test Sender',
senderEmail: 'sender@example.com',
host: 'maildev',
port: 1025,
);
$this->assertSame(200, $response['headers']['status-code']);
$this->assertSame(true, $response['body']['smtpEnabled']);
// Cleanup
$this->updateSMTP(enabled: false);
}
// Create SMTP test tests
public function testCreateSMTPTest(): void