Mount a Docker volume inside the container.
- @if ($isSwarm)
- Swarm Mode detected: You need to set a shared
- volume
- (EFS/NFS/etc) on all the worker nodes if you would like to use a
- persistent
- volumes.
- @endif
- @if ($isSwarm)
-
- @else
-
- @endif
diff --git a/resources/views/livewire/project/shared/storages/all.blade.php b/resources/views/livewire/project/shared/storages/all.blade.php
index 25a4fd749..dbe21fd7b 100644
--- a/resources/views/livewire/project/shared/storages/all.blade.php
+++ b/resources/views/livewire/project/shared/storages/all.blade.php
@@ -154,7 +154,24 @@ class="volumes-col-actions volumes-cell-actions flex flex-wrap items-center just
Source Path
-
+ @if (filled($form['hostPath']))
+
+ @else
+
-
+ @endif
diff --git a/tests/Browser/LoginTest.php b/tests/Browser/LoginTest.php
deleted file mode 100644
index d20e65294..000000000
--- a/tests/Browser/LoginTest.php
+++ /dev/null
@@ -1,27 +0,0 @@
-browse(callback: function (Browser $browser) {
- $browser->loginWithRootUser()
- ->assertPathIs('/')
- ->assertSee('Dashboard');
- });
- }
-}
diff --git a/tests/Browser/Project/ProjectAddNewTest.php b/tests/Browser/Project/ProjectAddNewTest.php
deleted file mode 100644
index b03313e4b..000000000
--- a/tests/Browser/Project/ProjectAddNewTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-browse(function (Browser $browser) {
- $browser->loginWithRootUser()
- ->visit('/projects')
- ->pressAndWaitFor('+ Add', 1)
- ->assertSee('New Project')
- ->screenshot('project-add-new-1')
- ->type('name', 'Test Project')
- ->screenshot('project-add-new-2')
- ->press('Continue')
- ->assertSee('Test Project.')
- ->screenshot('project-add-new-3');
- });
- }
-}
diff --git a/tests/Browser/Project/ProjectSearchTest.php b/tests/Browser/Project/ProjectSearchTest.php
deleted file mode 100644
index 7bc6796d1..000000000
--- a/tests/Browser/Project/ProjectSearchTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-browse(function (Browser $browser) {
- $browser->loginWithRootUser()
- ->visit('/projects')
- ->type('[x-model="search"]', 'joi43j4oi32j4o2')
- ->assertSee('No project found with the search term "joi43j4oi32j4o2".')
- ->screenshot('project-search-not-found');
- });
- }
-}
diff --git a/tests/Browser/Project/ProjectTest.php b/tests/Browser/Project/ProjectTest.php
deleted file mode 100644
index 0d360e460..000000000
--- a/tests/Browser/Project/ProjectTest.php
+++ /dev/null
@@ -1,27 +0,0 @@
-browse(function (Browser $browser) {
- $browser->loginWithRootUser()
- ->visit('/projects')
- ->assertSee('Projects');
- });
- }
-}
diff --git a/tests/Browser/console/.gitignore b/tests/Browser/console/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/tests/Browser/console/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/tests/Browser/source/.gitignore b/tests/Browser/source/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/tests/Browser/source/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/tests/DuskTestCase.php b/tests/DuskTestCase.php
deleted file mode 100644
index 98e90fa79..000000000
--- a/tests/DuskTestCase.php
+++ /dev/null
@@ -1,57 +0,0 @@
-addArguments(collect([
- $this->shouldStartMaximized() ? '--start-maximized' : '--window-size=1920,1080',
- ])->unless($this->hasHeadlessDisabled(), function (Collection $items) {
- return $items->merge([
- '--disable-gpu',
- '--headless=new',
- ]);
- })->all());
-
- return RemoteWebDriver::create(
- 'http://localhost:4444',
- DesiredCapabilities::chrome()->setCapability(
- ChromeOptions::CAPABILITY,
- $options
- )
- );
- }
-
- /**
- * Determine if the browser window should start maximized.
- */
- protected function baseUrl()
- {
- return 'http://localhost:8000';
- }
-}
diff --git a/tests/Feature/PersistentStorageVolumesLayoutTest.php b/tests/Feature/PersistentStorageVolumesLayoutTest.php
index b22d99891..99133d794 100644
--- a/tests/Feature/PersistentStorageVolumesLayoutTest.php
+++ b/tests/Feature/PersistentStorageVolumesLayoutTest.php
@@ -33,6 +33,7 @@
->and($css)->toMatch('/\.backup-table-grid\s*\{[^}]*min-width:\s*50rem;/');
});
+use App\Livewire\Project\Service\Storage;
use App\Livewire\Project\Service\VolumeBackup\Create as CreateServiceVolumeBackup;
use App\Livewire\Project\Shared\Storages\All;
use App\Models\Application;
@@ -206,6 +207,62 @@ function createApplicationWithVolume(array $applicationAttributes = [], array $v
->toMatch('/\.application-settings-form label\s*\{[^}]*font-size:\s*13px/s');
});
+it('keeps bind mount source paths out of the add volume form', function () {
+ $storageView = file_get_contents(resource_path('views/livewire/project/service/storage.blade.php'));
+ $volumesView = file_get_contents(resource_path('views/livewire/project/shared/storages/all.blade.php'));
+
+ expect($storageView)
+ ->not->toContain('id="host_path"')
+ ->not->toContain('Swarm Mode detected')
+ ->and($volumesView)
+ ->toMatch('/]*canGate="update"[^>]*:canResource="\$resource"/')
+ ->toContain('The next deployment will use a named Docker volume instead.')
+ ->toContain('Data from the existing host directory will not be copied to the named volume.');
+});
+
+it('creates named volumes without a host path in swarm mode', function () {
+ [$application] = createApplicationWithVolume();
+ $application->persistentStorages()->delete();
+
+ Livewire::test(Storage::class, ['resource' => $application])
+ ->set('isSwarm', true)
+ ->set('name', 'storage-app-data')
+ ->set('mount_path', '/data')
+ ->call('submitPersistentVolume')
+ ->assertHasNoErrors();
+
+ expect($application->persistentStorages()->first())
+ ->name->toBe($application->uuid.'-storage-app-data')
+ ->host_path->toBeNull();
+});
+
+it('uses a resource based default name for new volumes', function () {
+ [$application] = createApplicationWithVolume(['name' => 'Storage App']);
+
+ Livewire::test(Storage::class, ['resource' => $application])
+ ->assertSet('name', 'storage-app-data');
+});
+
+it('uses a valid fallback default volume name when the resource name has no slug characters', function () {
+ [$application] = createApplicationWithVolume(['name' => '---']);
+
+ Livewire::test(Storage::class, ['resource' => $application])
+ ->assertSet('name', 'volume-data');
+});
+
+it('removes existing bind mount source paths from the volume table', function () {
+ [$application, $volume] = createApplicationWithVolume(volumeAttributes: [
+ 'host_path' => '/srv/storage',
+ ]);
+
+ Livewire::test(All::class, ['resource' => $application])
+ ->assertSet("forms.{$volume->id}.hostPath", '/srv/storage')
+ ->call('clearHostPath', $volume->id)
+ ->assertHasNoErrors();
+
+ expect($volume->refresh()->host_path)->toBeNull();
+});
+
it('creates and exposes volume backups for service storage', function () {
$service = Service::factory()->create([
'environment_id' => $this->environment->id,