Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/Assets/AssetContainer.php
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,6 @@ public function delete()
return true;
}

public function folders($folder = '/', $recursive = false)
{
return $this->disk()->getFolders($folder, $recursive);
}

public function metaFiles($folder = '/', $recursive = false)
{
// When requesting files() as-is, we want all of them.
Expand Down
59 changes: 59 additions & 0 deletions tests/Assets/AssetContainerTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?php

namespace Assets;

use Illuminate\Database\Events\QueryExecuted;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Storage;
use PHPUnit\Framework\Attributes\Test;
use Statamic\Facades;
use Tests\TestCase;

class AssetContainerTest extends TestCase
{
use RefreshDatabase;

private $container;

protected function setUp(): void
{
parent::setUp();

Storage::fake('test', ['url' => '/assets']);

$this->container = tap(Facades\AssetContainer::make('test')->disk('test'))->save();

Storage::disk('test')->put('a.jpg', '');
Facades\Asset::make()->container('test')->path('a.jpg')->save();

Storage::disk('test')->put('b.txt', '');
Facades\Asset::make()->container('test')->path('b.txt')->save();

Storage::disk('test')->put('c.txt', '');
Facades\Asset::make()->container('test')->path('c.txt')->save();

Storage::disk('test')->put('d.jpg', '');
Facades\Asset::make()->container('test')->path('d.jpg')->save();

Storage::disk('test')->put('e.jpg', '');
Facades\Asset::make()->container('test')->path('e.jpg')->save();

Storage::disk('test')->put('f.jpg', '');
Facades\Asset::make()->container('test')->path('f.jpg')->save();
}

#[Test]
public function calling_folders_uses_eloquent_asset_container_contents()
{
$this->expectsDatabaseQueryCount(1);

$queryExecuted = false;
\DB::listen(function (QueryExecuted $query) use (&$queryExecuted) {
$queryExecuted = str_contains($query->sql, 'select distinct "folder" from "assets_meta"');
});

$this->container->folders();

$this->assertTrue($queryExecuted);
}
}