fix(previews): keep custom preview domains on redeploy

Closes #6536 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 21:18:11 -04:00 · 2026-10-24 23:42:19 +02:00
parent 79cf62323a
commit 7654e8d3a9
4 changed files with 141 additions and 6 deletions
@@ -1113,3 +1113,102 @@ it('does not queue file sync jobs when polling dns checks for compose previews',
        ->and(Queue::pushed(ServerFilesFromServerJob::class))->toHaveCount(1)
        ->and($component->get('composeServices'))->toBe(['web', 'api']);
 });
+
+it('keeps custom preview domains and port overrides on redeploy', function () {
+    $this->application->update([
+        'fqdn' => 'https://app.example.com',
+        'preview_url_template' => '{{pr_id}}.{{domain}}',
+    ]);
+    $preview = createPreviewForPortTests($this->application, 6536, [
+        'fqdn' => 'https://custom-one.example.com,https://custom-two.example.com',
+        'domain_port_overrides' => ['https://custom-two.example.com' => 9000],
+    ]);
+
+    // The deployment job keeps the stored preview domains.
+    $preview->fresh()->generate_preview_fqdn(keepExistingDomains: true);
+
+    expect($preview->fresh()->fqdn)->toBe('https://custom-one.example.com,https://custom-two.example.com')
+        ->and($preview->fresh()->domain_port_overrides)->toBe(['https://custom-two.example.com' => 9000]);
+
+    // Without the flag (the "Generate domain" action), the template replaces them.
+    $preview->fresh()->generate_preview_fqdn();
+
+    expect($preview->fresh()->fqdn)->toBe('https://6536.app.example.com')
+        ->and($preview->fresh()->domain_port_overrides)->toBeNull();
+});
+
+it('moves a port from a kept legacy preview domain into the overrides', function () {
+    $this->application->update(['fqdn' => 'https://app.example.com']);
+    $preview = createPreviewForPortTests($this->application, 6537, [
+        'fqdn' => 'https://custom.example.com:3000',
+    ]);
+
+    $preview->generate_preview_fqdn(keepExistingDomains: true);
+
+    expect($preview->fresh()->fqdn)->toBe('https://custom.example.com')
+        ->and($preview->fresh()->domain_port_overrides)->toBe(['https://custom.example.com' => 3000]);
+});
+
+it('generates a domain on redeploy when the preview has none', function () {
+    $this->application->update([
+        'fqdn' => 'https://app.example.com',
+        'preview_url_template' => '{{pr_id}}.{{domain}}',
+    ]);
+    $preview = createPreviewForPortTests($this->application, 6538);
+
+    $preview->generate_preview_fqdn(keepExistingDomains: true);
+
+    expect($preview->fresh()->fqdn)->toBe('https://6538.app.example.com');
+});
+
+it('keeps custom compose preview domains on redeploy and fills empty services', function () {
+    $this->application->update([
+        'build_pack' => 'dockercompose',
+        'preview_url_template' => '{{pr_id}}.{{domain}}',
+        'docker_compose_raw' => "services:\n  frontend:\n    image: nginx:alpine\n  backend:\n    image: nginx:alpine\n",
+        'docker_compose_domains' => json_encode([
+            'frontend' => ['domain' => 'https://app.example.com'],
+            'backend' => ['domain' => 'https://api.example.com:3001'],
+        ]),
+    ]);
+    $preview = createPreviewForPortTests($this->application->fresh(), 6539, [
+        'docker_compose_domains' => json_encode([
+            'frontend' => ['domain' => 'https://custom.example.com'],
+            'backend' => ['domain' => ''],
+        ]),
+        'domain_port_overrides' => ['https://custom.example.com' => 8080],
+    ]);
+
+    $preview->generate_preview_fqdn_compose(keepExistingDomains: true);
+    $preview->refresh();
+
+    expect(json_decode($preview->docker_compose_domains, true))->toBe([
+        'frontend' => ['domain' => 'https://custom.example.com'],
+        'backend' => ['domain' => 'https://6539.api.example.com'],
+    ])
+        ->and($preview->fqdn)->toBe('https://custom.example.com,https://6539.api.example.com')
+        ->and($preview->domain_port_overrides)->toBe([
+            'https://custom.example.com' => 8080,
+            'https://6539.api.example.com' => 3001,
+        ]);
+
+    $preview->generate_preview_fqdn_compose();
+
+    expect(json_decode($preview->fresh()->docker_compose_domains, true)['frontend']['domain'])->toBe('https://6539.app.example.com');
+});
+
+it('replaces a custom preview domain when the generate action runs', function () {
+    $this->application->update([
+        'fqdn' => 'https://app.example.com',
+        'preview_url_template' => '{{pr_id}}.{{domain}}',
+    ]);
+    $preview = createPreviewForPortTests($this->application, 6540, [
+        'fqdn' => 'https://custom.example.com',
+    ]);
+
+    Livewire::test(PreviewDomains::class, ['preview' => $preview])
+        ->call('generateDomain')
+        ->assertHasNoErrors();
+
+    expect($preview->fresh()->fqdn)->toBe('https://6540.app.example.com');
+});