nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-05 18:23:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

paginator refactoring and implementation into the routes

Browse Source
This commit is contained in:
Čarodej
2022-05-24 18:19:34 +02:00
parent 31218240ae
commit b9975de700
61 changed files with 1215 additions and 829 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/App/Restrictions/DefaultRestrictionsTest.php
View File

@@ -1,6 +1,9 @@
<?php
namespace Tests\App\Restrictions;
use Illuminate\Http\UploadedFile;
use Storage;
use Str;
use Tests\TestCase;
use App\Users\Models\User;
use Domain\Files\Models\File;
@@ -121,10 +124,15 @@ class DefaultRestrictionsTest extends TestCase
->hasSettings()
->create();
$file = UploadedFile::fake()
->create(Str::random() . '-fake-file.pdf', 1200, 'application/pdf');
Storage::putFileAs("files/$user->id", $file, $file->name);
$file = File::factory()
->create([
'user_id' => $user->id,
'basename' => 'fake-file.pdf',
'basename' => $file->name,
'name' => 'fake-file.pdf',
]);

10
tests/App/Restrictions/FixedBillingRestrictionsTest.php
View File

@@ -1,6 +1,9 @@
<?php
namespace Tests\App\Restrictions;
use Illuminate\Http\UploadedFile;
use Storage;
use Str;
use Tests\TestCase;
use App\Users\Models\User;
use Domain\Files\Models\File;
@@ -167,10 +170,15 @@ class FixedBillingRestrictionsTest extends TestCase
->hasSettings()
->create();
$file = UploadedFile::fake()
->create(Str::random() . '-fake-file.pdf', 1200, 'application/pdf');
Storage::putFileAs("files/$user->id", $file, $file->name);
$file = File::factory()
->create([
'user_id' => $user->id,
'basename' => 'fake-file.pdf',
'basename' => $file->name,
'name' => 'fake-file.pdf',
]);

17
tests/App/Restrictions/MeteredBillingRestrictionsTest.php
View File

@@ -1,6 +1,9 @@
<?php
namespace Tests\App\Restrictions;
use Illuminate\Http\UploadedFile;
use Illuminate\Support\Str;
use Storage;
use Tests\TestCase;
use App\Users\Models\User;
use Domain\Files\Models\File;
@@ -145,10 +148,15 @@ class MeteredBillingRestrictionsTest extends TestCase
->hasSettings()
->create();
$file = UploadedFile::fake()
->create(Str::random() . '-fake-file.pdf', 1200, 'application/pdf');
Storage::putFileAs("files/$user->id", $file, $file->name);
$file = File::factory()
->create([
'user_id' => $user->id,
'basename' => 'fake-file.pdf',
'basename' => $file->name,
'name' => 'fake-file.pdf',
]);
@@ -197,10 +205,15 @@ class MeteredBillingRestrictionsTest extends TestCase
->hasSettings()
->create();
$file = UploadedFile::fake()
->create(Str::random() . '-fake-file.pdf', 1200, 'application/pdf');
Storage::putFileAs("files/$user->id", $file, $file->name);
$file = File::factory()
->create([
'user_id' => $user->id,
'basename' => 'fake-file.pdf',
'basename' => $file->name,
'name' => 'fake-file.pdf',
]);

2
tests/App/Socialite/SocialiteTest.php
View File

@@ -19,7 +19,7 @@ class SocialiteTest extends TestCase
{
$response = $this->get('api/socialite/google/redirect');
$this->assertStringContainsString('accounts.google.com/o/oauth2/auth', $response['url']);
$this->assertStringContainsString('accounts.google.com/o/oauth2/auth', $response->json()['data']['url']);
}
/**

4
tests/App/Users/UserAccountTest.php
View File

@@ -203,9 +203,7 @@ class UserAccountTest extends TestCase
],
],
],
'favourites' => [
'data' => [],
],
'favourites' => [],
'readNotifications' => [
'data' => [],
],

4
tests/Domain/SetupWizard/SetupWizardTest.php
View File

@@ -50,7 +50,7 @@ class SetupWizardTest extends TestCase
'name' => 'database/test.sqlite',
'username' => 'null',
'password' => 'null',
])->assertStatus(204);
])->assertStatus(200);
}
/**
@@ -76,7 +76,7 @@ class SetupWizardTest extends TestCase
'logo_horizontal' => UploadedFile::fake()->image('fake-logo-horizontal.jpg'),
'logo_horizontal_dark' => UploadedFile::fake()->image('fake-logo-horizontal-dark.jpg'),
'favicon' => UploadedFile::fake()->image('fake-favicon.jpg'),
])->assertStatus(204);
])->assertStatus(200);
$this
->assertDatabaseHas('settings', [

4
tests/Domain/Teams/TeamsTest.php
View File

@@ -182,7 +182,7 @@ class TeamsTest extends TestCase
$this
->actingAs($user)
->getJson('/api/teams/folders/undefined')
->getJson('/api/teams/folders/all?page=1')
->assertOk()
->assertJsonFragment([
'id' => $folder->id,
@@ -255,7 +255,7 @@ class TeamsTest extends TestCase
$this
->actingAs($member)
->getJson('/api/teams/shared-with-me/undefined')
->getJson('/api/teams/shared-with-me/all?page=1')
->assertOk()
->assertJsonFragment([
'id' => $folders[0]->id,

31
tests/Support/Helpers/HelperTest.php
View File

@@ -53,17 +53,18 @@ class HelperTest extends TestCase
'parent_id' => null,
]);
$folderQuery = [
'parent_id' => null,
'team_folder' => false,
'user_id' => $user->id,
'deleted_at' => null,
];
$fileQuery = [
'parent_id' => null,
'user_id' => $user->id,
'deleted_at' => null,
$query = [
'folder' => [
'parent_id' => null,
'team_folder' => false,
'user_id' => $user->id,
'deleted_at' => null,
],
'file' => [
'parent_id' => null,
'user_id' => $user->id,
'deleted_at' => null,
],
];
Config::set('vuefilemanager.paginate.perPage', 5);
@@ -71,15 +72,15 @@ class HelperTest extends TestCase
// getRecordsCunt returned array [foldersTake, foldersSkip, filesTake, filesSkip, totalItemsCount]
// Get folders page
$this->assertEquals([5, 0, 0, 0, 25], getRecordsCount($folderQuery, $fileQuery, '1'));
$this->assertEquals([5, 0, 0, 0, 25], getRecordsCount($query, 1));
// Get mixed page
$this->assertEquals([2, 10, 3, 0, 25], getRecordsCount($folderQuery, $fileQuery, '3'));
$this->assertEquals([2, 10, 3, 0, 25], getRecordsCount($query, 3));
// Get files page
$this->assertEquals([0, 0, 5, 8, 25], getRecordsCount($folderQuery, $fileQuery, '5'));
$this->assertEquals([0, 0, 5, 8, 25], getRecordsCount($query, 5));
// Get all pages
$this->assertEquals([12, 0, 13, 0, 25], getRecordsCount($folderQuery, $fileQuery, 'all'));
$this->assertEquals([12, 0, 13, 0, 25], getRecordsCount($query));
}
}