diff --git a/tests/Feature/Membership/ManageTest.php b/tests/Feature/Membership/ManageTest.php index bd9539fb..8644727e 100644 --- a/tests/Feature/Membership/ManageTest.php +++ b/tests/Feature/Membership/ManageTest.php @@ -32,8 +32,8 @@ it('lists memberships of users', function () { $activity->subactivities()->first(); $this->callFilter('membership.index', []) ->assertInertia(fn(Assert $page) => $page - ->has('data', 1) - ->has('data.0', fn(Assert $page) => $page + ->has('data.data', 1) + ->has('data.data.0', fn(Assert $page) => $page ->where('activity.name', 'Act') ->where('subactivity.name', 'SubAct') ->where('member.fullname', 'Max Muster') @@ -42,7 +42,7 @@ it('lists memberships of users', function () { ->where('links.update', route('membership.update', $member->memberships->first())) ->where('links.destroy', route('membership.destroy', $member->memberships->first())) ->etc() - )->has('meta', fn (Assert $page) => $page + )->has('data.meta', fn (Assert $page) => $page ->where('current_page', 1) ->where('activities.0.name', 'Act') ->where('subactivities.0.name', 'SubAct') @@ -66,12 +66,12 @@ it('lists end date', function () { $this->callFilter('membership.index', ['active' => null]) ->assertInertia(fn(Assert $page) => $page - ->has('data.0', fn(Assert $page) => $page + ->has('data.data.0', fn(Assert $page) => $page ->where('to.human', now()->subDays(2)->format('d.m.Y')) ->where('links.update', route('membership.update', $member->memberships->first())) ->where('links.destroy', route('membership.destroy', $member->memberships->first())) ->etc() - )->has('meta', fn (Assert $page) => $page + )->has('data.meta', fn (Assert $page) => $page ->where('current_page', 1) ->etc() ) @@ -83,10 +83,10 @@ it('filters for active', function () { Membership::factory()->defaults()->ended()->create(); Membership::factory()->defaults()->count(2)->create(); - $this->callFilter('membership.index', [])->assertInertia(fn(Assert $page) => $page->has('data', 2)); - $this->callFilter('membership.index', ['active' => null])->assertInertia(fn(Assert $page) => $page->has('data', 3)); - $this->callFilter('membership.index', ['active' => false])->assertInertia(fn(Assert $page) => $page->has('data', 1)); - $this->callFilter('membership.index', ['active' => true])->assertInertia(fn(Assert $page) => $page->has('data', 2)); + $this->callFilter('membership.index', [])->assertInertia(fn(Assert $page) => $page->has('data.data', 2)); + $this->callFilter('membership.index', ['active' => null])->assertInertia(fn(Assert $page) => $page->has('data.data', 3)); + $this->callFilter('membership.index', ['active' => false])->assertInertia(fn(Assert $page) => $page->has('data.data', 1)); + $this->callFilter('membership.index', ['active' => true])->assertInertia(fn(Assert $page) => $page->has('data.data', 2)); }); it('filters for group', function () { @@ -95,8 +95,8 @@ it('filters for group', function () { $m2 = Membership::factory()->defaults()->create(); $this->callFilter('membership.index', [])->assertInertia(fn(Assert $page) => $page->has('data', 3)); - $this->callFilter('membership.index', ['groups' => [$m1->first()->group_id]])->assertInertia(fn(Assert $page) => $page->has('data', 2)->where('meta.filter.groups', [$m1->first()->group_id])); - $this->callFilter('membership.index', ['groups' => [$m2->group_id]])->assertInertia(fn(Assert $page) => $page->has('data', 1)->where('meta.filter.groups', [$m2->group_id])); + $this->callFilter('membership.index', ['groups' => [$m1->first()->group_id]])->assertInertia(fn(Assert $page) => $page->has('data.data', 2)->where('data.meta.filter.groups', [$m1->first()->group_id])); + $this->callFilter('membership.index', ['groups' => [$m2->group_id]])->assertInertia(fn(Assert $page) => $page->has('data.data', 1)->where('data.meta.filter.groups', [$m2->group_id])); }); it('filters for activity', function () { @@ -105,8 +105,8 @@ it('filters for activity', function () { $m2 = Membership::factory()->defaults()->create(); $this->callFilter('membership.index', [])->assertInertia(fn(Assert $page) => $page->has('data', 3)); - $this->callFilter('membership.index', ['activities' => [$m1->first()->activity_id]])->assertInertia(fn(Assert $page) => $page->has('data', 2)->where('meta.filter.activities', [$m1->first()->activity_id])); - $this->callFilter('membership.index', ['activities' => [$m2->activity_id]])->assertInertia(fn(Assert $page) => $page->has('data', 1)->where('meta.filter.activities', [$m2->activity_id])); + $this->callFilter('membership.index', ['activities' => [$m1->first()->activity_id]])->assertInertia(fn(Assert $page) => $page->has('data.data', 2)->where('data.meta.filter.activities', [$m1->first()->activity_id])); + $this->callFilter('membership.index', ['activities' => [$m2->activity_id]])->assertInertia(fn(Assert $page) => $page->has('data.data', 1)->where('data.meta.filter.activities', [$m2->activity_id])); }); it('filters for subactivity', function () { @@ -115,6 +115,6 @@ it('filters for subactivity', function () { $m2 = Membership::factory()->defaults()->create(); $this->callFilter('membership.index', [])->assertInertia(fn(Assert $page) => $page->has('data', 3)); - $this->callFilter('membership.index', ['subactivities' => [$m1->first()->subactivity_id]])->assertInertia(fn(Assert $page) => $page->has('data', 2)->where('meta.filter.subactivities', [$m1->first()->subactivity_id])); - $this->callFilter('membership.index', ['subactivities' => [$m2->subactivity_id]])->assertInertia(fn(Assert $page) => $page->has('data', 1)->where('meta.filter.subactivities', [$m2->subactivity_id])); + $this->callFilter('membership.index', ['subactivities' => [$m1->first()->subactivity_id]])->assertInertia(fn(Assert $page) => $page->has('data.data', 2)->where('data.meta.filter.subactivities', [$m1->first()->subactivity_id])); + $this->callFilter('membership.index', ['subactivities' => [$m2->subactivity_id]])->assertInertia(fn(Assert $page) => $page->has('data.data', 1)->where('data.meta.filter.subactivities', [$m2->subactivity_id])); });