Skip to content

Commit

Permalink
Merge branch 'master' of github.com:talvbansal/media-manager
Browse files Browse the repository at this point in the history
  • Loading branch information
talvbansal committed Sep 2, 2017
2 parents 5492c9a + dd1113e commit 5f9dbaa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
1 change: 1 addition & 0 deletions src/Http/Controllers/MediaController.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ public function deleteFolder(Request $request)
public function deleteFile()
{
$path = request('path');

try {
$result = $this->mediaManager->deleteFile($path);

Expand Down
13 changes: 6 additions & 7 deletions tests/Functional/UsesMediaManagerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ public function test_can_list_files_from_the_media_manager_root()

$response->assertJsonFragment(
[
'folder' => '/',
'folderName' => 'Root',
'folder' => '/',
'folderName' => 'Root',
'breadCrumbs' => [],
'files' => [],
'itemsCount' => 1,
'files' => [],
'itemsCount' => 1,
]
);

Expand All @@ -40,14 +40,13 @@ public function test_can_list_files_from_the_media_manager_root()
'breadCrumbs',
'files',
'itemsCount',
'subFolders'
'subFolders',
]);

$response->assertJsonFragment([
'fullPath' => '/test',
'mimeType' => 'folder',
'name' => 'test',
'name' => 'test',
]);

}
}

0 comments on commit 5f9dbaa

Please sign in to comment.