nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-05-15 17:55:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into oasis

Browse Source 
# Conflicts:
#	.php-cs-fixer.cache
#	app/Http/helpers.php
#	app/Services/FileManagerService.php
#	composer.lock
#	public/chunks/environment-setup.js
#	public/chunks/files~chunks/shared/file-browser.js
#	public/js/main.js
#	public/mix-manifest.json
This commit is contained in:
Peter Papp
2021-06-29 18:38:53 +02:00
parent 1a63f3aa07 5215d7d38d
commit c52c576f7c
28 changed files with 1407 additions and 1821 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Feature/Admin/AdminTest.php
+1
View File
@@ -361,6 +361,7 @@ class AdminTest extends TestCase
->create("fake-file-$index.pdf", 1200, 'application/pdf');
$this->postJson('/api/upload', [
'filename' => $file->name,
'file' => $file,
'folder_id' => null,
'is_last' => true,
tests/Feature/Admin/LanguageEditorTest.php
+6 -6
View File
@@ -248,18 +248,18 @@ class LanguageEditorTest extends TestCase
]);
$this->assertEquals(
__t('actions.close'),
'Close'
'Close',
__t('actions.close')
);
$this->assertEquals(
__t('shared_link_email_subject', ['user' => 'John']),
'🙋 John share some files with you. Look at it!'
'🙋 John share some files with you. Look at it!',
__t('shared_link_email_subject', ['user' => 'John'])
);
$this->assertEquals(
__t('test', ['name' => 'John', 'surname' => 'Doe']),
'Hi, my name is John Doe'
'Hi, my name is John Doe',
__t('test', ['name' => 'John', 'surname' => 'Doe'])
);
}
tests/Feature/FileManager/FileTest.php
+4
View File
@@ -55,6 +55,7 @@ class FileTest extends TestCase
Sanctum::actingAs($user);
$this->postJson('/api/upload', [
'filename' => $file->name,
'file' => $file,
'folder_id' => null,
'is_last' => true,
@@ -97,6 +98,7 @@ class FileTest extends TestCase
Sanctum::actingAs($user);
$this->postJson('/api/upload', [
'filename' => $file->name,
'file' => $file,
'folder_id' => null,
'is_last' => true,
@@ -266,6 +268,7 @@ class FileTest extends TestCase
->create("fake-file-$index.pdf", 1200, 'application/pdf');
$this->postJson('/api/upload', [
'filename' => $file->name,
'file' => $file,
'folder_id' => null,
'is_last' => true,
@@ -324,6 +327,7 @@ class FileTest extends TestCase
->create("fake-file-$index.pdf", 1200, 'application/pdf');
$this->postJson('/api/upload', [
'filename' => $file->name,
'file' => $file,
'folder_id' => null,
'is_last' => true,
tests/Feature/FileManager/FolderTest.php
+2
View File
@@ -415,6 +415,7 @@ class FolderTest extends TestCase
->create("fake-file-$index.pdf", 1200, 'application/pdf');
$this->postJson('/api/upload', [
'filename' => $file->name,
'file' => $file,
'folder_id' => $folder->id,
'is_last' => true,
@@ -483,6 +484,7 @@ class FolderTest extends TestCase
->create("fake-file-$index.pdf", 1200, 'application/pdf');
$this->postJson('/api/upload', [
'filename' => $file->name,
'file' => $file,
'folder_id' => $folder->id,
'is_last' => true,
tests/Feature/FileManager/TrashTest.php
+1
View File
@@ -89,6 +89,7 @@ class TrashTest extends TestCase
->image('fake-image.jpg');
$this->postJson('/api/upload', [
'filename' => $image->name,
'file' => $image,
'folder_id' => null,
'is_last' => true,
tests/TestCase.php
+5
View File
@@ -7,4 +7,9 @@ use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
abstract class TestCase extends BaseTestCase
{
use CreatesApplication;
public function setUp(): void
{
parent::setUp();
}
}