Fix 'Past RSVPs' page

app/controllers/admin/members_controller.rb

@@ -15,8 +15,8 @@ def show
   def events
     load_attendance_data(@member)
 
-    past_rsvps = @member.past_rsvps
-    @pagy, @past_rsvps = pagy(:offset, items: past_rsvps)
+    @member = MemberPresenter.new(@member)
+    @pagy, @past_rsvps = pagy(:offset, @member.past_rsvps)
   end
 
   def update_subscriptions

app/views/admin/members/events.html.haml

@@ -15,9 +15,9 @@
 
       - if @past_rsvps.any?
         %h3 Past RSVPs
-        = render partial: 'shared/pagination', locals: { pagy: @pagy, model: 'events' }
+        = render partial: 'shared/pagination', locals: { pagy: @pagy, model: 'event' }
 
         - @past_rsvps.each do |invitation|
           = render EventPresenter.decorate(invitation.event), invitation: invitation
 
-        = render partial: 'shared/pagination', locals: { pagy: @pagy, model: 'events' }
+        = render partial: 'shared/pagination', locals: { pagy: @pagy, model: 'event' }

app/views/shared/_pagination.html.haml

@@ -1,6 +1,6 @@
 .row.align-items-center.justify-content-between
   .col-auto
     %p.mb-3
-      != pagy.info_tag(item_name: model.pluralize(pagy.count))
+      != pagy.info_tag(item_name: model)
   .col-auto
     != pagy.series_nav(:bootstrap) if pagy.pages > 1

spec/features/admin/members_spec.rb

@@ -27,6 +27,13 @@
       end
     end
 
+    it 'can view paginated list of past RSVPs' do
+      click_on 'View all RSVPS'
+
+      expect(page).to have_content('Past RSVPs')
+      expect(page).to have_content('Displaying 1 event')
+    end
+
     it 'can add a note about a member' do
       click_on 'Add note'
       fill_in 'member_note_note', with: 'Bananas and custard'

spec/features/admin/sponsor_spec.rb

@@ -58,7 +58,7 @@
       click_on 'Filter'
 
       expect(page.all(:css, 'tbody tr', count: 0))
-      expect(page).to have_content('No sponsors found')
+      expect(page).to have_content('No sponsor found')
     end
 
     scenario 'can clear filtering form' do