controller refactoring part 25

This commit is contained in:
Peter Papp
2021-07-22 07:49:25 +02:00
parent 6d8a7a429c
commit 5167f082f7
50 changed files with 252 additions and 481 deletions

View File

@@ -7,17 +7,10 @@ use Tests\TestCase;
use App\Users\Models\User;
use Illuminate\Http\UploadedFile;
use Illuminate\Support\Facades\URL;
use Domain\SetupWizard\Services\SetupService;
use Illuminate\Auth\Notifications\VerifyEmail;
class UserAccountTest extends TestCase
{
public function __construct()
{
parent::__construct();
$this->setup = resolve(SetupService::class);
}
/**
* @test
*/

View File

@@ -7,21 +7,14 @@ use Tests\TestCase;
use App\Users\Models\User;
use Laravel\Sanctum\Sanctum;
use Domain\Files\Models\File;
use Domain\Zipping\Models\Zip;
use Domain\Zip\Models\Zip;
use Domain\Sharing\Models\Share;
use Domain\Folders\Models\Folder;
use Illuminate\Http\UploadedFile;
use App\Users\Notifications\ResetPassword;
use Domain\SetupWizard\Services\SetupService;
class AdminTest extends TestCase
{
public function __construct()
{
parent::__construct();
$this->setup = app()->make(SetupService::class);
}
/**
* @test
*/

View File

@@ -7,19 +7,12 @@ use App\Users\Models\User;
use Illuminate\Support\Str;
use Laravel\Sanctum\Sanctum;
use Domain\Files\Models\File;
use Domain\Zipping\Models\Zip;
use Domain\Zip\Models\Zip;
use Domain\Folders\Models\Folder;
use Illuminate\Http\UploadedFile;
use Domain\SetupWizard\Services\SetupService;
class ContentAccessTest extends TestCase
{
public function __construct()
{
parent::__construct();
$this->setup = app()->make(SetupService::class);
}
/**
* @test
*/

View File

@@ -9,16 +9,9 @@ use Domain\Files\Models\File;
use Domain\Folders\Models\Folder;
use Illuminate\Http\UploadedFile;
use Domain\Settings\Models\Setting;
use Domain\SetupWizard\Services\SetupService;
class FileTest extends TestCase
{
public function __construct()
{
parent::__construct();
$this->setup = app()->make(SetupService::class);
}
/**
* @test
*/

View File

@@ -8,18 +8,9 @@ use Laravel\Sanctum\Sanctum;
use Domain\Files\Models\File;
use Domain\Folders\Models\Folder;
use Illuminate\Http\UploadedFile;
use Domain\SetupWizard\Services\SetupService;
// TODO: pridat foldre do api skupiny
class FolderTest extends TestCase
{
public function __construct()
{
parent::__construct();
$this->setup = app()->make(SetupService::class);
}
/**
* @test
*/

View File

@@ -1,6 +1,8 @@
<?php
namespace Tests\Domain\Homepage;
use Domain\Pages\Actions\SeedDefaultPagesAction;
use Domain\Settings\Actions\SeedDefaultSettingsAction;
use Mail;
use Tests\TestCase;
use App\Users\Models\User;
@@ -9,24 +11,17 @@ use Domain\Sharing\Models\Share;
use Domain\Folders\Models\Folder;
use Domain\Settings\Models\Setting;
use Domain\Homepage\Mail\SendContactMessage;
use Domain\SetupWizard\Services\SetupService;
class HomepageTest extends TestCase
{
public function __construct()
{
parent::__construct();
$this->setup = app()->make(SetupService::class);
}
/**
* @test
*/
public function it_get_index_page()
{
$this->setup->seed_default_pages();
resolve(SeedDefaultPagesAction::class)();
$this->setup->seed_default_settings('Extended');
resolve(SeedDefaultSettingsAction::class)('Extended');
Setting::create([
'name' => 'setup_wizard_success',

View File

@@ -1,11 +1,11 @@
<?php
namespace Tests\Domain\Languages;
use Domain\Localization\Actions\SeedDefaultLanguageAction;
use Tests\TestCase;
use App\Users\Models\User;
use Domain\Settings\Models\Setting;
use Domain\Localization\Models\Language;
use Domain\SetupWizard\Services\SetupService;
class AdminLanguageTranslatorTest extends TestCase
{
@@ -51,7 +51,7 @@ class AdminLanguageTranslatorTest extends TestCase
*/
public function it_update_language()
{
resolve(SetupService::class)->seed_default_language();
resolve(SeedDefaultLanguageAction::class)();
$admin = User::factory(User::class)
->create(['role' => 'admin']);
@@ -110,7 +110,7 @@ class AdminLanguageTranslatorTest extends TestCase
*/
public function it_try_to_delete_default_language()
{
resolve(SetupService::class)->seed_default_language();
resolve(SeedDefaultLanguageAction::class)();
$admin = User::factory(User::class)
->create(['role' => 'admin']);
@@ -128,7 +128,7 @@ class AdminLanguageTranslatorTest extends TestCase
*/
public function it_get_all_languages()
{
resolve(SetupService::class)->seed_default_language();
resolve(SeedDefaultLanguageAction::class)();
$admin = User::factory(User::class)
->create(['role' => 'admin']);
@@ -148,7 +148,7 @@ class AdminLanguageTranslatorTest extends TestCase
*/
public function it_update_language_string()
{
resolve(SetupService::class)->seed_default_language();
resolve(SeedDefaultLanguageAction::class)();
$admin = User::factory(User::class)
->create(['role' => 'admin']);
@@ -174,7 +174,7 @@ class AdminLanguageTranslatorTest extends TestCase
*/
public function it_get_language_with_strings_by_selected_language_id()
{
resolve(SetupService::class)->seed_default_language();
resolve(SeedDefaultLanguageAction::class)();
$admin = User::factory(User::class)
->create(['role' => 'admin']);

View File

@@ -1,26 +1,18 @@
<?php
namespace Tests\Domain\Languages;
use Domain\Localization\Actions\SeedDefaultLanguageAction;
use Tests\TestCase;
use Domain\Localization\Models\Language;
use Domain\SetupWizard\Services\SetupService;
class TranslationsAccessTest extends TestCase
{
protected $setup;
public function __construct()
{
parent::__construct();
$this->setup = app()->make(SetupService::class);
}
/**
* @test
*/
public function it_get_language_translations_for_frontend()
{
$this->setup->seed_default_language();
resolve(SeedDefaultLanguageAction::class)();
$this->getJson('/translations/en')
->assertStatus(200)
@@ -34,7 +26,7 @@ class TranslationsAccessTest extends TestCase
*/
public function it_get_custom_translations_from_file_config()
{
$this->setup->seed_default_language();
resolve(SeedDefaultLanguageAction::class)();
$this->assertDatabaseHas('language_translations', [
'key' => 'custom',
@@ -48,7 +40,7 @@ class TranslationsAccessTest extends TestCase
*/
public function it_get_translated_string_from_t_helper_function()
{
$this->setup->seed_default_language();
resolve(SeedDefaultLanguageAction::class)();
Language::first()
->languageTranslations()

View File

@@ -1,10 +1,10 @@
<?php
namespace Tests\Domain\Pages;
use Domain\Pages\Actions\SeedDefaultPagesAction;
use Tests\TestCase;
use App\Users\Models\User;
use Laravel\Sanctum\Sanctum;
use Domain\SetupWizard\Services\SetupService;
class AdminPagesTest extends TestCase
{
@@ -13,7 +13,7 @@ class AdminPagesTest extends TestCase
*/
public function it_get_all_pages()
{
resolve(SetupService::class)->seed_default_pages();
resolve(SeedDefaultPagesAction::class)();
$admin = User::factory(User::class)
->create(['role' => 'admin']);
@@ -35,7 +35,7 @@ class AdminPagesTest extends TestCase
*/
public function it_get_page()
{
resolve(SetupService::class)->seed_default_pages();
resolve(SeedDefaultPagesAction::class)();
$admin = User::factory(User::class)
->create(['role' => 'admin']);
@@ -54,7 +54,7 @@ class AdminPagesTest extends TestCase
*/
public function it_update_page()
{
resolve(SetupService::class)->seed_default_pages();
resolve(SeedDefaultPagesAction::class)();
$admin = User::factory(User::class)
->create(['role' => 'admin']);

View File

@@ -1,8 +1,8 @@
<?php
namespace Tests\Domain\Pages;
use Domain\Pages\Actions\SeedDefaultPagesAction;
use Tests\TestCase;
use Domain\SetupWizard\Services\SetupService;
class PagesTest extends TestCase
{
@@ -11,7 +11,7 @@ class PagesTest extends TestCase
*/
public function it_get_legal_page()
{
resolve(SetupService::class)->seed_default_pages();
resolve(SeedDefaultPagesAction::class)();
$this->getJson('/api/page/terms-of-service')
->assertStatus(200)

View File

@@ -1,12 +1,12 @@
<?php
namespace Tests\Domain\Settings;
use Domain\Settings\Actions\SeedDefaultSettingsAction;
use Storage;
use Tests\TestCase;
use App\Users\Models\User;
use Illuminate\Http\UploadedFile;
use Domain\Settings\Models\Setting;
use Domain\SetupWizard\Services\SetupService;
class SettingsTest extends TestCase
{
@@ -38,7 +38,7 @@ class SettingsTest extends TestCase
*/
public function it_get_admin_settings()
{
resolve(SetupService::class)->seed_default_settings('Extended');
resolve(SeedDefaultSettingsAction::class)('Extended');
$admin = User::factory(User::class)
->create(['role' => 'admin']);
@@ -72,7 +72,7 @@ class SettingsTest extends TestCase
*/
public function it_update_settings()
{
resolve(SetupService::class)->seed_default_settings('Extended');
resolve(SeedDefaultSettingsAction::class)('Extended');
$admin = User::factory(User::class)
->create(['role' => 'admin']);

View File

@@ -1,20 +1,12 @@
<?php
namespace Tests\Domain\SetupWizard;
use Domain\Localization\Actions\SeedDefaultLanguageAction;
use Storage;
use Tests\TestCase;
use Domain\Settings\Models\Setting;
use Domain\Localization\Models\Language;
use Domain\SetupWizard\Services\SetupService;
class SetupServiceTest extends TestCase
{
public function __construct()
{
parent::__construct();
$this->setup = app()->make(SetupService::class);
}
/**
* @test
*/
@@ -33,15 +25,7 @@ class SetupServiceTest extends TestCase
*/
public function it_seed_default_language()
{
Setting::create([
'name' => 'license',
'value' => 'Extended',
]);
Language::create([
'name' => 'English',
'locale' => 'en',
]);
resolve(SeedDefaultLanguageAction::class)();
$this->assertDatabaseHas('languages', [
'name' => 'English',

View File

@@ -6,21 +6,12 @@ use Tests\TestCase;
use App\Users\Models\User;
use Illuminate\Support\Str;
use Domain\Files\Models\File;
use Domain\Zipping\Models\Zip;
use Domain\Zip\Models\Zip;
use Domain\Sharing\Models\Share;
use Illuminate\Http\UploadedFile;
use Domain\SetupWizard\Services\SetupService;
class VisitorAccessToItemsTest extends TestCase
{
private $setup;
public function __construct()
{
parent::__construct();
$this->setup = app()->make(SetupService::class);
}
/**
* @test
*/

View File

@@ -6,16 +6,9 @@ use App\Users\Models\User;
use Domain\Files\Models\File;
use Domain\Sharing\Models\Share;
use Domain\Folders\Models\Folder;
use Domain\SetupWizard\Services\SetupService;
class VisitorBrowseTest extends TestCase
{
public function __construct()
{
parent::__construct();
$this->setup = app()->make(SetupService::class);
}
/**
* @test
*/

View File

@@ -8,16 +8,9 @@ use Domain\Files\Models\File;
use Domain\Sharing\Models\Share;
use Domain\Folders\Models\Folder;
use Illuminate\Http\UploadedFile;
use Domain\SetupWizard\Services\SetupService;
class VisitorManipulatingTest extends TestCase
{
public function __construct()
{
parent::__construct();
$this->setup = app()->make(SetupService::class);
}
/**
* @test
*/

View File

@@ -1,12 +1,12 @@
<?php
namespace Tests\Domain\Zipping;
namespace Tests\Domain\Zip;
use Storage;
use Tests\TestCase;
use App\Users\Models\User;
use Illuminate\Support\Str;
use Domain\Files\Models\File;
use Domain\Zipping\Models\Zip;
use Domain\Zip\Models\Zip;
use Domain\Sharing\Models\Share;
use Domain\Folders\Models\Folder;
use Illuminate\Http\UploadedFile;

View File

@@ -1,12 +1,12 @@
<?php
namespace Tests\Domain\Zipping;
namespace Tests\Domain\Zip;
use Storage;
use Tests\TestCase;
use App\Users\Models\User;
use Laravel\Sanctum\Sanctum;
use Domain\Files\Models\File;
use Domain\Zipping\Models\Zip;
use Domain\Zip\Models\Zip;
use Domain\Folders\Models\Folder;
use Illuminate\Http\UploadedFile;

View File

@@ -4,7 +4,7 @@ namespace Tests\Support\Scheduler;
use Storage;
use Tests\TestCase;
use App\Users\Models\User;
use Domain\Zipping\Models\Zip;
use Domain\Zip\Models\Zip;
use Domain\Sharing\Models\Share;
use Illuminate\Http\UploadedFile;
use Support\Scheduler\Actions\DeleteOldZipsAction;

View File

@@ -2,9 +2,9 @@
namespace Tests;
use Carbon\Carbon;
use Domain\SetupWizard\Actions\CreateDiskDirectoriesAction;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\Notification;
use Domain\SetupWizard\Services\SetupService;
use Illuminate\Foundation\Testing\DatabaseMigrations;
use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
@@ -23,7 +23,7 @@ abstract class TestCase extends BaseTestCase
Storage::fake('local');
resolve(SetupService::class)->create_directories();
resolve(CreateDiskDirectoriesAction::class)();
//$this->withoutExceptionHandling();
}