silva
/
adrema
2
1
Fork 0
Code Issues 23 Pull Requests 1 Projects 1 Releases 106 Wiki Activity

Fix tests

This commit is contained in:
Philipp Lang 2023-10-16 15:48:03 +02:00
parent 20833426ca
commit 8846adef5b
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Membership/Actions/MembershipStoreAction.php
View File

@ -14,7 +14,6 @@ use App\Setting\NamiSettings;
use App\Subactivity; use App\Subactivity;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Response;
use Illuminate\Validation\Rule; use Illuminate\Validation\Rule;
use Illuminate\Validation\Rules\In; use Illuminate\Validation\Rules\In;
use Illuminate\Validation\ValidationException; use Illuminate\Validation\ValidationException;

4
app/Membership/Actions/StoreForGroupAction.php
View File

@ -9,7 +9,6 @@ use App\Lib\Queue\TracksJob;
use App\Maildispatcher\Actions\ResyncAction; use App\Maildispatcher\Actions\ResyncAction;
use App\Member\Member; use App\Member\Member;
use App\Member\Membership; use App\Member\Membership;
use App\Setting\NamiSettings;
use App\Subactivity; use App\Subactivity;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Lorisleiva\Actions\ActionRequest; use Lorisleiva\Actions\ActionRequest;
@ -47,7 +46,7 @@ class StoreForGroupAction
]; ];
Membership::where($attributes)->active()->whereNotIn('member_id', $members)->get() Membership::where($attributes)->active()->whereNotIn('member_id', $members)->get()
->each(fn ($membership) => MembershipDestroyAction::run($membership->member, $membership, app(NamiSettings::class))); ->each(fn ($membership) => MembershipDestroyAction::run($membership));
collect($members) collect($members)
->except(Membership::where($attributes)->active()->pluck('member_id')) ->except(Membership::where($attributes)->active()->pluck('member_id'))
@ -58,7 +57,6 @@ class StoreForGroupAction
$subactivity, $subactivity,
$group, $group,
null, null,
app(NamiSettings::class),
)); ));

4
tests/Feature/Member/DeleteTest.php
View File

@ -85,7 +85,7 @@ class DeleteTest extends TestCase
MemberDeleteAction::dispatch($member->id, $uuid); MemberDeleteAction::dispatch($member->id, $uuid);
Event::assertNotDispatched(JobStarted::class); Event::assertNotDispatched(JobStarted::class);
Event::assertDispatched(JobFinished::class, fn ($event) => $event->message === 'Mitglied Max Muster gelöscht' && $event->reload === true && $event->jobId->serialize() === $uuid->serialize()); Event::assertDispatched(JobFinished::class, fn ($event) => $event->message === 'Mitglied Max Muster gelöscht' && $event->jobId->serialize() === $uuid->serialize());
} }
public function testItFiresEventWhenDeletingFailed(): void public function testItFiresEventWhenDeletingFailed(): void
@ -102,7 +102,7 @@ class DeleteTest extends TestCase
} }
Event::assertNotDispatched(JobStarted::class); Event::assertNotDispatched(JobStarted::class);
Event::assertDispatched(JobFailed::class, fn ($event) => $event->message === 'Löschen von Max Muster fehlgeschlagen.' && $event->reload === true && $event->jobId->serialize() === $uuid->serialize()); Event::assertDispatched(JobFailed::class, fn ($event) => $event->message === 'Löschen von Max Muster fehlgeschlagen.' && $event->jobId->serialize() === $uuid->serialize());
Event::assertNotDispatched(JobFinished::class); Event::assertNotDispatched(JobFinished::class);
} }
} }