mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-05-04 21:25:58 +00:00
Merge remote-tracking branch 'origin/thumbnails_queue' into subscription
# Conflicts: # public/mix-manifest.json # src/Domain/Files/Models/File.php # webpack.mix.js
This commit is contained in:
@@ -53,10 +53,13 @@ class FileTest extends TestCase
|
||||
"chunks/$file->basename"
|
||||
);
|
||||
|
||||
collect(config('vuefilemanager.image_sizes'))
|
||||
collect([
|
||||
config('vuefilemanager.image_sizes.later'),
|
||||
config('vuefilemanager.image_sizes.immediately'),
|
||||
])
|
||||
->collapse()
|
||||
->each(
|
||||
fn ($item) =>
|
||||
$disk->assertExists(
|
||||
fn($item) => $disk->assertExists(
|
||||
"files/{$user->id}/{$item['name']}-{$file->basename}"
|
||||
)
|
||||
);
|
||||
|
||||
@@ -622,8 +622,10 @@ class TeamManagementTest extends TestCase
|
||||
// Put fake image into correct directory
|
||||
Storage::putFileAs("files/$member->id", $fakeFile, $fakeFile->name);
|
||||
|
||||
$thumbnail_sizes = collect([config('vuefilemanager.image_sizes.later'), config('vuefilemanager.image_sizes.immediately')])->collapse();
|
||||
|
||||
// Create fake image thumbnails
|
||||
collect(config('vuefilemanager.image_sizes'))
|
||||
$thumbnail_sizes
|
||||
->each(function ($item) use ($member) {
|
||||
$fakeFile = UploadedFile::fake()
|
||||
->create("{$item['name']}-fake-image.jpeg", 2000, 'image/jpeg');
|
||||
@@ -651,7 +653,7 @@ class TeamManagementTest extends TestCase
|
||||
Storage::assertExists("files/$user->id/fake-file.zip");
|
||||
|
||||
// Assert if image thumbnails was moved correctly to the new destination
|
||||
collect(config('vuefilemanager.image_sizes'))
|
||||
$thumbnail_sizes
|
||||
->each(function ($item) use ($user) {
|
||||
Storage::assertExists("files/$user->id/{$item['name']}-fake-image.jpeg");
|
||||
});
|
||||
|
||||
@@ -109,12 +109,17 @@ class TrashTest extends TestCase
|
||||
|
||||
$disk = Storage::disk('local');
|
||||
|
||||
$thumbnail_sizes = collect(config('vuefilemanager.image_sizes'))->collapse()->all();
|
||||
|
||||
$disk->assertMissing(
|
||||
"files/$user->id/fake-image.jpg"
|
||||
);
|
||||
|
||||
$disk->assertMissing(
|
||||
"files/$user->id/thumbnail-fake-image.jpg"
|
||||
);
|
||||
foreach($thumbnail_sizes as $size) {
|
||||
$disk->assertMissing(
|
||||
"files/$user->id/{$size['name']}-fake-image.jpg"
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user