diff --git a/app/Http/Controllers/Admin/LanguageController.php b/app/Http/Controllers/Admin/LanguageController.php index c71a2aff..678c43e0 100644 --- a/app/Http/Controllers/Admin/LanguageController.php +++ b/app/Http/Controllers/Admin/LanguageController.php @@ -119,7 +119,9 @@ class LanguageController extends Controller // Abort in demo mode abort_if(is_demo(), 204, 'Done.'); - abort_if($language->locale === 'en', 401, "Sorry, you can't delete default language."); + if ($language->locale === 'en') { + return response("Sorry, you can't delete default language.", 401); + } // If user try to delete language used as default, // then set en language as default diff --git a/app/Http/Controllers/App/SetupWizardController.php b/app/Http/Controllers/App/SetupWizardController.php index ac3fe070..bc5dc74f 100644 --- a/app/Http/Controllers/App/SetupWizardController.php +++ b/app/Http/Controllers/App/SetupWizardController.php @@ -1,6 +1,7 @@ cookie('share_session', $cookie, 43200); } - abort(401, __t('incorrect_password')); + return response(__t('incorrect_password'), 401); } /** diff --git a/app/Http/Requests/FileFunctions/UploadRequest.php b/app/Http/Requests/FileFunctions/UploadRequest.php index 56d89acb..bb3b48af 100644 --- a/app/Http/Requests/FileFunctions/UploadRequest.php +++ b/app/Http/Requests/FileFunctions/UploadRequest.php @@ -1,4 +1,5 @@ 'required|string', + 'filename' => 'required|string', 'folder_id' => 'nullable|uuid', - 'file' => ['required', 'file', new DisabledMimetypes], + 'is_last' => 'sometimes|boolean', + 'file' => ['required', 'file', new DisabledMimetypes], ]; } } diff --git a/app/Services/FileManagerService.php b/app/Services/FileManagerService.php index 00564d54..1bc29cf9 100644 --- a/app/Services/FileManagerService.php +++ b/app/Services/FileManagerService.php @@ -343,7 +343,6 @@ class FileManagerService $file = $request->file('file'); // File name - $user_file_name = basename('chunks/' . substr($file->getClientOriginalName(), 17), '.part'); $disk_file_name = basename('chunks/' . $file->getClientOriginalName(), '.part'); $temp_filename = $file->getClientOriginalName(); diff --git a/tests/Feature/Accounts/AuthTest.php b/tests/Feature/Accounts/AuthTest.php index 1ee36623..73add363 100644 --- a/tests/Feature/Accounts/AuthTest.php +++ b/tests/Feature/Accounts/AuthTest.php @@ -43,8 +43,6 @@ class AuthTest extends TestCase */ public function it_register_user() { - Notification::fake(); - collect([ [ 'name' => 'storage_default', @@ -144,8 +142,6 @@ class AuthTest extends TestCase */ public function it_send_reset_link_to_email() { - Notification::fake(); - $user = User::factory(User::class) ->create(['email' => 'john@doe.com']); diff --git a/tests/Feature/Accounts/UserAccountTest.php b/tests/Feature/Accounts/UserAccountTest.php index bc5c4529..d17c4b52 100644 --- a/tests/Feature/Accounts/UserAccountTest.php +++ b/tests/Feature/Accounts/UserAccountTest.php @@ -2,6 +2,7 @@ namespace Tests\Feature\Accounts; +use App\Models\File; use App\Models\User; use App\Services\SetupService; use Illuminate\Foundation\Testing\DatabaseMigrations; @@ -70,8 +71,6 @@ class UserAccountTest extends TestCase */ public function it_update_user_avatar() { - Storage::fake('local'); - $this->setup->create_directories(); $user = User::factory(User::class) @@ -130,7 +129,7 @@ class UserAccountTest extends TestCase "id" => (string)$user->id, "type" => "settings", "attributes" => [ - 'avatar' => $user->settings->avatar, + 'avatar' => $user->settings->avatar, 'name' => $user->settings->name, 'address' => $user->settings->address, 'state' => $user->settings->state, @@ -138,7 +137,7 @@ class UserAccountTest extends TestCase 'postal_code' => $user->settings->postal_code, 'country' => $user->settings->country, 'phone_number' => $user->settings->phone_number, - 'timezone' => $user->settings->timezone + 'timezone' => $user->settings->timezone ] ] ], @@ -156,7 +155,7 @@ class UserAccountTest extends TestCase ]); } - /** + /** * @test */ public function it_create_user_token() @@ -172,11 +171,11 @@ class UserAccountTest extends TestCase $this->assertDatabaseHas('personal_access_tokens', [ 'tokenable_id' => $user->id, - 'name' => 'token' + 'name' => 'token' ]); } - /** + /** * @test */ public function it_revoke_user_token() @@ -185,7 +184,7 @@ class UserAccountTest extends TestCase ->create(); Sanctum::actingAs($user); - + $user->createToken('token'); $token_id = $user->tokens()->first()->id; @@ -206,18 +205,18 @@ class UserAccountTest extends TestCase $user = User::factory(User::class) ->create(); - Sanctum::actingAs($user); - $user->createToken('token'); $token = $user->tokens()->first(); - $this->getJson('/api/user/tokens') + $this + ->actingAs($user) + ->getJson('/api/user/tokens') ->assertStatus(200) ->assertJsonFragment([ - "id" => $token->id, - "tokenable_type" => $token->tokenable_type, - "tokenable_id" => $user->id, + "id" => $token->id, + "tokenable_type" => $token->tokenable_type, + "tokenable_id" => $user->id, "name" => $token->name, "abilities" => $token->abilities ]); @@ -226,16 +225,22 @@ class UserAccountTest extends TestCase /** * @test */ - public function it_use_user_token_to_request() + public function it_use_user_token_in_public_api_request() { $user = User::factory(User::class) ->create(); - + $folder = Folder::factory(Folder::class) ->create([ 'user_id' => $user->id, ]); - + + $file = File::factory(File::class) + ->create([ + 'user_id' => $user->id, + 'folder_id' => $folder->id + ]); + $token = $user->createToken('token')->plainTextToken; $this->assertDatabaseHas('personal_access_tokens', [ @@ -243,24 +248,17 @@ class UserAccountTest extends TestCase ]); $this->assertDatabaseHas('folders', [ - 'id' => $folder->id, + 'id' => $folder->id, 'user_id' => $user->id ]); - $response = $this->call('GET', "api/browse/folders/$folder->id", - [], [], [], [ - 'Content-type' => 'application/json', - 'Accept' => 'application/json', - 'Authorization' => 'Bearer ' .$token, + $this + ->withToken($token) + ->getJson("/api/browse/folders/$folder->id") + ->assertOk() + ->assertJsonFragment([ + 'id' => $file->id, ]); - - - // $response->assertJsonFragment([ - // 'id' => $folder->id, - // 'user_id' => $user->id, - // ]); - - // dd($response); } /** @@ -278,7 +276,7 @@ class UserAccountTest extends TestCase now()->addMinutes(60), ['id' => $user->id, 'hash' => sha1($user->email)] ); - + $this ->getJson($verificationUrl) ->assertRedirect('successfully-verified'); @@ -291,18 +289,16 @@ class UserAccountTest extends TestCase */ public function it_resend_user_verify_email() { - Notification::fake(); - $user = User::factory(User::class) ->create([ 'email_verified_at' => null ]); - + $this->postJson('/api/user/email/resend/verify', [ - 'email' => $user->email, - ]) - ->assertStatus(200); - + 'email' => $user->email, + ]) + ->assertStatus(204); + Notification::assertTimesSent(1, VerifyEmail::class); } } diff --git a/tests/Feature/Admin/AdminTest.php b/tests/Feature/Admin/AdminTest.php index bab145fb..a16bde21 100644 --- a/tests/Feature/Admin/AdminTest.php +++ b/tests/Feature/Admin/AdminTest.php @@ -216,8 +216,6 @@ class AdminTest extends TestCase */ public function it_send_reset_password_for_user() { - Notification::fake(); - $user = User::factory(User::class) ->create(['role' => 'user']); @@ -284,8 +282,6 @@ class AdminTest extends TestCase */ public function it_create_new_user_with_avatar() { - Storage::fake('local'); - $admin = User::factory(User::class) ->create(['role' => 'admin']); @@ -326,8 +322,6 @@ class AdminTest extends TestCase */ public function it_delete_user_with_all_data() { - Storage::fake('local'); - $this->setup->create_directories(); // Create and login user @@ -549,8 +543,6 @@ class AdminTest extends TestCase */ public function it_update_settings_image() { - Storage::fake('local'); - $this->setup->create_directories(); Setting::forceCreate([ diff --git a/tests/Feature/App/SchedulerTest.php b/tests/Feature/App/SchedulerTest.php index 0eb75025..ad1becc8 100644 --- a/tests/Feature/App/SchedulerTest.php +++ b/tests/Feature/App/SchedulerTest.php @@ -46,8 +46,6 @@ class SchedulerTest extends TestCase */ public function it_delete_zips_older_than_one_day() { - Storage::fake('local'); - $this->setup->create_directories(); $file = UploadedFile::fake() @@ -75,8 +73,6 @@ class SchedulerTest extends TestCase */ public function it_delete_failed_files_older_than_one_day() { - Storage::fake('local'); - $this->setup->create_directories(); $this->travel(-26)->hours(); diff --git a/tests/Feature/FileManager/ContentAccessTest.php b/tests/Feature/FileManager/ContentAccessTest.php index 201a1261..3ffe2577 100644 --- a/tests/Feature/FileManager/ContentAccessTest.php +++ b/tests/Feature/FileManager/ContentAccessTest.php @@ -30,8 +30,6 @@ class ContentAccessTest extends TestCase */ public function it_get_public_user_avatar() { - Storage::fake('local'); - $this->setup->create_directories(); $avatar = UploadedFile::fake() @@ -50,8 +48,6 @@ class ContentAccessTest extends TestCase */ public function it_get_public_system_image() { - Storage::fake('local'); - $this->setup->create_directories(); $system = UploadedFile::fake() @@ -70,8 +66,6 @@ class ContentAccessTest extends TestCase */ public function it_get_private_user_file() { - Storage::fake('local'); - $this->setup->create_directories(); $user = User::factory(User::class) @@ -100,8 +94,6 @@ class ContentAccessTest extends TestCase */ public function it_get_private_user_image_thumbnail() { - Storage::fake('local'); - $this->setup->create_directories(); $user = User::factory(User::class) @@ -130,8 +122,6 @@ class ContentAccessTest extends TestCase */ public function it_get_private_user_zip() { - Storage::fake('local'); - $this->setup->create_directories(); $user = User::factory(User::class) @@ -158,8 +148,6 @@ class ContentAccessTest extends TestCase */ public function logged_user_try_to_get_another_private_user_image_thumbnail() { - Storage::fake('local'); - $this->setup->create_directories(); $users = User::factory(User::class) @@ -189,8 +177,6 @@ class ContentAccessTest extends TestCase */ public function logged_user_try_to_get_another_private_user_file() { - Storage::fake('local'); - $this->setup->create_directories(); $users = User::factory(User::class) @@ -220,8 +206,6 @@ class ContentAccessTest extends TestCase */ public function logged_user_try_to_get_another_private_user_zip() { - Storage::fake('local'); - $this->setup->create_directories(); $user = User::factory(User::class) @@ -278,6 +262,6 @@ class ContentAccessTest extends TestCase ->create(); $this->getJson("/api/browse/folders/$folder->id") - ->assertStatus(401); + ->assertUnauthorized(); } } diff --git a/tests/Feature/FileManager/FileTest.php b/tests/Feature/FileManager/FileTest.php index e97fd7c0..202bd384 100644 --- a/tests/Feature/FileManager/FileTest.php +++ b/tests/Feature/FileManager/FileTest.php @@ -42,8 +42,6 @@ class FileTest extends TestCase */ public function it_upload_image_file_and_create_thumbnail() { - Storage::fake('local'); - $this->setup->create_directories(); $file = UploadedFile::fake() @@ -85,8 +83,6 @@ class FileTest extends TestCase */ public function it_upload_new_file() { - Storage::fake('local'); - $this->setup->create_directories(); $file = UploadedFile::fake() @@ -124,8 +120,6 @@ class FileTest extends TestCase */ public function it_upload_blacklisted_mimetype_file() { - Storage::fake('local'); - $this->setup->create_directories(); Setting::create([ @@ -252,8 +246,6 @@ class FileTest extends TestCase */ public function it_delete_multiple_files_hardly() { - Storage::fake('local'); - $this->setup->create_directories(); $user = User::factory(User::class) @@ -311,8 +303,6 @@ class FileTest extends TestCase */ public function it_zip_multiple_files_and_download_it() { - Storage::fake('local'); - $this->setup->create_directories(); $user = User::factory(User::class) diff --git a/tests/Feature/FileManager/FolderTest.php b/tests/Feature/FileManager/FolderTest.php index 6d3b0f75..40a9d88e 100644 --- a/tests/Feature/FileManager/FolderTest.php +++ b/tests/Feature/FileManager/FolderTest.php @@ -388,8 +388,6 @@ class FolderTest extends TestCase */ public function it_delete_folder_with_their_content_within_hardly() { - Storage::fake('local'); - $this->setup->create_directories(); $user = User::factory(User::class) @@ -463,8 +461,6 @@ class FolderTest extends TestCase */ public function it_zip_folder_with_content_within_and_download() { - Storage::fake('local'); - $this->setup->create_directories(); $user = User::factory(User::class) diff --git a/tests/Feature/FileManager/TrashTest.php b/tests/Feature/FileManager/TrashTest.php index 4de052bf..a7777dd9 100644 --- a/tests/Feature/FileManager/TrashTest.php +++ b/tests/Feature/FileManager/TrashTest.php @@ -71,8 +71,6 @@ class TrashTest extends TestCase */ public function it_dump_trash() { - Storage::fake('local'); - $this->setup->create_directories(); $user = User::factory(User::class) diff --git a/tests/Feature/Setup/SetupServiceTest.php b/tests/Feature/Setup/SetupServiceTest.php index 32520e01..e37d3899 100644 --- a/tests/Feature/Setup/SetupServiceTest.php +++ b/tests/Feature/Setup/SetupServiceTest.php @@ -25,8 +25,6 @@ class SetupServiceTest extends TestCase */ public function it_create_system_folders() { - Storage::fake('local'); - $this->setup->create_directories(); collect(['avatars', 'chunks', 'system', 'files', 'temp', 'zip']) diff --git a/tests/Feature/Setup/SetupWizardTest.php b/tests/Feature/Setup/SetupWizardTest.php index 56774058..72a4fd9f 100644 --- a/tests/Feature/Setup/SetupWizardTest.php +++ b/tests/Feature/Setup/SetupWizardTest.php @@ -159,8 +159,6 @@ class SetupWizardTest extends TestCase */ public function it_store_app_settings() { - Storage::fake('local'); - $this->postJson('/api/setup/app-setup', [ 'title' => 'VueFileManager', 'description' => 'The best file manager on the internet', @@ -215,8 +213,6 @@ class SetupWizardTest extends TestCase */ public function it_create_admin_account() { - Storage::fake('local'); - $this->postJson('/admin-setup', [ 'email' => 'john@doe.com', 'password' => 'VerySecretPassword', diff --git a/tests/Feature/Share/UserShareTest.php b/tests/Feature/Share/UserShareTest.php index a20e6210..7b966732 100644 --- a/tests/Feature/Share/UserShareTest.php +++ b/tests/Feature/Share/UserShareTest.php @@ -151,8 +151,6 @@ class UserShareTest extends TestCase */ public function it_share_folder_and_send_link_for_multiple_email() { - Notification::fake(); - $folder = Folder::factory(Folder::class) ->create(); @@ -179,8 +177,6 @@ class UserShareTest extends TestCase */ public function it_send_existing_shared_folder_for_multiple_email_once_again() { - Notification::fake(); - $folder = Folder::factory(Folder::class) ->create(); diff --git a/tests/Feature/Share/VisitorAccessToItemsTest.php b/tests/Feature/Share/VisitorAccessToItemsTest.php index 02167782..19466511 100644 --- a/tests/Feature/Share/VisitorAccessToItemsTest.php +++ b/tests/Feature/Share/VisitorAccessToItemsTest.php @@ -31,8 +31,6 @@ class VisitorAccessToItemsTest extends TestCase */ public function it_download_file() { - Storage::fake('local'); - $this->setup->create_directories(); collect([true, false]) @@ -108,8 +106,6 @@ class VisitorAccessToItemsTest extends TestCase */ public function it_get_shared_image() { - Storage::fake('local'); - $this->setup->create_directories(); collect([true, false]) @@ -167,8 +163,6 @@ class VisitorAccessToItemsTest extends TestCase */ public function it_get_public_thumbnail() { - Storage::fake('local'); - $this->setup->create_directories(); collect([true, false]) @@ -229,8 +223,6 @@ class VisitorAccessToItemsTest extends TestCase */ public function it_download_publicly_zipped_files() { - Storage::fake('local'); - $this->setup->create_directories(); collect([true, false]) diff --git a/tests/Feature/Share/VisitorBrowseTest.php b/tests/Feature/Share/VisitorBrowseTest.php index 08b21161..211517ce 100644 --- a/tests/Feature/Share/VisitorBrowseTest.php +++ b/tests/Feature/Share/VisitorBrowseTest.php @@ -146,8 +146,6 @@ class VisitorBrowseTest extends TestCase */ public function visitor_zip_shared_multiple_files() { - Storage::fake('local'); - $this->setup->create_directories(); // check private or public share record @@ -284,8 +282,6 @@ class VisitorBrowseTest extends TestCase */ public function visitor_zip_shared_folder() { - Storage::fake('local'); - $this->setup->create_directories(); // check private or public share record @@ -369,8 +365,6 @@ class VisitorBrowseTest extends TestCase */ public function visitor_try_zip_not_shared_folder() { - Storage::fake('local'); - $this->setup->create_directories(); // check private or public share record diff --git a/tests/Feature/Share/VisitorManipulatingTest.php b/tests/Feature/Share/VisitorManipulatingTest.php index 5b3e8743..d353e20d 100644 --- a/tests/Feature/Share/VisitorManipulatingTest.php +++ b/tests/Feature/Share/VisitorManipulatingTest.php @@ -313,8 +313,6 @@ class VisitorManipulatingTest extends TestCase */ public function editor_upload_file_into_shared_folder() { - Storage::fake('local'); - $this->setup->create_directories(); // check private or public share record @@ -353,6 +351,7 @@ class VisitorManipulatingTest extends TestCase $this ->withUnencryptedCookies($cookie) ->post("/api/editor/upload/$share->token", [ + 'filename' => $file->name, 'file' => $file, 'folder_id' => $folder->id, 'is_last' => true, @@ -363,6 +362,7 @@ class VisitorManipulatingTest extends TestCase if (!$is_protected) { $this->postJson("/api/editor/upload/$share->token", [ + 'filename' => $file->name, 'file' => $file, 'folder_id' => $folder->id, 'is_last' => true, diff --git a/tests/TestCase.php b/tests/TestCase.php index 1b466c43..48cc587c 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -5,6 +5,7 @@ namespace Tests; use Carbon\Carbon; use Illuminate\Foundation\Testing\TestCase as BaseTestCase; use Illuminate\Support\Facades\Notification; +use Illuminate\Support\Facades\Storage; abstract class TestCase extends BaseTestCase { @@ -18,6 +19,6 @@ abstract class TestCase extends BaseTestCase Notification::fake(); - $this->withoutExceptionHandling(); + Storage::fake('local'); } }