From 73ad8bb645f6feea0b6f73d18ce3afb53d22242e Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Thu, 28 Dec 2023 15:54:16 +0300 Subject: [PATCH 1/3] added plan index, edit tests --- tests/Feature/Plan/EditTest.php | 203 +++++++++++++++++++++++++++++++ tests/Feature/Plan/IndexTest.php | 35 ++++++ 2 files changed, 238 insertions(+) create mode 100644 tests/Feature/Plan/EditTest.php create mode 100644 tests/Feature/Plan/IndexTest.php diff --git a/tests/Feature/Plan/EditTest.php b/tests/Feature/Plan/EditTest.php new file mode 100644 index 0000000..005cde4 --- /dev/null +++ b/tests/Feature/Plan/EditTest.php @@ -0,0 +1,203 @@ +refreshApplicationWithLocale('en'); + + Storage::fake('tmp-for-tests'); + $this->image = UploadedFile::fake()->image('plan.png'); + + $this->user = User::factory()->create(['is_consultant' => true]); + $this->plan = Plan::factory()->create(); + } + + public function test_show_form_edit_plan() + { + $response = $this + ->actingAs($this->user) + ->get(route('plan.edit', $this->plan)); + + $response->assertSuccessful(); + } + + public function test_publish_new_plan_success(): void + { + $this->actingAs($this->user); + + $updatedPlanBeforeToAddDatabase = Plan::factory()->make(); + + $testCase = Livewire::test(Edit::class, [ + 'plan' => $this->plan, + ]) + ->set('name', $updatedPlanBeforeToAddDatabase->name) + ->assertSet('name', $updatedPlanBeforeToAddDatabase->name) + ->set('image', $this->image) + ->set('duration', $updatedPlanBeforeToAddDatabase->duration) + ->assertSet('duration', $updatedPlanBeforeToAddDatabase->duration) + ->set('state', $updatedPlanBeforeToAddDatabase->state) + ->assertSet('state', $updatedPlanBeforeToAddDatabase->state) + ->set('type', $updatedPlanBeforeToAddDatabase->type) + ->assertSet('type', $updatedPlanBeforeToAddDatabase->type) + ->set('details', $updatedPlanBeforeToAddDatabase->details) + ->assertSet('details', $updatedPlanBeforeToAddDatabase->details) + ->set('packets_count', $updatedPlanBeforeToAddDatabase->packets_count) + ->assertSet('packets_count', $updatedPlanBeforeToAddDatabase->packets_count) + ->set('packet1_options', $updatedPlanBeforeToAddDatabase->packet1_options) + ->assertSet('packet1_options', $updatedPlanBeforeToAddDatabase->packet1_options) + ->set('packet2_options', $updatedPlanBeforeToAddDatabase->packet2_options) + ->assertSet('packet2_options', $updatedPlanBeforeToAddDatabase->packet2_options) + ->set('packet3_options', $updatedPlanBeforeToAddDatabase->packet3_options) + ->assertSet('packet3_options', $updatedPlanBeforeToAddDatabase->packet3_options) + ->call('publish') + ->assertSuccessful() + ->assertHasNoErrors(['name', 'image', 'duration', 'details', 'packets_count', 'packet1_options', 'packet2_options', 'packet3_options']); + + $updatedPlanAfterToAddDatabase = Plan::orderByDesc('id')->first(); + + $newPlanUrl = route('plan.show', $updatedPlanAfterToAddDatabase, false); + + Storage::disk('tmp-for-tests')->assertExists($updatedPlanAfterToAddDatabase->image); + + + // check data after update recipe + self::assertEquals($updatedPlanBeforeToAddDatabase->name, $updatedPlanAfterToAddDatabase->name); + self::assertEquals($updatedPlanBeforeToAddDatabase->duration, $updatedPlanAfterToAddDatabase->duration); + self::assertEquals($updatedPlanBeforeToAddDatabase->state, $updatedPlanAfterToAddDatabase->state); + self::assertEquals($updatedPlanBeforeToAddDatabase->type, $updatedPlanAfterToAddDatabase->type); + self::assertEquals($updatedPlanBeforeToAddDatabase->details, $updatedPlanAfterToAddDatabase->details); + self::assertEquals($updatedPlanBeforeToAddDatabase->packets_count, $updatedPlanAfterToAddDatabase->packets_count); + self::assertEquals($updatedPlanBeforeToAddDatabase->packet1_options, $updatedPlanAfterToAddDatabase->packet1_options); + self::assertEquals($updatedPlanBeforeToAddDatabase->packet2_options, $updatedPlanAfterToAddDatabase->packet2_options); + self::assertEquals($updatedPlanBeforeToAddDatabase->packet3_options, $updatedPlanAfterToAddDatabase->packet3_options); + + $testCase->assertRedirect($newPlanUrl); + + } + + public function test_to_draft_new_plan_success(): void + { + $this->actingAs($this->user); + + $updatedPlanBeforeToAddDatabase = Plan::factory()->make(); + + $testCase = Livewire::test(Edit::class, [ + 'plan' => $this->plan, + ]) + ->set('name', $updatedPlanBeforeToAddDatabase->name) + ->assertSet('name', $updatedPlanBeforeToAddDatabase->name) + ->set('image', $this->image) + ->set('duration', $updatedPlanBeforeToAddDatabase->duration) + ->assertSet('duration', $updatedPlanBeforeToAddDatabase->duration) + ->set('state', $updatedPlanBeforeToAddDatabase->state) + ->assertSet('state', $updatedPlanBeforeToAddDatabase->state) + ->set('type', $updatedPlanBeforeToAddDatabase->type) + ->assertSet('type', $updatedPlanBeforeToAddDatabase->type) + ->set('details', $updatedPlanBeforeToAddDatabase->details) + ->assertSet('details', $updatedPlanBeforeToAddDatabase->details) + ->set('packets_count', $updatedPlanBeforeToAddDatabase->packets_count) + ->assertSet('packets_count', $updatedPlanBeforeToAddDatabase->packets_count) + ->set('packet1_options', $updatedPlanBeforeToAddDatabase->packet1_options) + ->assertSet('packet1_options', $updatedPlanBeforeToAddDatabase->packet1_options) + ->set('packet2_options', $updatedPlanBeforeToAddDatabase->packet2_options) + ->assertSet('packet2_options', $updatedPlanBeforeToAddDatabase->packet2_options) + ->set('packet3_options', $updatedPlanBeforeToAddDatabase->packet3_options) + ->assertSet('packet3_options', $updatedPlanBeforeToAddDatabase->packet3_options) + ->call('addToDrafts') + ->assertSuccessful() + ->assertHasNoErrors(['name', 'image', 'duration', 'details', 'packets_count', 'packet1_options', 'packet2_options', 'packet3_options']); + + $updatedPlanAfterToAddDatabase = Plan::orderByDesc('id')->first(); + + $newPlanUrl = route('plan.show', $updatedPlanAfterToAddDatabase, false); + + Storage::disk('tmp-for-tests')->assertExists($updatedPlanAfterToAddDatabase->image); + + // check data after update recipe + self::assertEquals($updatedPlanBeforeToAddDatabase->name, $updatedPlanAfterToAddDatabase->name); + self::assertEquals($updatedPlanBeforeToAddDatabase->duration, $updatedPlanAfterToAddDatabase->duration); + self::assertEquals('draft', $updatedPlanAfterToAddDatabase->state); + self::assertEquals($updatedPlanBeforeToAddDatabase->type, $updatedPlanAfterToAddDatabase->type); + self::assertEquals($updatedPlanBeforeToAddDatabase->details, $updatedPlanAfterToAddDatabase->details); + self::assertEquals($updatedPlanBeforeToAddDatabase->packets_count, $updatedPlanAfterToAddDatabase->packets_count); + self::assertEquals($updatedPlanBeforeToAddDatabase->packet1_options, $updatedPlanAfterToAddDatabase->packet1_options); + self::assertEquals($updatedPlanBeforeToAddDatabase->packet2_options, $updatedPlanAfterToAddDatabase->packet2_options); + self::assertEquals($updatedPlanBeforeToAddDatabase->packet3_options, $updatedPlanAfterToAddDatabase->packet3_options); + + $testCase->assertRedirect($newPlanUrl); + } + + public function test_to_preview_new_plan_success(): void + { + $this->actingAs($this->user); + + $updatedPlanBeforeToAddDatabase = Plan::factory()->make(); + + $testCase = Livewire::test(Edit::class, [ + 'plan' => $this->plan, + ]) + ->set('name', $updatedPlanBeforeToAddDatabase->name) + ->assertSet('name', $updatedPlanBeforeToAddDatabase->name) + ->set('image', $this->image) + ->set('duration', $updatedPlanBeforeToAddDatabase->duration) + ->assertSet('duration', $updatedPlanBeforeToAddDatabase->duration) + ->set('state', $updatedPlanBeforeToAddDatabase->state) + ->assertSet('state', $updatedPlanBeforeToAddDatabase->state) + ->set('type', $updatedPlanBeforeToAddDatabase->type) + ->assertSet('type', $updatedPlanBeforeToAddDatabase->type) + ->set('details', $updatedPlanBeforeToAddDatabase->details) + ->assertSet('details', $updatedPlanBeforeToAddDatabase->details) + ->set('packets_count', $updatedPlanBeforeToAddDatabase->packets_count) + ->assertSet('packets_count', $updatedPlanBeforeToAddDatabase->packets_count) + ->set('packet1_options', $updatedPlanBeforeToAddDatabase->packet1_options) + ->assertSet('packet1_options', $updatedPlanBeforeToAddDatabase->packet1_options) + ->set('packet2_options', $updatedPlanBeforeToAddDatabase->packet2_options) + ->assertSet('packet2_options', $updatedPlanBeforeToAddDatabase->packet2_options) + ->set('packet3_options', $updatedPlanBeforeToAddDatabase->packet3_options) + ->assertSet('packet3_options', $updatedPlanBeforeToAddDatabase->packet3_options) + ->call('showPreview') + ->assertSuccessful() + ->assertHasNoErrors(['name', 'image', 'duration', 'details', 'packets_count', 'packet1_options', 'packet2_options', 'packet3_options']); + + $updatedPlanAfterToAddDatabase = Plan::orderByDesc('id')->first(); + + $newPlanUrl = route('plan.show', $updatedPlanAfterToAddDatabase, false); + + Storage::disk('tmp-for-tests')->assertExists($updatedPlanAfterToAddDatabase->image); + + // check data after update recipe + self::assertEquals($updatedPlanBeforeToAddDatabase->name, $updatedPlanAfterToAddDatabase->name); + self::assertEquals($updatedPlanBeforeToAddDatabase->duration, $updatedPlanAfterToAddDatabase->duration); + self::assertEquals('unactive', $updatedPlanAfterToAddDatabase->state); + self::assertEquals($updatedPlanBeforeToAddDatabase->type, $updatedPlanAfterToAddDatabase->type); + self::assertEquals($updatedPlanBeforeToAddDatabase->details, $updatedPlanAfterToAddDatabase->details); + self::assertEquals($updatedPlanBeforeToAddDatabase->packets_count, $updatedPlanAfterToAddDatabase->packets_count); + self::assertEquals($updatedPlanBeforeToAddDatabase->packet1_options, $updatedPlanAfterToAddDatabase->packet1_options); + self::assertEquals($updatedPlanBeforeToAddDatabase->packet2_options, $updatedPlanAfterToAddDatabase->packet2_options); + self::assertEquals($updatedPlanBeforeToAddDatabase->packet3_options, $updatedPlanAfterToAddDatabase->packet3_options); + + $testCase->assertRedirect($newPlanUrl); + } + +} + diff --git a/tests/Feature/Plan/IndexTest.php b/tests/Feature/Plan/IndexTest.php new file mode 100644 index 0000000..88a889e --- /dev/null +++ b/tests/Feature/Plan/IndexTest.php @@ -0,0 +1,35 @@ +refreshApplicationWithLocale('en'); + + $this->user = User::factory()->create(['is_consultant' => true]); + $this->plan = Plan::inRandomOrder()->first(); + } + + public function test_index_page_success() + { + $response = $this + ->actingAs($this->user) + ->get(route('plan.index')); + + $response + ->assertOk(); + } +} From f6e0f915658eb4eae577d31fb56165d9d8cd75c7 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Thu, 28 Dec 2023 15:55:13 +0300 Subject: [PATCH 2/3] clear comments from tests --- app/Livewire/Plan/Edit.php | 4 ++-- tests/Feature/Plan/ShowTest.php | 9 --------- tests/Feature/Recipe/EditTest.php | 1 - 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/app/Livewire/Plan/Edit.php b/app/Livewire/Plan/Edit.php index 77a5c82..1a1918e 100644 --- a/app/Livewire/Plan/Edit.php +++ b/app/Livewire/Plan/Edit.php @@ -171,7 +171,7 @@ class Edit extends Component $this->validate(); $this->plan->name = $this->name; - $this->plan->image = ! is_string($this->image) ? $this->image->store('plans', 'public') : $this->image; + $this->plan->image = ! is_string($this->image) ? $this->image->store('plans') : $this->image; $this->plan->duration = $this->duration; $this->plan->state = $this->state; $this->plan->details = $this->details; @@ -186,7 +186,7 @@ class Edit extends Component // $user = Auth::user(); // $user->author_of_plans()->attach($plan->id); - $this->redirectRoute('recipe.show', $this->plan); + $this->redirectRoute('plan.show', $this->plan); } public function addToDrafts() diff --git a/tests/Feature/Plan/ShowTest.php b/tests/Feature/Plan/ShowTest.php index 7c060d3..8440615 100644 --- a/tests/Feature/Plan/ShowTest.php +++ b/tests/Feature/Plan/ShowTest.php @@ -2,15 +2,11 @@ namespace Tests\Feature\Plan; -use App\Livewire\Plan\Create; use App\Models\Plan; -// use Livewire\WithFileUploads; use App\Models\User; use Illuminate\Foundation\Testing\RefreshDatabase; -// use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Http\UploadedFile; use Illuminate\Support\Facades\Storage; -use Livewire\Livewire; use Tests\TestCase; class ShowTest extends TestCase @@ -18,8 +14,6 @@ class ShowTest extends TestCase // use RefreshDatabase; use RefreshDatabase; - private $image; - private $plan; protected User $user; @@ -28,9 +22,6 @@ class ShowTest extends TestCase { $this->refreshApplicationWithLocale('en'); - Storage::fake('plans'); - $this->image = UploadedFile::fake()->image('plan.png'); - $this->user = User::factory()->create(['is_consultant' => true]); $this->plan = Plan::inRandomOrder()->first(); } diff --git a/tests/Feature/Recipe/EditTest.php b/tests/Feature/Recipe/EditTest.php index 8a36566..d68d2f2 100644 --- a/tests/Feature/Recipe/EditTest.php +++ b/tests/Feature/Recipe/EditTest.php @@ -126,7 +126,6 @@ final class EditTest extends TestCase $newRecipeUrl = route('recipe.show', $recipeCreatedLast, false); Storage::disk('tmp-for-tests')->assertExists($recipeCreatedLast->image); - // $recipeUpdate->assertRedirect($newRecipeUrl); // check data after update recipe self::assertEquals($recipe->title, $recipeUpdate->title); From 675b4bc3aa8b087f6cb74af1121aff647f68a891 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Thu, 28 Dec 2023 16:18:47 +0300 Subject: [PATCH 3/3] added to edit plan test nothing changed --- tests/Feature/Plan/EditTest.php | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tests/Feature/Plan/EditTest.php b/tests/Feature/Plan/EditTest.php index 005cde4..c96db5a 100644 --- a/tests/Feature/Plan/EditTest.php +++ b/tests/Feature/Plan/EditTest.php @@ -199,5 +199,34 @@ class EditTest extends TestCase $testCase->assertRedirect($newPlanUrl); } + public function testNothingChange(): void + { + $this->actingAs($this->user); + + $planUpdate = Livewire::test(Edit::class, [ + 'plan' => $this->plan, + ]) + ->call('publish') + ->assertSuccessful() + ->assertHasNoErrors(['title', 'image', 'state', 'cooking_time', 'ingredients', 'type', 'description', 'steps', 'video_url']); + + $newPlanUrl = route('plan.show', $this->plan, false); + + Storage::disk('tmp-for-tests')->assertMissing($planUpdate->image); + + // check data after update recipe + self::assertEquals($this->plan->name, $planUpdate->name); + self::assertEquals($this->plan->duration, $planUpdate->duration); + self::assertEquals($this->plan->state, $planUpdate->state); + self::assertEquals($this->plan->type, $planUpdate->type); + self::assertEquals($this->plan->details, $planUpdate->details); + self::assertEquals($this->plan->packets_count, $planUpdate->packets_count); + self::assertIsArray($planUpdate->packet1_options); + self::assertIsArray($planUpdate->packet2_options); + self::assertIsArray($planUpdate->packet3_options); + + $planUpdate->assertRedirect($newPlanUrl); + } + }