From 6e85850807b41a933c725c5693141ee42b0a3797 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 19 Feb 2019 21:59:16 +0800
Subject: [PATCH] Fixing file system driver for testing

---
 app/Http/Controllers/Projects/FilesController.php | 16 +++++-----------
 resources/views/projects/files.blade.php          |  5 +++--
 tests/Feature/Projects/UploadFilesTest.php        | 14 +++++++-------
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/app/Http/Controllers/Projects/FilesController.php b/app/Http/Controllers/Projects/FilesController.php
index e07595b..12f3baa 100644
--- a/app/Http/Controllers/Projects/FilesController.php
+++ b/app/Http/Controllers/Projects/FilesController.php
@@ -71,7 +71,7 @@ class FilesController extends Controller
             return response()->download(storage_path('app/public/files/'.$file->filename), $file->title.'.'.$extension);
         }
 
-        flash(trans('file.not_found'), 'danger');
+        flash(__('file.not_found'), 'danger');
 
         if (\URL::previous() != \URL::current()) {
             return back();
@@ -86,17 +86,17 @@ class FilesController extends Controller
         $file->description = $request->get('description');
         $file->save();
 
-        flash(trans('file.updated'), 'success');
+        flash(__('file.updated'), 'success');
 
         return redirect()->route($file->fileable_type.'.files', $file->fileable_id);
     }
 
     public function destroy(Request $request, File $file)
     {
-        Storage::disk('avatar')->delete('public/files/'.$file->filename);
+        Storage::delete('public/files/'.$file->filename);
         $file->delete();
 
-        flash(trans('file.deleted'), 'warning');
+        flash(__('file.deleted'), 'warning');
 
         return redirect()->route($file->fileable_type.'.files', $file->fileable_id);
     }
@@ -112,13 +112,7 @@ class FilesController extends Controller
         $fileData['title'] = $data['title'];
         $fileData['description'] = $data['description'];
         \DB::beginTransaction();
-        // dd(is_dir(storage_path('app/public/files')));
-        if (env('APP_ENV') == 'testing') {
-            $file->store('public/files', 'avatar');
-        } else {
-            $file->store('public/files');
-        }
-        // $file->move(storage_path('app/public/files'));
+        $file->store('public/files');
         $file = File::create($fileData);
         \DB::commit();
 
diff --git a/resources/views/projects/files.blade.php b/resources/views/projects/files.blade.php
index 611a8a0..ea71f90 100755
--- a/resources/views/projects/files.blade.php
+++ b/resources/views/projects/files.blade.php
@@ -43,7 +43,7 @@
                         </td>
                         <td class="text-center">
                             {!! html_link_to_route('projects.files', '', [$project, 'action' => 'edit', 'id' => $file->id], ['icon' => 'edit', 'title' => __('file.edit')]) !!}
-                            {!! html_link_to_route('projects.files', '', [$project, 'action' => 'delete', 'id' => $file->id], ['icon' => 'delete', 'title' => __('file.delete'), 'id' => 'delete-file-'.$file->id]) !!}
+                            {!! html_link_to_route('projects.files', '', [$project, 'action' => 'delete', 'id' => $file->id], ['icon' => 'remove', 'title' => __('file.delete'), 'id' => 'delete-file-'.$file->id]) !!}
                         </td>
                     </tr>
                     @empty
@@ -84,7 +84,8 @@
         @if (Request::get('action') == 'delete' && $editableFile)
         <div class="panel panel-default">
             <div class="panel-heading"><h3 class="panel-title">{{ __('file.delete') }} : {{ $editableFile->title }}</h3></div>
-            <div class="panel-body">
+            <div class="panel-body">{{ __('file.delete_confirm') }}</div>
+            <div class="panel-footer">
                 {!! FormField::delete(
                     ['route' => ['files.destroy', $editableFile->id]],
                     __('app.delete_confirm_button'),
diff --git a/tests/Feature/Projects/UploadFilesTest.php b/tests/Feature/Projects/UploadFilesTest.php
index 59767d3..03e114e 100644
--- a/tests/Feature/Projects/UploadFilesTest.php
+++ b/tests/Feature/Projects/UploadFilesTest.php
@@ -15,7 +15,7 @@ class UploadFilesTest extends TestCase
     /** @test */
     public function user_can_upload_document_to_a_project()
     {
-        Storage::fake('avatar');
+        Storage::fake(config('filesystem.default'));
         $user = $this->adminUserSigningIn();
         $project = factory(Project::class)->create();
         $this->visit(route('projects.files', $project->id));
@@ -38,13 +38,13 @@ class UploadFilesTest extends TestCase
         ]);
 
         $file = $project->files->first();
-        Storage::disk('avatar')->assertExists('public/files/'.$file->filename);
+        Storage::assertExists('public/files/'.$file->filename);
     }
 
     /** @test */
     public function user_can_edit_document_file_on_a_project()
     {
-        Storage::fake('avatar');
+        Storage::fake(config('filesystem.default'));
         $user = $this->adminUserSigningIn();
         $project = factory(Project::class)->create();
 
@@ -75,13 +75,13 @@ class UploadFilesTest extends TestCase
             'description'   => 'Edit Deskripsi file yang diuplod.',
         ]);
 
-        Storage::disk('avatar')->assertExists('public/files/'.$file->filename);
+        Storage::assertExists('public/files/'.$file->filename);
     }
 
     /** @test */
     public function user_can_delete_document_file_on_a_project()
     {
-        Storage::fake('avatar');
+        Storage::fake(config('filesystem.default'));
         $user = $this->adminUserSigningIn();
         $project = factory(Project::class)->create();
 
@@ -95,7 +95,7 @@ class UploadFilesTest extends TestCase
         $this->assertCount(1, $project->files);
 
         $file = $project->files->first();
-        Storage::disk('avatar')->assertExists('public/files/'.$file->filename);
+        Storage::assertExists('public/files/'.$file->filename);
 
         $this->visit(route('projects.files', $project));
         $this->click('delete-file-'.$file->id);
@@ -106,6 +106,6 @@ class UploadFilesTest extends TestCase
         $this->seePageIs(route('projects.files', $project));
         $this->seeText(__('file.deleted'));
         $this->dontSeeInDatabase('files', ['id' => $file->id]);
-        Storage::disk('avatar')->assertMissing('public/files/'.$file->filename);
+        Storage::assertMissing('public/files/'.$file->filename);
     }
 }