Skip to content
Merged
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
24 changes: 0 additions & 24 deletions app/controllers/admin/groups_controller.rb
Original file line number Diff line number Diff line change
@@ -1,24 +1,6 @@
class Admin::GroupsController < Admin::ApplicationController
after_action :verify_authorized

def new
@group = Group.new
authorize @group
end

def create
@group = Group.new(group_params)
authorize @group

if @group.save
flash[:notice] = "Group #{@group.name} for chapter #{@group.chapter.name} has been successfully created"
redirect_to [:admin, @group]
else
flash[:notice] = @group.errors.full_messages
render 'new'
end
end

def show
@group = Group.find(params[:id])
authorize @group
Expand All @@ -27,10 +9,4 @@ def show
@total_count = @group.members.count
@pagy, @members = pagy(Group.members_by_recent_rsvp(@group), items: 20)
end

private

def group_params
params.expect(group: %i[name description chapter_id])
end
end
4 changes: 0 additions & 4 deletions app/policies/group_policy.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
class GroupPolicy < ApplicationPolicy
def create?
user.is_admin?
end

def show?
admin_or_chapter_organiser?
end
Expand Down
13 changes: 0 additions & 13 deletions app/views/admin/groups/new.html.haml

This file was deleted.

3 changes: 0 additions & 3 deletions app/views/layouts/_admin_menu.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
%li
= link_to new_admin_chapter_path, class: 'dropdown-item' do
New chapter
%li
= link_to new_admin_group_path, class: 'dropdown-item' do
New group
%li
= link_to admin_testimonials_path, class: 'dropdown-item' do
Testimonials
Expand Down
2 changes: 1 addition & 1 deletion config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
end

resources :meeting_invitations, only: %i[create update]
resources :groups, only: %i[index new create show]
resources :groups, only: %i[show]
resources :sponsors, except: [:destroy]
resources :feedback, only: [:index]
resources :contacts
Expand Down
19 changes: 0 additions & 19 deletions spec/features/admin/groups_spec.rb
Original file line number Diff line number Diff line change
@@ -1,23 +1,4 @@
RSpec.feature 'admin groups', type: :feature do
describe '#creating a new group' do
let(:member) { Fabricate(:member) }

before do
Fabricate(:chapter, name: 'Brighton')
login_as_admin(member)
end

scenario 'an admin can create a new chapter' do
visit new_admin_group_path

select 'Students', from: 'group[name]'
select 'Brighton', from: 'group[chapter_id]'
click_on 'Create group'

expect(page).to have_text('Group Students for chapter Brighton has been successfully created')
end
end

describe '#show page' do
let(:member) { Fabricate(:member) }
let(:chapter) { Fabricate(:chapter, name: 'Brighton') }
Expand Down
18 changes: 0 additions & 18 deletions spec/policies/group_policy_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,6 @@
let(:admin) { Fabricate(:member).tap { |m| m.add_role(:admin) } }
let(:regular_member) { Fabricate(:member) }

describe '#create?' do
context 'when user is admin' do
let(:user) { admin }

it 'permits access' do
expect(policy.create?).to be true
end
end

context 'when user is regular member' do
let(:user) { regular_member }

it 'denies access' do
expect(policy.create?).to be false
end
end
end

describe '#show?' do
context 'when user is admin' do
let(:user) { admin }
Expand Down