...
 
Commits (2)
......@@ -9,7 +9,7 @@ class EventsController < ApplicationController
end
def show
@volunteers = Volunteer.active
@volunteers = Volunteer.all
@volunteers -= @event.event_volunteers.map(&:volunteer)
@event_volunteer = EventVolunteer.new(event: @event)
respond_to do |format|
......
......@@ -7,7 +7,6 @@ class EventsTest < ApplicationSystemTestCase
@department.contact.update(last_name: 'Event Department')
@event = create :event, department: @department
@volunteer1 = create :volunteer
@volunteer1.update(active: true)
login_as @user
end
......@@ -46,7 +45,7 @@ class EventsTest < ApplicationSystemTestCase
end
test 'removing a volunteer from an existing event' do
@volunteer2 = create :volunteer, active: true
@volunteer2 = create :volunteer
visit event_path(@event)
# adding first volunteer to the event
......