-
@error($errorId ?? $id)
-
{{ $message }}
+ @php
+ preg_match('/(https?:\/\/\S+)$/', $message, $validationLinkMatches);
+ $validationLink = $validationLinkMatches[1] ?? null;
+ @endphp
+
+ @if ($validationLink)
+ {{ str($message)->beforeLast($validationLink)->trim() }}
+ Set them here.
+ @else
+ {{ $message }}
+ @endif
+
@enderror
diff --git a/resources/views/livewire/storage/create.blade.php b/resources/views/livewire/storage/create.blade.php
index dd6b1d687..1154a7e90 100644
--- a/resources/views/livewire/storage/create.blade.php
+++ b/resources/views/livewire/storage/create.blade.php
@@ -7,18 +7,8 @@
-
+ @can('update', $storage)
+
+ @else
+
+ @endcan
diff --git a/tests/Feature/SplitUrlInputTest.php b/tests/Feature/SplitUrlInputTest.php
new file mode 100644
index 000000000..5bfa0feb6
--- /dev/null
+++ b/tests/Feature/SplitUrlInputTest.php
@@ -0,0 +1,39 @@
+
+ BLADE);
+
+ expect($html)
+ ->toContain('Host')
+ ->toContain('minio.internal or 192.168.1.50')
+ ->toContain("scheme: 'https'")
+ ->toContain("host: ''")
+ ->toContain("port: ''")
+ ->toContain("path: ''");
+});
+
+it('keeps validation errors attached to the composed endpoint', function () {
+ $settingsUrl = route('settings.advanced').'#endpoint-section';
+ $errors = new ViewErrorBag;
+ $errors->put('default', new MessageBag([
+ 'endpoint' => "The endpoint is invalid. Configure allowed internal targets: {$settingsUrl}",
+ ]));
+ View::share('errors', $errors);
+
+ $html = Blade::render('
');
+
+ expect($html)
+ ->toContain('The endpoint is invalid.')
+ ->toContain('href="'.$settingsUrl.'"')
+ ->toContain('Set them here.');
+});
diff --git a/tests/Unit/S3StorageEndpointNormalizationTest.php b/tests/Unit/S3StorageEndpointNormalizationTest.php
index 860fbe731..ee2ecc04a 100644
--- a/tests/Unit/S3StorageEndpointNormalizationTest.php
+++ b/tests/Unit/S3StorageEndpointNormalizationTest.php
@@ -5,14 +5,18 @@ use Tests\TestCase;
uses(TestCase::class);
-it('normalizes S3 endpoints without a Livewire blur request', function () {
- $view = file_get_contents(resource_path('views/livewire/storage/create.blade.php'));
+it('uses the shared split URL input without a Livewire blur request', function () {
+ $createView = file_get_contents(resource_path('views/livewire/storage/create.blade.php'));
+ $editView = file_get_contents(resource_path('views/livewire/storage/form.blade.php'));
- expect($view)
+ expect($createView)
->not->toContain('wire:model.blur="endpoint"')
- ->toContain('x-on:blur')
- ->toContain('const hasScheme')
- ->toContain('dispatchEvent');
+ ->toContain('
toContain('host-label="Host"')
+ ->toContain('host-placeholder="minio.internal or 192.168.1.50"')
+ ->and($editView)
+ ->toContain('toContain('@can(\'update\', $storage)');
});
it('normalizes endpoints again on the backend', function (string $endpoint, string $expected) {
diff --git a/tests/Unit/StopActionsPersistStatusTest.php b/tests/Unit/StopActionsPersistStatusTest.php
new file mode 100644
index 000000000..a924381bb
--- /dev/null
+++ b/tests/Unit/StopActionsPersistStatusTest.php
@@ -0,0 +1,40 @@
+toContain("'status' => 'exited'");
+});
+
+it('persists exited status for every full application stop path', function () {
+ $action = file_get_contents(__DIR__.'/../../app/Actions/Application/StopApplication.php');
+
+ expect($action)
+ ->toContain("\$status = ['status' => 'exited'];")
+ ->toContain('$application->update($status);')
+ ->not->toMatch('/docker stack rm .*?return;/s');
+});
+
+it('persists exited status for all children when stopping a service', function () {
+ $action = file_get_contents(__DIR__.'/../../app/Actions/Service/StopService.php');
+
+ expect($action)
+ ->toContain("\$applications->each->update(['status' => 'exited']);")
+ ->toContain("\$dbs->each->update(['status' => 'exited']);");
+});
+
+it('persists exited status when stopping an individual service resource', function () {
+ $action = file_get_contents(__DIR__.'/../../app/Actions/Service/StopServiceApplication.php');
+
+ expect($action)
+ ->toContain("\$serviceApplication->update(['status' => 'exited']);")
+ ->toContain('ServiceStatusChanged::dispatch($service->environment->project->team->id);');
+});
+
+it('persists exited status when stopping a preview deployment', function () {
+ $component = file_get_contents(__DIR__.'/../../app/Livewire/Project/Application/Previews.php');
+
+ expect($component)
+ ->toContain("->update(['status' => 'exited']);")
+ ->toContain('ServiceStatusChanged::dispatch($this->application->environment->project->team->id);');
+});