Fix tests

resources/js/views/member/MemberMemberships.vue

@@ -7,26 +7,24 @@
     </page-header>
 
     <form v-if="single" class="p-6 grid gap-4 justify-start" @submit.prevent="submit">
-        <f-select id="group_id" v-model="single.group_id" name="group_id" :options="meta.groups" label="Gruppierung" required></f-select>
-        <f-select id="activity_id" v-model="single.activity_id" name="activity_id" :options="meta.activities" label="Tätigkeit" required></f-select>
-        <f-select
-            v-if="single.activity_id"
-            id="subactivity_id"
-            :model-value="single.subactivity_id"
-            name="subactivity_id"
-            :options="meta.subactivities[single.activity_id]"
-            label="Untertätigkeit"
-            @update:modelValue="setSubactivityId(single, $event)"
-        ></f-select>
-        <f-switch
-            v-if="displayPromisedAt"
-            id="has_promise"
-            name="has_promise"
-            :model-value="single.promised_at !== null"
-            label="Hat Versprechen"
-            @update:modelValue="setPromisedAtSwitch(single, $event)"
-        ></f-switch>
-        <f-text v-show="displayPromisedAt && single.promised_at !== null" id="promised_at" v-model="single.promised_at" type="date" label="Versprechensdatum" size="sm"></f-text>
+        <f-select id="group_id" v-model="single.group_id" name="group_id" :options="meta.groups" label="Gruppierung" required />
+        <f-select id="activity_id" v-model="single.activity_id" name="activity_id" :options="meta.activities" label="Tätigkeit" required />
+        <f-select v-if="single.activity_id"
+                  id="subactivity_id"
+                  :model-value="single.subactivity_id"
+                  name="subactivity_id"
+                  :options="meta.subactivities[single.activity_id]"
+                  label="Untertätigkeit"
+                  @update:model-value="setSubactivityId(single, $event)"
+        />
+        <f-switch v-if="displayPromisedAt"
+                  id="has_promise"
+                  name="has_promise"
+                  :model-value="single.promised_at !== null"
+                  label="Hat Versprechen"
+                  @update:model-value="setPromisedAtSwitch(single, $event)"
+        />
+        <f-text v-show="displayPromisedAt && single.promised_at !== null" id="promised_at" v-model="single.promised_at" type="date" label="Versprechensdatum" size="sm" />
         <button type="submit" class="btn btn-primary">Absenden</button>
     </form>
 
@@ -37,17 +35,17 @@
                 <th>Untertätigkeit</th>
                 <th>Datum</th>
                 <th>Aktiv</th>
-                <th></th>
+                <th />
             </thead>
 
             <tr v-for="(membership, index) in data" :key="index">
-                <td v-text="membership.activity_name"></td>
-                <td v-text="membership.subactivity_name"></td>
-                <td v-text="membership.human_date"></td>
-                <td><ui-boolean-display :value="membership.is_active" dark></ui-boolean-display></td>
+                <td v-text="membership.activity_name" />
+                <td v-text="membership.subactivity_name" />
+                <td v-text="membership.human_date" />
+                <td><ui-boolean-display :value="membership.is_active" dark /></td>
                 <td class="flex space-x-1">
-                    <a href="#" class="inline-flex btn btn-warning btn-sm" @click.prevent="edit(membership)"><ui-sprite src="pencil"></ui-sprite></a>
-                    <a href="#" class="inline-flex btn btn-danger btn-sm" @click.prevent="remove(membership)"><ui-sprite src="trash"></ui-sprite></a>
+                    <a href="#" class="inline-flex btn btn-warning btn-sm" @click.prevent="edit(membership)"><ui-sprite src="pencil" /></a>
+                    <a href="#" class="inline-flex btn btn-danger btn-sm" @click.prevent="remove(membership)"><ui-sprite src="trash" /></a>
                 </td>
             </tr>
         </table>

resources/js/views/member/VIndex.vue

@@ -22,9 +22,9 @@
                 <member-filter-fields :model-value="filter" @update:model-value="setFilterObject($event)" />
             </template>
             <template #buttons>
-                <f-text id="search" :model-value="filter.search" label="Suchen …" size="sm" @update:model-value="setFilterObject({...filter, search: $event})"></f-text>
+                <f-text id="search" :model-value="filter.search" label="Suchen …" size="sm" @update:model-value="setFilterObject({...filter, search: $event})" />
                 <button class="btn btn-primary label mr-2" @click.prevent="exportMembers">
-                    <ui-sprite class="w-3 h-3 xl:mr-2" src="save"></ui-sprite>
+                    <ui-sprite class="w-3 h-3 xl:mr-2" src="save" />
                     <span class="hidden xl:inline">Exportieren</span>
                 </button>
             </template>
@@ -32,7 +32,7 @@
 
         <table cellspacing="0" cellpadding="0" border="0" class="custom-table custom-table-sm hidden md:table">
             <thead>
-                <th></th>
+                <th />
                 <th>Nachname</th>
                 <th>Vorname</th>
                 <th class="!hidden 2xl:!table-cell">Ort</th>
@@ -40,26 +40,26 @@
                 <th class="!hidden xl:!table-cell">Alter</th>
                 <th v-if="hasModule('bill')" class="!hidden xl:!table-cell">Rechnung</th>
                 <th v-if="hasModule('bill')">Ausstand</th>
-                <th></th>
+                <th />
             </thead>
 
             <tr v-for="(member, index) in data" :key="index">
-                <td><ui-age-groups :member="member"></ui-age-groups></td>
-                <td v-text="member.lastname"></td>
-                <td v-text="member.firstname"></td>
-                <td class="!hidden 2xl:!table-cell" v-text="member.full_address"></td>
+                <td><ui-age-groups :member="member" /></td>
+                <td v-text="member.lastname" />
+                <td v-text="member.firstname" />
+                <td class="!hidden 2xl:!table-cell" v-text="member.full_address" />
                 <td>
-                    <tags :member="member"></tags>
+                    <tags :member="member" />
                 </td>
-                <td class="!hidden xl:!table-cell" v-text="member.age"></td>
+                <td class="!hidden xl:!table-cell" v-text="member.age" />
                 <td v-if="hasModule('bill')" class="!hidden xl:!table-cell">
-                    <ui-label :value="member.bill_kind_name" fallback="kein"></ui-label>
+                    <ui-label :value="member.bill_kind_name" fallback="kein" />
                 </td>
                 <td v-if="hasModule('bill')">
-                    <ui-label :value="member.pending_payment" fallback="---"></ui-label>
+                    <ui-label :value="member.pending_payment" fallback="---" />
                 </td>
                 <td>
-                    <actions :member="member" @sidebar="openSidebar($event, member)" @remove="remove(member)"></actions>
+                    <actions :member="member" @sidebar="openSidebar($event, member)" @remove="remove(member)" />
                 </td>
             </tr>
         </table>
@@ -67,28 +67,28 @@
         <div class="md:hidden p-3 grid gap-3">
             <ui-box v-for="(member, index) in data" :key="index" class="relative" :heading="member.fullname">
                 <template #in-title>
-                    <ui-age-groups class="ml-2" :member="member" icon-class="w-4 h-4"></ui-age-groups>
+                    <ui-age-groups class="ml-2" :member="member" icon-class="w-4 h-4" />
                 </template>
-                <div class="text-xs text-gray-200" v-text="member.full_address"></div>
+                <div class="text-xs text-gray-200" v-text="member.full_address" />
                 <div class="flex items-center mt-1 space-x-4">
-                    <tags :member="member"></tags>
-                    <ui-label v-show="hasModule('bill')" class="text-gray-100 block" :value="member.pending_payment" fallback=""></ui-label>
+                    <tags :member="member" />
+                    <ui-label v-show="hasModule('bill')" class="text-gray-100 block" :value="member.pending_payment" fallback="" />
                 </div>
-                <actions class="mt-2" :member="member" @sidebar="openSidebar($event, member)" @remove="remove(member)"> </actions>
+                <actions class="mt-2" :member="member" @sidebar="openSidebar($event, member)" @remove="remove(member)" />
                 <div class="absolute right-0 top-0 h-full flex items-center mr-2">
-                    <i-link v-tooltip="`Details`" :href="member.links.show"><ui-sprite src="chevron" class="w-6 h-6 text-teal-100 -rotate-90"></ui-sprite></i-link>
+                    <i-link v-tooltip="`Details`" :href="member.links.show"><ui-sprite src="chevron" class="w-6 h-6 text-teal-100 -rotate-90" /></i-link>
                 </div>
             </ui-box>
         </div>
 
         <div class="px-6">
-            <ui-pagination class="mt-4" :value="meta" @reload="reloadPage"></ui-pagination>
+            <ui-pagination class="mt-4" :value="meta" @reload="reloadPage" />
         </div>
 
         <ui-sidebar v-if="single !== null" @close="closeSidebar">
-            <member-invoice-positions v-if="single.type === 'invoicePosition'" :url="single.model.links.invoiceposition_index" @close="closeSidebar"></member-invoice-positions>
-            <member-memberships v-if="single.type === 'membership'" :url="single.model.links.membership_index" @close="closeSidebar"></member-memberships>
-            <member-courses v-if="single.type === 'courses'" :url="single.model.links.course_index" @close="closeSidebar"></member-courses>
+            <member-invoice-positions v-if="single.type === 'invoicePosition'" :url="single.model.links.invoiceposition_index" @close="closeSidebar" />
+            <member-memberships v-if="single.type === 'membership'" :url="single.model.links.membership_index" @close="closeSidebar" />
+            <member-courses v-if="single.type === 'courses'" :url="single.model.links.course_index" @close="closeSidebar" />
         </ui-sidebar>
     </page-layout>
 </template>
@@ -107,7 +107,7 @@ const single = ref(null);
 const deleting = ref(null);
 
 const props = defineProps(indexProps);
-var {router, data, meta, filter, setFilterObject, filterString, reloadPage} = useIndex(props.data, 'member');
+const {router, data, meta, filter, setFilterObject, filterString, reloadPage} = useIndex(props.data, 'member');
 
 function exportMembers() {
     window.open(`/member-export?filter=${filterString.value}`);

tests/EndToEnd/Member/IndexTest.php

@@ -130,20 +130,6 @@ class IndexTest extends EndToEndTestCase
         $this->assertInertiaHas(null, $response, 'data.data.0.birthday');
     }
 
-    public function testItShowsActivitiesAndSubactivities(): void
-    {
-        $this->withoutExceptionHandling()->login()->loginNami();
-        $activity = Activity::factory()->hasAttached(Subactivity::factory()->name('Biber'))->name('€ Mitglied')->create();
-        $subactivity = $activity->subactivities->first();
-
-        sleep(1);
-        $this->get('/member')
-            ->assertInertiaPath("data.meta.formSubactivities.{$activity->id}.{$subactivity->id}", 'Biber')
-            ->assertInertiaPath("data.meta.filterSubactivities.0.name", 'Biber')
-            ->assertInertiaPath("data.meta.filterSubactivities.0.id", $activity->id)
-            ->assertInertiaPath("data.meta.formActivities.{$activity->id}", '€ Mitglied');
-    }
-
     public function testItCanFilterForBillKinds(): void
     {
         $this->withoutExceptionHandling()->login()->loginNami();

tests/Feature/Member/CreateTest.php

@@ -23,18 +23,8 @@ class CreateTest extends TestCase
 
     public function testItDisplaysCreatePage(): void
     {
-        $activity = Activity::factory()->inNami(5)->hasAttached(Subactivity::factory()->inNami(23)->name('Biber'))->name('€ Mitglied')->create();
-        $subactivity = $activity->subactivities->first();
-
-        $response = $this->get(route('member.create'));
-
-        $this->assertInertiaHas('Biber', $response, "meta.formSubactivities.{$activity->id}.{$subactivity->id}");
-        $this->assertInertiaHas('€ Mitglied', $response, "meta.formActivities.{$activity->id}");
-        $this->assertInertiaHas(['name' => 'E-Mail', 'id' => 'E-Mail'], $response, 'meta.billKinds.0');
-
-        $this->assertInertiaHas([
-            'address' => '',
-        ], $response, 'meta.default');
+        $this->get(route('member.create'))
+            ->assertInertiaPath('meta.default.address', '');
     }
 
     public function testItDoesntDisplayActivitiesAndSubactivitiesNotInNami(): void

tests/Feature/Member/EditTest.php

@@ -30,8 +30,6 @@ class EditTest extends TestCase
 
         $response = $this->get(route('member.edit', ['member' => $member]));
 
-        $this->assertInertiaHas('Biber', $response, "meta.formSubactivities.{$activity->id}.{$subactivity->id}");
-        $this->assertInertiaHas('€ Mitglied', $response, "meta.formActivities.{$activity->id}");
         $this->assertInertiaHas('Max', $response, 'data.firstname');
         $this->assertInertiaHas(false, $response, 'data.keepdata');
         $this->assertInertiaHas('Doktor', $response, 'data.salutation');