diff --git a/phpunit.xml.dist b/phpunit.xml.dist index d59b141..0452042 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -21,14 +21,16 @@ - - + + + + diff --git a/tests/Feature/Console/UserAddTest.php b/tests/Feature/Console/UserAddTest.php index d8c8f7e..65c058e 100644 --- a/tests/Feature/Console/UserAddTest.php +++ b/tests/Feature/Console/UserAddTest.php @@ -3,12 +3,10 @@ namespace Tests\Feature\Console; use App\Models\User; -use Illuminate\Foundation\Testing\RefreshDatabase; use Tests\TestCase; class UserAddTest extends TestCase { - use RefreshDatabase; public function testCanAddUserInteractively(): void { diff --git a/tests/Feature/Http/Controllers/Auth/AuthenticationTest.php b/tests/Feature/Http/Controllers/Auth/AuthenticationTest.php index 4df44cc..2c636b3 100644 --- a/tests/Feature/Http/Controllers/Auth/AuthenticationTest.php +++ b/tests/Feature/Http/Controllers/Auth/AuthenticationTest.php @@ -5,14 +5,11 @@ namespace Tests\Feature\Http\Controllers\Auth; use App\Models\User; use App\Providers\RouteServiceProvider; use Illuminate\Auth\Events\Lockout; -use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Support\Facades\Event; -use Illuminate\Validation\ValidationException; use Tests\TestCase; class AuthenticationTest extends TestCase { - use RefreshDatabase; public function testLoginScreenCanRendered(): void { diff --git a/tests/Feature/Http/Controllers/FoodControllerTest.php b/tests/Feature/Http/Controllers/FoodControllerTest.php index cc1f077..a7568eb 100644 --- a/tests/Feature/Http/Controllers/FoodControllerTest.php +++ b/tests/Feature/Http/Controllers/FoodControllerTest.php @@ -5,11 +5,9 @@ namespace Tests\Feature\Http\Controllers; use App\Http\Controllers\FoodController; use App\Models\Food; use Database\Factories\FoodFactory; -use Illuminate\Foundation\Testing\RefreshDatabase; class FoodControllerTest extends HttpControllerTestCase { - use RefreshDatabase; /** * @inheritdoc diff --git a/tests/Feature/Http/Controllers/GoalControllerTest.php b/tests/Feature/Http/Controllers/GoalControllerTest.php index c63c73a..8768912 100644 --- a/tests/Feature/Http/Controllers/GoalControllerTest.php +++ b/tests/Feature/Http/Controllers/GoalControllerTest.php @@ -5,11 +5,9 @@ namespace Tests\Feature\Http\Controllers; use App\Http\Controllers\GoalController; use App\Models\Goal; use Database\Factories\GoalFactory; -use Illuminate\Foundation\Testing\RefreshDatabase; class GoalControllerTest extends HttpControllerTestCase { - use RefreshDatabase; /** * @inheritdoc diff --git a/tests/Feature/Http/Controllers/IngredientPickerControllerTest.php b/tests/Feature/Http/Controllers/IngredientPickerControllerTest.php index a4cc221..7d86a4e 100644 --- a/tests/Feature/Http/Controllers/IngredientPickerControllerTest.php +++ b/tests/Feature/Http/Controllers/IngredientPickerControllerTest.php @@ -6,7 +6,6 @@ use App\Http\Controllers\IngredientPickerController; use App\Models\Food; use App\Models\Recipe; use GuzzleHttp\Exception\ConnectException; -use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Support\Facades\Config; use Tests\LoggedInTestCase; @@ -15,7 +14,6 @@ use Tests\LoggedInTestCase; */ class IngredientPickerControllerTest extends LoggedInTestCase { - use RefreshDatabase; private function buildUrl(array $parameters = []): string { diff --git a/tests/Feature/Http/Controllers/JournalEntryControllerTest.php b/tests/Feature/Http/Controllers/JournalEntryControllerTest.php index e4815bf..609c008 100644 --- a/tests/Feature/Http/Controllers/JournalEntryControllerTest.php +++ b/tests/Feature/Http/Controllers/JournalEntryControllerTest.php @@ -6,12 +6,11 @@ use App\Http\Controllers\JournalEntryController; use App\Models\IngredientAmount; use App\Models\JournalEntry; use Database\Factories\JournalEntryFactory; -use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Foundation\Testing\WithFaker; class JournalEntryControllerTest extends HttpControllerTestCase { - use RefreshDatabase, WithFaker; + use WithFaker; /** * @inheritdoc diff --git a/tests/Feature/Http/Controllers/RecipeControllerTest.php b/tests/Feature/Http/Controllers/RecipeControllerTest.php index fbfe093..84db622 100644 --- a/tests/Feature/Http/Controllers/RecipeControllerTest.php +++ b/tests/Feature/Http/Controllers/RecipeControllerTest.php @@ -9,14 +9,12 @@ use App\Models\RecipeSeparator; use App\Models\RecipeStep; use Database\Factories\RecipeFactory; use Illuminate\Database\Eloquent\Collection; -use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Foundation\Testing\WithFaker; use Illuminate\Http\UploadedFile; -use Illuminate\Support\Facades\Storage; class RecipeControllerTest extends HttpControllerTestCase { - use RefreshDatabase, WithFaker; + use WithFaker; /** * @inheritdoc diff --git a/tests/Feature/JsonApi/FoodApiTest.php b/tests/Feature/JsonApi/FoodApiTest.php index 9952f39..92a0794 100644 --- a/tests/Feature/JsonApi/FoodApiTest.php +++ b/tests/Feature/JsonApi/FoodApiTest.php @@ -3,15 +3,13 @@ namespace Tests\Feature\JsonApi; use App\Models\Food; -use App\Models\Recipe; use Database\Factories\FoodFactory; -use Illuminate\Database\Eloquent\Collection; -use Illuminate\Foundation\Testing\RefreshDatabase; + use Tests\Feature\JsonApi\Traits\HasTags; class FoodApiTest extends JsonApiTestCase { - use RefreshDatabase, HasTags; + use HasTags; /** * @inheritdoc diff --git a/tests/Feature/JsonApi/GoalApiTest.php b/tests/Feature/JsonApi/GoalApiTest.php index ba870e6..f2f0248 100644 --- a/tests/Feature/JsonApi/GoalApiTest.php +++ b/tests/Feature/JsonApi/GoalApiTest.php @@ -5,12 +5,12 @@ namespace Tests\Feature\JsonApi; use App\Models\Goal; use Database\Factories\GoalFactory; use Illuminate\Database\Eloquent\Collection; -use Illuminate\Foundation\Testing\RefreshDatabase; + use Tests\Feature\JsonApi\Traits\BelongsToUser; class GoalApiTest extends JsonApiTestCase { - use RefreshDatabase, BelongsToUser; + use BelongsToUser; /** * @inheritdoc diff --git a/tests/Feature/JsonApi/IngredientAmountApiTest.php b/tests/Feature/JsonApi/IngredientAmountApiTest.php index 811cc46..6e09806 100644 --- a/tests/Feature/JsonApi/IngredientAmountApiTest.php +++ b/tests/Feature/JsonApi/IngredientAmountApiTest.php @@ -7,11 +7,9 @@ use App\Models\IngredientAmount; use App\Models\JournalEntry; use App\Models\Recipe; use Database\Factories\IngredientAmountFactory; -use Illuminate\Foundation\Testing\RefreshDatabase; class IngredientAmountApiTest extends JsonApiTestCase { - use RefreshDatabase; /** * @inheritdoc diff --git a/tests/Feature/JsonApi/JournalEntryApiTest.php b/tests/Feature/JsonApi/JournalEntryApiTest.php index 8d11783..8288f05 100644 --- a/tests/Feature/JsonApi/JournalEntryApiTest.php +++ b/tests/Feature/JsonApi/JournalEntryApiTest.php @@ -5,12 +5,11 @@ namespace Tests\Feature\JsonApi; use App\Models\JournalEntry; use Database\Factories\JournalEntryFactory; use Illuminate\Database\Eloquent\Collection; -use Illuminate\Foundation\Testing\RefreshDatabase; use Tests\Feature\JsonApi\Traits\BelongsToUser; class JournalEntryApiTest extends JsonApiTestCase { - use RefreshDatabase, BelongsToUser; + use BelongsToUser; /** * @inheritdoc diff --git a/tests/Feature/JsonApi/MediumApiTest.php b/tests/Feature/JsonApi/MediumApiTest.php index c874c68..d18dfce 100644 --- a/tests/Feature/JsonApi/MediumApiTest.php +++ b/tests/Feature/JsonApi/MediumApiTest.php @@ -5,11 +5,9 @@ namespace Tests\Feature\JsonApi; use App\Models\Recipe; use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Foundation\Testing\RefreshDatabase; class MediumApiTest extends JsonApiTestCase { - use RefreshDatabase; /** * @inheritdoc diff --git a/tests/Feature/JsonApi/RecipeApiTest.php b/tests/Feature/JsonApi/RecipeApiTest.php index b10facd..a42fbe6 100644 --- a/tests/Feature/JsonApi/RecipeApiTest.php +++ b/tests/Feature/JsonApi/RecipeApiTest.php @@ -4,12 +4,11 @@ namespace Tests\Feature\JsonApi; use App\Models\Recipe; use Database\Factories\RecipeFactory; -use Illuminate\Foundation\Testing\RefreshDatabase; use Tests\Feature\JsonApi\Traits\HasTags; class RecipeApiTest extends JsonApiTestCase { - use RefreshDatabase, HasTags; + use HasTags; /** * @inheritdoc diff --git a/tests/Feature/JsonApi/RecipeSeparatorApiTest.php b/tests/Feature/JsonApi/RecipeSeparatorApiTest.php index f59d4ae..d546bde 100644 --- a/tests/Feature/JsonApi/RecipeSeparatorApiTest.php +++ b/tests/Feature/JsonApi/RecipeSeparatorApiTest.php @@ -6,12 +6,11 @@ use App\Models\Recipe; use App\Models\RecipeSeparator; use Database\Factories\RecipeSeparatorFactory; use Illuminate\Database\Eloquent\Collection; -use Illuminate\Foundation\Testing\RefreshDatabase; use Tests\Feature\JsonApi\Traits\BelongsToRecipe; class RecipeSeparatorApiTest extends JsonApiTestCase { - use RefreshDatabase, BelongsToRecipe; + use BelongsToRecipe; /** * @inheritdoc diff --git a/tests/Feature/JsonApi/RecipeStepApiTest.php b/tests/Feature/JsonApi/RecipeStepApiTest.php index 7b1bd9e..f09784c 100644 --- a/tests/Feature/JsonApi/RecipeStepApiTest.php +++ b/tests/Feature/JsonApi/RecipeStepApiTest.php @@ -6,12 +6,11 @@ use App\Models\Recipe; use App\Models\RecipeStep; use Database\Factories\RecipeStepFactory; use Illuminate\Database\Eloquent\Collection; -use Illuminate\Foundation\Testing\RefreshDatabase; use Tests\Feature\JsonApi\Traits\BelongsToRecipe; class RecipeStepApiTest extends JsonApiTestCase { - use RefreshDatabase, BelongsToRecipe; + use BelongsToRecipe; /** * @inheritdoc diff --git a/tests/Feature/JsonApi/TagApiTest.php b/tests/Feature/JsonApi/TagApiTest.php index 9e70971..a096130 100644 --- a/tests/Feature/JsonApi/TagApiTest.php +++ b/tests/Feature/JsonApi/TagApiTest.php @@ -4,11 +4,9 @@ namespace Tests\Feature\JsonApi; use App\Models\Tag; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Foundation\Testing\RefreshDatabase; class TagApiTest extends JsonApiTestCase { - use RefreshDatabase; /** * @inheritdoc diff --git a/tests/Feature/JsonApi/UserApiTest.php b/tests/Feature/JsonApi/UserApiTest.php index d99c670..5fe13c6 100644 --- a/tests/Feature/JsonApi/UserApiTest.php +++ b/tests/Feature/JsonApi/UserApiTest.php @@ -4,11 +4,9 @@ namespace Tests\Feature\JsonApi; use App\Models\User; use Database\Factories\UserFactory; -use Illuminate\Foundation\Testing\RefreshDatabase; class UserApiTest extends JsonApiTestCase { - use RefreshDatabase; /** * @inheritdoc diff --git a/tests/Feature/Support/NutrientsTest.php b/tests/Feature/Support/NutrientsTest.php index 81cc776..58e1958 100644 --- a/tests/Feature/Support/NutrientsTest.php +++ b/tests/Feature/Support/NutrientsTest.php @@ -4,12 +4,10 @@ namespace Tests\Feature\Support; use App\Models\Food; use App\Support\Nutrients; -use Illuminate\Foundation\Testing\RefreshDatabase; use Tests\TestCase; class NutrientsTest extends TestCase { - use RefreshDatabase; /** * Test invalid Food nutrient multiplier calculation. diff --git a/tests/TestCase.php b/tests/TestCase.php index 2932d4a..29bd88b 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -2,9 +2,11 @@ namespace Tests; +use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Foundation\Testing\TestCase as BaseTestCase; abstract class TestCase extends BaseTestCase { use CreatesApplication; + use RefreshDatabase; } diff --git a/tests/Unit/Rules/ArrayNotEmptyTest.php b/tests/Unit/Rules/ArrayNotEmptyTest.php index cad3560..3ec9ea7 100644 --- a/tests/Unit/Rules/ArrayNotEmptyTest.php +++ b/tests/Unit/Rules/ArrayNotEmptyTest.php @@ -1,6 +1,5 @@