+ @if ($fullButton)
+
+ Upgrade now
+
+
+ Updating…
+
+ @else
+ @endif
Coolify is up to date.
@endif
diff --git a/tests/Feature/Api/NotificationsApiTest.php b/tests/Feature/Api/NotificationsApiTest.php
index 647c327de..d6bb96d15 100644
--- a/tests/Feature/Api/NotificationsApiTest.php
+++ b/tests/Feature/Api/NotificationsApiTest.php
@@ -59,6 +59,7 @@ function authHeaders(string $token): array
$response->assertJsonStructure([
'team_id',
'smtp_enabled',
+ 'smtp_ehlo_domain',
'deployment_failure_email_notifications',
'use_instance_email_settings',
]);
@@ -171,6 +172,7 @@ function authHeaders(string $token): array
'smtp_enabled' => true,
'smtp_from_address' => 'alerts@example.com',
'smtp_host' => 'smtp.example.com',
+ 'smtp_ehlo_domain' => 'coolify.example.com',
'smtp_port' => 587,
'smtp_encryption' => 'starttls',
'deployment_failure_email_notifications' => false,
@@ -178,16 +180,42 @@ function authHeaders(string $token): array
$response->assertSuccessful();
$response->assertJsonPath('smtp_enabled', true);
+ $response->assertJsonPath('smtp_ehlo_domain', 'coolify.example.com');
$response->assertJsonPath('deployment_failure_email_notifications', false);
$settings = EmailNotificationSettings::query()->where('team_id', $this->team->id)->first();
expect($settings->smtp_enabled)->toBeTrue()
->and($settings->smtp_from_address)->toBe('alerts@example.com')
->and($settings->smtp_host)->toBe('smtp.example.com')
+ ->and($settings->smtp_ehlo_domain)->toBe('coolify.example.com')
->and($settings->smtp_port)->toBe(587)
->and($settings->deployment_failure_email_notifications)->toBeFalse();
});
+ test('validates the smtp ehlo domain', function () {
+ $this->withHeaders(authHeaders($this->bearerToken))
+ ->patchJson('/api/v1/notifications/email', [
+ 'smtp_ehlo_domain' => 'not a hostname',
+ ])
+ ->assertUnprocessable()
+ ->assertJsonValidationErrors('smtp_ehlo_domain');
+ });
+
+ test('clears the smtp ehlo domain', function () {
+ $this->team->emailNotificationSettings->update([
+ 'smtp_ehlo_domain' => 'coolify.example.com',
+ ]);
+
+ $this->withHeaders(authHeaders($this->bearerToken))
+ ->patchJson('/api/v1/notifications/email', [
+ 'smtp_ehlo_domain' => null,
+ ])
+ ->assertSuccessful()
+ ->assertJsonPath('smtp_ehlo_domain', null);
+
+ expect($this->team->emailNotificationSettings->fresh()->smtp_ehlo_domain)->toBeNull();
+ });
+
test('updates discord notification settings', function () {
$response = $this->withHeaders(authHeaders($this->bearerToken))
->patchJson('/api/v1/notifications/discord', [
diff --git a/tests/Feature/SwitchTeamTest.php b/tests/Feature/SwitchTeamTest.php
new file mode 100644
index 000000000..9c4724939
--- /dev/null
+++ b/tests/Feature/SwitchTeamTest.php
@@ -0,0 +1,32 @@
+ 0]);
+
+ $this->user = User::factory()->create();
+ $this->currentTeam = $this->user->teams()->first();
+ $this->otherTeam = Team::factory()->create();
+ $this->otherTeam->members()->attach($this->user->id, ['role' => 'owner']);
+
+ $this->actingAs($this->user);
+ session(['currentTeam' => $this->currentTeam]);
+});
+
+test('switching teams keeps the current page URL', function () {
+ $currentUrl = route('security.api-tokens', ['page' => 2]);
+
+ Livewire::test(SwitchTeam::class)
+ ->call('switch_to', $this->otherTeam->id, $currentUrl)
+ ->assertRedirect($currentUrl);
+
+ expect(session('currentTeam')->is($this->otherTeam))->toBeTrue();
+});
diff --git a/tests/Feature/UpgradeComponentTest.php b/tests/Feature/UpgradeComponentTest.php
index dc14516a5..306a486de 100644
--- a/tests/Feature/UpgradeComponentTest.php
+++ b/tests/Feature/UpgradeComponentTest.php
@@ -64,18 +64,34 @@
->not->toContain('Lost contact with Coolify');
});
-it('uses sidebar state css instead of nested alpine state for upgrade labels', function () {
+it('renders the upgrade control in the mobile top bar', function () {
+ $layout = file_get_contents(resource_path('views/layouts/app.blade.php'));
+
+ expect($layout)
+ ->toMatch('/MOBILE TOP BAR[\s\S]*?]*>[\s\S]*?Open sidebar/')
+ ->toContain('key="mobile-upgrade"');
+});
+
+it('supports a full size update button for settings', function () {
$upgradeView = file_get_contents(resource_path('views/livewire/upgrade.blade.php'));
- $utilitiesCss = file_get_contents(resource_path('css/utilities.css'));
+ $settingsView = file_get_contents(resource_path('views/livewire/settings/updates.blade.php'));
expect($upgradeView)
- ->toContain('class="text-left menu-item-label sidebar-collapsed-label"')
- ->toContain('>In progress')
- ->toContain('>Upgrade')
- ->not->toContain(':class="collapsed && \'lg:hidden\'"')
- ->and($utilitiesCss)
- ->toContain('.sidebar-collapsed .sidebar-collapsed-label')
- ->toContain('display: none;');
+ ->toContain('$fullButton')
+ ->toContain('Upgrade now')
+ ->and($settingsView)
+ ->toContain('Update Coolify')
+ ->toContain(':full-button="true"')
+ ->toContain('key="settings-upgrade"');
+});
+
+it('uses compact labels that do not depend on desktop sidebar state', function () {
+ $upgradeView = file_get_contents(resource_path('views/livewire/upgrade.blade.php'));
+
+ expect($upgradeView)
+ ->toContain('Updating')
+ ->toContain('Update available')
+ ->not->toContain(':class="collapsed');
});
it('falls back to 0.0.0 during mount when cached versions data is unavailable', function () {