Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/controllers/better_together/events_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,15 @@ class EventsController < FriendlyResourceController
before_action :build_event_hosts, only: :new

def index
@events = @events
.includes(:categories, cover_image_attachment: :blob)

@draft_events = @events.draft
.page(params[:draft_page]).per(params[:per])
@upcoming_events = @events.upcoming
.page(params[:upcoming_page]).per(params[:per])
@past_events = @events.past
.page(params[:past_page]).per(params[:per])
end

def show
Expand Down
3 changes: 3 additions & 0 deletions app/views/better_together/events/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,22 @@
<div class="row">
<%= render(@draft_events) || render('none') %>
</div>
<%= paginate @draft_events %>
<% end %>

<% if @upcoming_events.size > 0 || @past_events.size > 0 %>
<h2>Upcoming</h2>
<div class="row">
<%= render(@upcoming_events) || render('none') %>
</div>
<%= paginate @upcoming_events %>

<% if @past_events.size > 0 %>
<h2>Past</h2>
<div class="row">
<%= render(@past_events) %>
</div>
<%= paginate @past_events %>
<% end %>
<% else %>
<div class="row">
Expand Down
2 changes: 2 additions & 0 deletions spec/factories/better_together/events.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# frozen_string_literal: true

require 'faker'

FactoryBot.define do
factory 'better_together/event',
class: 'BetterTogether::Event',
Expand Down
35 changes: 35 additions & 0 deletions spec/features/events/index_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# frozen_string_literal: true

require 'rails_helper'

RSpec.describe 'events index', type: :feature do
include BetterTogether::DeviseSessionHelpers

before do
configure_host_platform
login_as_platform_manager
end

let!(:draft_event) { create(:event, :draft, name: 'Draft Event') }
let!(:upcoming_event) { create(:event, name: 'Upcoming Event', starts_at: 1.day.from_now) }
let!(:past_event) { create(:event, name: 'Past Event', starts_at: 2.days.ago) }

scenario 'displays events grouped by status' do
visit events_path(locale: I18n.default_locale)

draft_section = find('h2', text: 'Draft').sibling('div')
within(draft_section) do
expect(page).to have_content(draft_event.name)
end

upcoming_section = find('h2', text: 'Upcoming').sibling('div')
within(upcoming_section) do
expect(page).to have_content(upcoming_event.name)
end

past_section = find('h2', text: 'Past').sibling('div')
within(past_section) do
expect(page).to have_content(past_event.name)
end
end
end
60 changes: 60 additions & 0 deletions spec/requests/better_together/events_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# frozen_string_literal: true

require 'rails_helper'

RSpec.describe 'Events', type: :request do
include BetterTogether::Engine.routes.url_helpers
include RequestSpecHelper

let(:locale) { I18n.default_locale }

describe 'GET /events' do
let!(:event) { create(:event) }

it 'returns http success' do
get events_path(locale: locale)
expect(response).to have_http_status(:success)
end
end

describe 'POST /events' do
let(:user) { create(:better_together_user, :confirmed, :platform_manager) }

before { login(user) }

it 'creates an event' do
expect do
post events_path(locale: locale),
params: { event: { name: 'New Event', starts_at: 1.day.from_now } }
end.to change(BetterTogether::Event, :count).by(1)
expect(response).to redirect_to(event_path(BetterTogether::Event.last, locale: locale))
end
end

describe 'PATCH /events/:id' do
let(:user) { create(:better_together_user, :confirmed, :platform_manager) }
let!(:event) { create(:event, name: 'Old Name', creator: user.person) }

before { login(user) }

it 'updates the event' do
patch event_path(event, locale: locale), params: { event: { name: 'Updated Name', starts_at: 1.day.from_now } }
expect(response).to redirect_to(edit_event_path(event, locale: locale))
expect(event.reload.name).to eq('Updated Name')
end
end

describe 'DELETE /events/:id' do
let(:user) { create(:better_together_user, :confirmed, :platform_manager) }
let!(:event) { create(:event, name: 'Delete Me', creator: user.person) }

before { login(user) }

it 'destroys the event' do
expect do
delete event_path(event, locale: locale)
end.to change(BetterTogether::Event, :count).by(-1)
expect(response).to redirect_to(events_path(locale: locale))
end
end
end
Loading