Roles into their own controller. Rework interface. Add flash messages to ajax calls. Add description to roles. Possible to edit roles in use.
This commit is contained in:
parent
eda5c2bc07
commit
ccd7ecbb90
59 changed files with 618 additions and 356 deletions
|
|
@ -5,7 +5,7 @@ describe Admin::CommentsController, type: :controller do
|
|||
# It is necessary to use bang version of let to build roles before user
|
||||
let(:conference) { create(:conference) }
|
||||
let!(:first_user) { create(:user) }
|
||||
let!(:organizer_role) { create(:role, name: 'organizer', resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let(:organizer) { create(:user, role_ids: organizer_role.id, last_sign_in_at: Time.now - 1.day) }
|
||||
let(:participant) { create(:user) }
|
||||
let(:event) { create(:event, program: conference.program) }
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ describe Admin::ConferenceController do
|
|||
# It is necessary to use bang version of let to build roles before user
|
||||
let(:conference) { create(:conference, end_date: Date.new(2014, 05, 26) + 15) }
|
||||
let!(:first_user) { create(:user) }
|
||||
let!(:organizer_role) { create(:role, name: 'organizer', resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
|
||||
let(:organizer) { create(:user, role_ids: organizer_role.id) }
|
||||
let(:organizer2) { create(:user, email: 'organizer2@email.osem', role_ids: organizer_role.id) }
|
||||
|
|
@ -93,6 +93,19 @@ describe Admin::ConferenceController do
|
|||
expect(response).to redirect_to admin_conference_path(
|
||||
assigns[:conference].short_title)
|
||||
end
|
||||
|
||||
it 'creates roles for the conference' do
|
||||
cfp_role = Role.find_by(name: 'cfp', resource: conference)
|
||||
info_desk_role = Role.find_by(name: 'info_desk', resource: conference)
|
||||
volunteers_coordinator_role = Role.find_by(name: 'volunteers_coordinator', resource: conference)
|
||||
|
||||
post :create, conference:
|
||||
attributes_for(:conference, short_title: 'dps15')
|
||||
|
||||
expect(conference.roles.count).to eq 4
|
||||
|
||||
expect(conference.roles).to eq [organizer_role, cfp_role, info_desk_role, volunteers_coordinator_role]
|
||||
end
|
||||
end
|
||||
|
||||
context 'with invalid attributes' do
|
||||
|
|
@ -203,130 +216,6 @@ describe Admin::ConferenceController do
|
|||
expect(response).to render_template :new
|
||||
end
|
||||
end
|
||||
|
||||
describe 'GET #roles' do
|
||||
before(:each) do
|
||||
get :roles, id: conference.short_title
|
||||
end
|
||||
|
||||
it 'assigns default value to selection' do
|
||||
expect(assigns(:selection)).to eq('organizer')
|
||||
end
|
||||
|
||||
it 'finds the correct role' do
|
||||
expect(assigns(:role)).to eq([organizer_role])
|
||||
end
|
||||
|
||||
it 'properly assigns role_users hash' do
|
||||
expect(assigns(:role_users)).to eq('organizer' => [organizer, organizer2])
|
||||
end
|
||||
|
||||
it 'properly assigns roles variable' do
|
||||
expect(assigns(:roles)).to eq(['Organizer', 'CfP', 'Info Desk', 'Volunteers Coordinator', 'Attendee', 'Volunteer', 'Speaker', 'Sponsor', 'Press', 'Keynote Speaker', ])
|
||||
end
|
||||
end
|
||||
|
||||
describe 'POST #roles' do
|
||||
before(:each) do
|
||||
post :roles, id: conference.short_title, user: { roles: 'CfP' }
|
||||
end
|
||||
|
||||
it 'assigns selected value to selection' do
|
||||
expect(assigns(:selection)).to eq('cfp')
|
||||
end
|
||||
|
||||
it 'sets role variable' do
|
||||
post :roles, id: conference.short_title, user: { roles: 'Organizer' }
|
||||
role = Role.where(name: 'organizer', resource: conference)
|
||||
expect(assigns(:role)).to eq(role)
|
||||
end
|
||||
|
||||
it 'sets role variable (returns blank for nil role)' do
|
||||
expect(assigns(:role)).to eq([])
|
||||
end
|
||||
|
||||
it 'sets role_users hash with blank' do
|
||||
expect(assigns(:role_users)).to eq('cfp' => [])
|
||||
end
|
||||
|
||||
it 'sets role_users has with data' do
|
||||
organizer.add_role :cfp, conference
|
||||
post :roles, id: conference.short_title, user: { roles: 'CfP' }
|
||||
expect(assigns(:role_users)).to eq('cfp' => [organizer])
|
||||
end
|
||||
|
||||
it 'sets roles variable' do
|
||||
expect(assigns(:roles)).to eq(['Organizer', 'CfP', 'Info Desk', 'Volunteers Coordinator', 'Attendee', 'Volunteer', 'Speaker', 'Sponsor', 'Press', 'Keynote Speaker', ])
|
||||
end
|
||||
end
|
||||
|
||||
describe 'POST #add_user' do
|
||||
before(:each) do
|
||||
@new_user = create(:user, email: 'new_user@email.osem')
|
||||
post :add_user, id: conference.short_title, user: { email: 'new_user@email.osem' }, role: 'organizer'
|
||||
end
|
||||
|
||||
it 'finds correct user' do
|
||||
expect(assigns(:user)).to eq(@new_user)
|
||||
end
|
||||
|
||||
it 'sets role_users variable' do
|
||||
expect(assigns(:role_users)).to eq('organizer' => organizer_role.users)
|
||||
|
||||
post :add_user, id: conference.short_title, user: { email: 'new_user@email.osem' }, role: 'cfp'
|
||||
expect(assigns(:role_users)).to eq('cfp' => [@new_user])
|
||||
end
|
||||
|
||||
it 'assigns role to user' do
|
||||
expect(@new_user.roles).to eq([organizer_role])
|
||||
end
|
||||
|
||||
it 'assigns second role to user' do
|
||||
post :add_user, id: conference.short_title, user: { email: @new_user.email }, role: 'cfp'
|
||||
cfp_role = Role.find_by(name: 'cfp', resource: conference)
|
||||
expect(@new_user.roles).to eq([organizer_role, cfp_role])
|
||||
end
|
||||
end
|
||||
|
||||
describe 'DELETE #remove_user' do
|
||||
before(:each) do
|
||||
|
||||
end
|
||||
|
||||
it 'sets selection variable' do
|
||||
delete :remove_user, id: conference.short_title, user_id: organizer2.id, role: 'organizer'
|
||||
expect(assigns(:selection)).to eq('organizer')
|
||||
end
|
||||
|
||||
it 'sets role_users hash' do
|
||||
delete :remove_user, id: conference.short_title, user_id: organizer2.id, role: 'organizer'
|
||||
expect(assigns(:role_users)).to eq('organizer' => [organizer])
|
||||
end
|
||||
|
||||
it 'removes role from user' do
|
||||
delete :remove_user, id: conference.short_title, user_id: organizer2.id, role: 'organizer'
|
||||
organizer2.reload
|
||||
expect(organizer2.roles).to eq([])
|
||||
end
|
||||
|
||||
it 'removes second role from user' do
|
||||
# Add cfp role
|
||||
organizer2.add_role :cfp, conference
|
||||
cfp_role = Role.find_by(name: 'cfp', resource: conference)
|
||||
# Remove role organizer
|
||||
delete :remove_user, id: conference.short_title, user_id: organizer2.id, role: 'organizer'
|
||||
|
||||
organizer2.reload
|
||||
expect(organizer2.roles).to include(cfp_role)
|
||||
expect(organizer2.roles[0]).to eq(cfp_role)
|
||||
expect(organizer2.roles.count).to eq(1)
|
||||
expect(assigns(:role_users)).to eq('organizer' => [organizer])
|
||||
|
||||
delete :remove_user, id: conference.short_title, user_id: organizer2.id, role: 'cfp'
|
||||
organizer2.reload
|
||||
expect(organizer2.roles).to eq([])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe 'organizer access' do
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ describe Admin::ProgramsController, type: :controller do
|
|||
# It is necessary to use bang version of let to build roles before user
|
||||
let(:conference) { create(:conference) }
|
||||
let!(:first_user) { create(:user) }
|
||||
let!(:organizer_role) { create(:role, name: 'organizer', resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let(:organizer) { create(:user, role_ids: organizer_role.id, last_sign_in_at: Time.now - 1.day) }
|
||||
|
||||
context 'not logged in user' do
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ describe Admin::RegistrationPeriodsController do
|
|||
# It is necessary to use bang version of let to build roles before user
|
||||
let(:conference) { create(:conference) }
|
||||
let!(:first_user) { create(:user) }
|
||||
let!(:organizer_role) { create(:role, name: 'organizer', resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
|
||||
let(:organizer) { create(:user, role_ids: organizer_role.id) }
|
||||
let(:organizer2) { create(:user, email: 'organizer2@email.osem', role_ids: organizer_role.id) }
|
||||
|
|
|
|||
137
spec/controllers/admin/roles_controller_spec.rb
Normal file
137
spec/controllers/admin/roles_controller_spec.rb
Normal file
|
|
@ -0,0 +1,137 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Admin::RolesController do
|
||||
|
||||
let(:conference) { create(:conference) }
|
||||
let!(:first_user) { create(:user) }
|
||||
let(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let(:cfp_role) { Role.find_by(name: 'cfp', resource: conference) }
|
||||
let(:admin) { create(:admin) }
|
||||
|
||||
let!(:user1) { create(:user, email: 'user1@osem.io') }
|
||||
let!(:user2) { create(:user, email: 'user2@osem.io') }
|
||||
|
||||
describe 'GET #index' do
|
||||
before :each do
|
||||
sign_in(admin)
|
||||
get :index, conference_id: conference.short_title
|
||||
end
|
||||
|
||||
it 'assigns default value to selection variable' do
|
||||
expect(assigns(:selection)).to eq 'organizer'
|
||||
end
|
||||
|
||||
it 'finds the correct role' do
|
||||
expect(assigns(:role)).to eq organizer_role
|
||||
end
|
||||
end
|
||||
|
||||
describe 'GET #show' do
|
||||
before :each do
|
||||
sign_in(admin)
|
||||
xhr :get, :show, conference_id: conference.short_title,
|
||||
id: 'organizer'
|
||||
end
|
||||
|
||||
it 'assigns correct value to selection variable' do
|
||||
expect(assigns(:selection)).to eq 'organizer'
|
||||
end
|
||||
|
||||
it 'assigns correct value to role variable' do
|
||||
expect(assigns(:role)).to eq organizer_role
|
||||
end
|
||||
end
|
||||
|
||||
describe 'PATCH #update' do
|
||||
before :each do
|
||||
sign_in admin
|
||||
patch :update, conference_id: conference.short_title,
|
||||
id: 'cfp',
|
||||
role: { description: 'New description for cfp role!' }
|
||||
end
|
||||
|
||||
it 'changes the description of the role' do
|
||||
expect(cfp_role.description).to eq 'New description for cfp role!'
|
||||
end
|
||||
end
|
||||
|
||||
describe 'POST #toggle' do
|
||||
before:each do
|
||||
sign_in admin
|
||||
post :toggle_user, conference_id: conference.short_title,
|
||||
user: { email: 'user1@osem.io' },
|
||||
id: 'cfp'
|
||||
end
|
||||
|
||||
context 'assigns correct values to variables' do
|
||||
it 'assigns correct value to selection variable' do
|
||||
expect(assigns(:selection)).to eq 'cfp'
|
||||
end
|
||||
|
||||
it 'assigns correct value to role variable' do
|
||||
expect(assigns(:role)).to eq cfp_role
|
||||
end
|
||||
|
||||
it 'assigns role to user' do
|
||||
expect(user1.roles).to eq [cfp_role]
|
||||
end
|
||||
end
|
||||
|
||||
context 'adds role to user' do
|
||||
it 'adds second user' do
|
||||
post :toggle_user, conference_id: conference.short_title,
|
||||
user: { email: 'user2@osem.io' },
|
||||
id: 'cfp'
|
||||
|
||||
expect(user2.roles).to eq [cfp_role]
|
||||
end
|
||||
|
||||
it 'assigns second role to user' do
|
||||
post :toggle_user, conference_id: conference.short_title,
|
||||
user: { email: 'user1@osem.io' },
|
||||
id: 'organizer'
|
||||
|
||||
expect(user1.roles).to eq [organizer_role, cfp_role]
|
||||
end
|
||||
end
|
||||
|
||||
context 'removes role from user' do
|
||||
it 'removes role from user' do
|
||||
post :toggle_user, conference_id: conference.short_title,
|
||||
user: { email: 'user1@osem.io', state: 'false' },
|
||||
id: 'cfp'
|
||||
|
||||
expect(user1.roles).to eq []
|
||||
end
|
||||
|
||||
it 'removes second role from user' do
|
||||
post :toggle_user, conference_id: conference.short_title,
|
||||
user: { email: 'user1@osem.io' },
|
||||
id: 'organizer'
|
||||
|
||||
expect(user1.roles).to eq [organizer_role, cfp_role]
|
||||
|
||||
post :toggle_user, conference_id: conference.short_title,
|
||||
user: { email: 'user1@osem.io', state: 'false' },
|
||||
id: 'cfp'
|
||||
|
||||
user1.reload
|
||||
expect(user1.roles).to eq [organizer_role]
|
||||
end
|
||||
end
|
||||
|
||||
it 'does not remove role if user is the last organizer' do
|
||||
# Add role organizer
|
||||
post :toggle_user, conference_id: conference.short_title,
|
||||
user: { email: 'user1@osem.io', state: 'true' },
|
||||
id: 'organizer'
|
||||
expect(organizer_role.users).to eq [user1]
|
||||
|
||||
# Try to remove role organizer, when there is only 1 user as organizer
|
||||
post :toggle_user, conference_id: conference.short_title,
|
||||
user: { email: 'user1@osem.io', state: 'false' },
|
||||
id: 'organizer'
|
||||
expect(organizer_role.users).to eq [user1]
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -9,6 +9,13 @@ FactoryGirl.define do
|
|||
end_date { 6.days.from_now }
|
||||
registration_limit 0
|
||||
|
||||
after(:create) do |conference|
|
||||
Role.where(name: 'organizer', resource: conference).first_or_create(description: 'For the organizers of the conference (who shall have full access)')
|
||||
Role.where(name: 'cfp', resource: conference).first_or_create(description: 'For the members of the CfP team')
|
||||
Role.where(name: 'info_desk', resource: conference).first_or_create(description: 'For the members of the Info Desk team')
|
||||
Role.where(name: 'volunteers_coordinator', resource: conference).first_or_create(description: 'For the people in charge of volunteers')
|
||||
end
|
||||
|
||||
factory :full_conference do
|
||||
splashpage
|
||||
registration_period
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
FactoryGirl.define do
|
||||
factory :role do
|
||||
name 'my role'
|
||||
|
||||
factory :organizer_role do
|
||||
name 'organizer'
|
||||
|
|
|
|||
|
|
@ -19,9 +19,5 @@ FactoryGirl.define do
|
|||
factory :admin do
|
||||
is_admin true
|
||||
end
|
||||
|
||||
factory :organizer do
|
||||
after(:create) { |user| user.role_ids = create(:organizer_role).id }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@ feature 'Has correct abilities' do
|
|||
let(:conference4) { create(:full_conference) } # user is volunteer coordinator
|
||||
let(:conference5) { create(:full_conference) } # user has no role
|
||||
|
||||
let(:role_organizer) { create(:role, name: 'organizer', resource: conference1) }
|
||||
let(:role_cfp) { create(:role, name: 'cfp', resource: conference2) }
|
||||
let(:role_info_desk) { create(:role, name: 'info_desk', resource: conference3) }
|
||||
let(:role_volunteer_coordinator) { create(:role, name: 'volunteer_coordinator', resource: conference4) }
|
||||
let(:role_organizer) { Role.find_by(name: 'organizer', resource: conference1) }
|
||||
let(:role_cfp) { Role.find_by(name: 'cfp', resource: conference2) }
|
||||
let(:role_info_desk) { Role.find_by(name: 'info_desk', resource: conference3) }
|
||||
let(:role_volunteer_coordinator) { Role.find_by(name: 'volunteers_coordinator', resource: conference4) }
|
||||
|
||||
let(:user) { create(:user) }
|
||||
let(:user_organizer) { create(:user, role_ids: [role_organizer.id]) }
|
||||
|
|
@ -20,7 +20,7 @@ feature 'Has correct abilities' do
|
|||
let(:user_volunteer_coordinator) { create(:user, role_ids: [role_volunteer_coordinator.id]) }
|
||||
|
||||
scenario 'when user has no role' do
|
||||
user_organizer.is_admin = false
|
||||
user.is_admin = false
|
||||
sign_in user
|
||||
|
||||
visit admin_conference_path(conference1.short_title)
|
||||
|
|
@ -31,7 +31,9 @@ feature 'Has correct abilities' do
|
|||
scenario 'when user is organizer' do
|
||||
user_organizer.is_admin = false
|
||||
sign_in user_organizer
|
||||
|
||||
visit admin_conference_path(conference1.short_title)
|
||||
expect(current_path).to eq(admin_conference_path(conference1.short_title))
|
||||
|
||||
expect(page).to have_selector('li.nav-header.nav-header-bigger a', text: 'Dashboard')
|
||||
expect(page).to have_link('Basics', href: "/admin/conference/#{conference1.short_title}/edit")
|
||||
|
|
@ -107,7 +109,9 @@ feature 'Has correct abilities' do
|
|||
scenario 'when user is cfp' do
|
||||
user_cfp.is_admin = false
|
||||
sign_in user_cfp
|
||||
|
||||
visit admin_conference_path(conference2.short_title)
|
||||
expect(current_path).to eq(admin_conference_path(conference2.short_title))
|
||||
|
||||
expect(page).to have_selector('li.nav-header.nav-header-bigger a', text: 'Dashboard')
|
||||
expect(page).to_not have_link('Basics', href: "/admin/conference/#{conference2.short_title}/edit")
|
||||
|
|
@ -132,7 +136,7 @@ feature 'Has correct abilities' do
|
|||
expect(page).to have_link('Event Types', href: "/admin/conference/#{conference2.short_title}/program/event_types")
|
||||
expect(page).to have_link('Difficulty Levels', href: "/admin/conference/#{conference2.short_title}/program/difficulty_levels")
|
||||
expect(page).to_not have_link('Questions', href: "/admin/conference/#{conference2.short_title}/questions")
|
||||
expect(page).to_not have_link('Roles', href: "/admin/conference/#{conference2.short_title}/roles")
|
||||
expect(page).to have_link('Roles', href: "/admin/conference/#{conference2.short_title}/roles")
|
||||
|
||||
visit edit_admin_conference_path(conference2.short_title)
|
||||
expect(current_path).to eq(root_path)
|
||||
|
|
@ -180,7 +184,9 @@ feature 'Has correct abilities' do
|
|||
scenario 'when user is info desk' do
|
||||
user_info_desk.is_admin = false
|
||||
sign_in user_info_desk
|
||||
|
||||
visit admin_conference_path(conference3.short_title)
|
||||
expect(current_path).to eq(admin_conference_path(conference3.short_title))
|
||||
|
||||
expect(page).to have_selector('li.nav-header.nav-header-bigger a', text: 'Dashboard')
|
||||
expect(page).to_not have_link('Basics', href: "/admin/conference/#{conference2.short_title}/edit")
|
||||
|
|
@ -205,7 +211,7 @@ feature 'Has correct abilities' do
|
|||
expect(page).to_not have_link('Event types', href: "/admin/conference/#{conference3.short_title}/program/event_types")
|
||||
expect(page).to_not have_link('Difficulty levels', href: "/admin/conference/#{conference3.short_title}/program/difficulty_levels")
|
||||
expect(page).to have_link('Questions', href: "/admin/conference/#{conference3.short_title}/questions")
|
||||
expect(page).to_not have_link('Roles', href: "/admin/conference/#{conference3.short_title}/roles")
|
||||
expect(page).to have_link('Roles', href: "/admin/conference/#{conference3.short_title}/roles")
|
||||
|
||||
visit edit_admin_conference_path(conference3.short_title)
|
||||
expect(current_path).to eq(root_path)
|
||||
|
|
|
|||
|
|
@ -4,11 +4,10 @@ feature 'BaseController' do
|
|||
let(:conference) { create(:conference) }
|
||||
let(:user) { create(:user) }
|
||||
|
||||
let!(:organizer_role) { create(:role, name: 'organizer', resource: conference) }
|
||||
let!(:volunteers_coordinator_role) { create(:role, name: 'volunteers_coordinator', resource: conference) }
|
||||
let!(:cfp_role) { create(:role, name: 'cfp', resource: conference) }
|
||||
let!(:info_desk_role) { create(:role, name: 'info_desk', resource: conference) }
|
||||
let!(:speaker_role) { create(:role, name: 'speaker', resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:volunteers_coordinator_role) { Role.find_by(name: 'volunteers_coordinator', resource: conference) }
|
||||
let!(:cfp_role) { Role.find_by(name: 'cfp', resource: conference) }
|
||||
let!(:info_desk_role) { Role.find_by(name: 'info_desk', resource: conference) }
|
||||
|
||||
describe 'GET #verify_user_admin' do
|
||||
context 'when user is a guest' do
|
||||
|
|
@ -30,14 +29,6 @@ feature 'BaseController' do
|
|||
expect(flash).to eq 'You are not authorized to access this area!'
|
||||
end
|
||||
|
||||
it 'a speaker it redirects to the root_path' do
|
||||
user.is_admin = false
|
||||
user.role_ids = speaker_role.id
|
||||
visit admin_conference_index_path
|
||||
expect(current_path).to eq root_path
|
||||
expect(flash).to eq 'You are not authorized to access this area!'
|
||||
end
|
||||
|
||||
it 'an admin he can access the admin area' do
|
||||
user.is_admin = true
|
||||
visit admin_conference_index_path
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ require 'spec_helper'
|
|||
feature Campaign do
|
||||
|
||||
let!(:conference) { create(:conference, short_title: 'osc14') }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
|
||||
|
||||
shared_examples 'add and update campaign' do
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ require 'spec_helper'
|
|||
feature Conference do
|
||||
|
||||
let!(:conference) { create(:conference) }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
|
||||
|
||||
shared_examples 'add and update cfp' do
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ require 'spec_helper'
|
|||
feature Commercial do
|
||||
# It is necessary to use bang version of let to build roles before user
|
||||
let!(:conference) { create(:conference) }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
|
||||
let!(:participant) { create(:user) }
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ feature Conference do
|
|||
|
||||
scenario 'update conference', feature: true, js: true do
|
||||
conference = create(:conference)
|
||||
organizer_role = create(:organizer_role, resource: conference)
|
||||
organizer_role = Role.find_by(name: 'organizer', resource: conference)
|
||||
organizer = create(:user, role_ids: [organizer_role.id])
|
||||
|
||||
expected_count = Conference.count
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ require 'spec_helper'
|
|||
feature Contact do
|
||||
|
||||
let!(:conference) { create(:conference) }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, email: 'admin@example.com', role_ids: [organizer_role.id]) }
|
||||
|
||||
shared_examples 'update a contact' do
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
feature DifficultyLevel do
|
||||
let!(:conference) { create(:conference) }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
|
||||
|
||||
shared_examples 'difficulty levels' do
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
feature EmailSettings do
|
||||
let!(:conference) { create(:conference) }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
|
||||
|
||||
shared_examples 'email settings' do
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
feature EventType do
|
||||
let!(:conference) { create(:conference) }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
|
||||
|
||||
shared_examples 'event types' do
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
feature Lodging do
|
||||
let!(:conference) { create(:conference) }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
|
||||
|
||||
scenario 'Add a lodging', feature: true, js: true do
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ feature Program do
|
|||
|
||||
let!(:conference) { create(:conference) }
|
||||
let!(:program) { conference.program }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
|
||||
|
||||
describe 'edit program' do
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ require 'spec_helper'
|
|||
feature Event do
|
||||
let!(:conference) { create(:conference) }
|
||||
let!(:cfp) { create(:cfp, program_id: conference.program.id) }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, email: 'admin@example.com', role_ids: [organizer_role.id]) }
|
||||
let!(:participant) { create(:user) }
|
||||
let!(:participant_without_bio) { create(:user, biography: '') }
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ feature RegistrationPeriod do
|
|||
|
||||
# It is necessary to use bang version of let to build roles before user
|
||||
let!(:conference) { create(:conference) }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, email: 'admin@example.com', role_ids: [organizer_role.id]) }
|
||||
|
||||
shared_examples 'successfully' do
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ require 'spec_helper'
|
|||
feature Room do
|
||||
let!(:conference) { create(:conference) }
|
||||
let!(:venue) { create(:venue, conference: conference) }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
|
||||
|
||||
shared_examples 'rooms' do
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@ feature Splashpage do
|
|||
|
||||
# It is necessary to use bang version of let to build roles before user
|
||||
let!(:conference) { create(:conference) }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, email: 'admin@example.com', role_ids: [organizer_role.id]) }
|
||||
let!(:participant) { create(:user, biography: '') }
|
||||
let!(:participant) { create(:user, biography: '', is_admin: false) }
|
||||
|
||||
scenario 'create a valid splashpage', js: true do
|
||||
sign_in organizer
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
feature Sponsor do
|
||||
let!(:conference) { create(:conference) }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
|
||||
|
||||
shared_examples 'sponsors' do
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
feature SponsorshipLevel do
|
||||
let!(:conference) { create(:conference) }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
|
||||
|
||||
shared_examples 'sponsorship_levels' do
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
feature Ticket do
|
||||
let!(:conference) { create(:conference, title: 'ExampleCon') }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, email: 'admin@example.com', role_ids: [organizer_role.id]) }
|
||||
|
||||
context 'as a organizer' do
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
feature Track do
|
||||
let!(:conference) { create(:conference) }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
|
||||
|
||||
shared_examples 'tracks' do
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
feature Conference do
|
||||
let!(:conference) { create(:conference) }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
|
||||
|
||||
shared_examples 'venue' do
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
feature Conference do
|
||||
let!(:conference) { create(:conference) }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
|
||||
|
||||
shared_examples 'volunteer' do
|
||||
|
|
|
|||
|
|
@ -107,7 +107,8 @@ describe 'User' do
|
|||
end
|
||||
|
||||
context 'when user has the role organizer' do
|
||||
let(:role) { create(:organizer_role, resource: my_conference) }
|
||||
let!(:my_conference) { create(:full_conference) }
|
||||
let(:role) { Role.find_by(name: 'organizer', resource: my_conference) }
|
||||
let(:user) { create(:user, role_ids: [role.id], is_admin: false) }
|
||||
|
||||
it{ should_not be_able_to(:destroy, my_conference.program) }
|
||||
|
|
@ -172,7 +173,8 @@ describe 'User' do
|
|||
end
|
||||
|
||||
context 'when user has the role cfp' do
|
||||
let(:role) { create(:cfp_role, resource: my_conference) }
|
||||
let!(:my_conference) { create(:full_conference) }
|
||||
let(:role) { Role.find_by(name: 'cfp', resource: my_conference) }
|
||||
let(:user) { create(:user, role_ids: [role.id], is_admin: false) }
|
||||
|
||||
it{ should_not be_able_to([:create, :new], Conference.new) }
|
||||
|
|
@ -226,7 +228,8 @@ describe 'User' do
|
|||
end
|
||||
|
||||
context 'when user has the role info_desk' do
|
||||
let(:role) { create(:info_desk_role, resource: my_conference) }
|
||||
let!(:my_conference) { create(:full_conference) }
|
||||
let(:role) { Role.find_by(name: 'info_desk', resource: my_conference) }
|
||||
let(:user) { create(:user, role_ids: [role.id], is_admin: false) }
|
||||
|
||||
it{ should_not be_able_to([:create, :new], Conference.new) }
|
||||
|
|
@ -280,7 +283,8 @@ describe 'User' do
|
|||
end
|
||||
|
||||
context 'when user has the role volunteers_coordinator' do
|
||||
let(:role) { create(:volunteers_coordinator_role, resource: my_conference) }
|
||||
let!(:my_conference) { create(:full_conference) }
|
||||
let(:role) { Role.find_by(name: 'volunteers_coordinator', resource: my_conference) }
|
||||
let(:user) { create(:user, role_ids: [role.id], is_admin: false) }
|
||||
|
||||
it{ should_not be_able_to([:create, :new], Conference.new) }
|
||||
|
|
|
|||
|
|
@ -274,7 +274,7 @@ describe Conference do
|
|||
|
||||
describe '#get_top_submitter' do
|
||||
let!(:conference) { create(:conference) }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
|
||||
|
||||
it 'calculates correct hash with top submitters' do
|
||||
|
|
@ -902,7 +902,7 @@ describe Conference do
|
|||
|
||||
describe 'self#event_distribution' do
|
||||
let!(:conference) { create(:conference) }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
|
||||
|
||||
it 'self#event_distribution calculates correct values with user' do
|
||||
|
|
@ -1451,7 +1451,7 @@ describe Conference do
|
|||
|
||||
# It is necessary to use bang version of let to build roles before user
|
||||
let!(:conference) { create(:conference) }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
|
||||
|
||||
let(:user) { create(:user) }
|
||||
|
|
|
|||
14
spec/models/role_spec.rb
Normal file
14
spec/models/role_spec.rb
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Role do
|
||||
let(:conference) { create(:conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:cfp_role) { Role.find_by(name: 'cfp', resource: conference) }
|
||||
let!(:organizer) { create(:user, role_ids: organizer_role.id) }
|
||||
|
||||
it 'get_users' do
|
||||
expect(organizer_role.users).to include organizer
|
||||
expect(organizer_role.users.count).to eq 1
|
||||
expect(cfp_role.users).to eq []
|
||||
end
|
||||
end
|
||||
|
|
@ -5,8 +5,9 @@ describe User do
|
|||
# It is necessary to use bang version of let to build roles before user
|
||||
let!(:user_admin) { create(:user) }
|
||||
let!(:conference) { create(:conference) }
|
||||
let!(:organizer_role) { create(:organizer_role, resource: conference) }
|
||||
let!(:cfp_role) { create(:cfp_role, resource: conference) }
|
||||
let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:cfp_role) { Role.find_by(name: 'cfp', resource: conference) }
|
||||
let!(:volunteers_coordinator_role) { Role.find_by(name: 'volunteers_coordinator', resource: conference) }
|
||||
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
|
||||
let!(:user) { create(:user) }
|
||||
|
||||
|
|
@ -33,20 +34,21 @@ describe User do
|
|||
end
|
||||
|
||||
describe '#has_role?' do
|
||||
shared_examples '#role?' do |user, role, expected|
|
||||
it "returns #{expected} for #{role}" do
|
||||
user_obj = create(user)
|
||||
expect(user_obj.has_role?(role.downcase, conference)).to be expected
|
||||
describe 'when user has a role' do
|
||||
it 'returns true when the user has the role' do
|
||||
user = create(:user, role_ids: organizer_role.id)
|
||||
expect(user.has_role?('organizer', conference)).to be true
|
||||
end
|
||||
|
||||
it 'returns false when the user does not have the role' do
|
||||
user = create(:user, role_ids: cfp_role.id)
|
||||
expect(user.has_role?('organizer', conference)).to be false
|
||||
end
|
||||
end
|
||||
|
||||
context 'organizer' do
|
||||
it_behaves_like '#role?', :organizer, 'organizer', true
|
||||
it_behaves_like '#role?', :organizer, 'participant', false
|
||||
end
|
||||
|
||||
context 'participant' do
|
||||
it_behaves_like '#role?', :user, 'adMin', false
|
||||
it 'returns false when the user does not have a role' do
|
||||
user = create(:user, role_ids: [])
|
||||
expect(user.has_role?('organizer', conference)).to be false
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'admin/conference/roles' do
|
||||
let(:conference) { create(:conference) }
|
||||
let(:organizer_role) { create(:organizer_role, description: 'My description for organizer role', resource: conference) }
|
||||
let(:organizer) { create(:user, name: 'test name', email: 'test@email.com', role_ids: [organizer_role.id]) }
|
||||
|
||||
it 'renders the roles template for the conference' do
|
||||
assign :conference, conference
|
||||
assign :selection, 'organizer'
|
||||
assign :role, [organizer_role]
|
||||
assign :role_users, 'organizer' => [organizer]
|
||||
render
|
||||
expect(rendered).to include('Show users for role:')
|
||||
expect(rendered).to include(organizer_role.description)
|
||||
expect(rendered).to include("Add role 'Organizer' to user:")
|
||||
expect(rendered).to include('Add role')
|
||||
expect(rendered).to include('Users with role Organizer')
|
||||
expect(rendered).to have_selector('table thead th:nth-of-type(1)', text: 'ID')
|
||||
expect(rendered).to have_selector('table thead th:nth-of-type(2)', text: 'Name')
|
||||
expect(rendered).to have_selector('table thead th:nth-of-type(3)', text: 'Email')
|
||||
expect(rendered).to have_selector('table tbody tr:nth-of-type(1) td:nth-of-type(1)', text: organizer.id)
|
||||
expect(rendered).to have_selector('table tbody tr:nth-of-type(1) td:nth-of-type(2)', text: 'test name')
|
||||
expect(rendered).to have_selector('table tbody tr:nth-of-type(1) td:nth-of-type(3)', text: 'test@email.com')
|
||||
end
|
||||
end
|
||||
41
spec/views/admin/roles/index.html.haml_spec.rb
Normal file
41
spec/views/admin/roles/index.html.haml_spec.rb
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'admin/roles/index' do
|
||||
let(:conference) { create(:conference) }
|
||||
let(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let!(:organizer) { create(:user, name: 'user name for organizer', email: 'organizer@osem.io', role_ids: organizer_role.id) }
|
||||
|
||||
let(:cfp_role) { Role.find_by(name: 'cfp', resource: conference) }
|
||||
let!(:cfp_user) { create(:user, name: 'user name for cfp', email: 'cfp@osem.io', role_ids: [cfp_role.id]) }
|
||||
|
||||
let(:info_desk_role) { Role.find_by(name: 'info_desk', resource: conference) }
|
||||
let(:volunteers_coordinator_role) { Role.find_by(name: 'volunteers_coordinator', resource: conference) }
|
||||
|
||||
before(:each) do
|
||||
assign :conference, conference
|
||||
assign :roles, [organizer_role, cfp_role, info_desk_role, volunteers_coordinator_role]
|
||||
|
||||
render
|
||||
end
|
||||
|
||||
it 'renders index' do
|
||||
expect(organizer_role.users.count).to eq 1
|
||||
expect(rendered).to have_selector('table thead th:nth-of-type(1)', text: 'ID')
|
||||
expect(rendered).to have_selector('table thead th:nth-of-type(2)', text: 'Name')
|
||||
expect(rendered).to have_selector('table thead th:nth-of-type(3)', text: 'Description')
|
||||
expect(rendered).to have_selector('table thead th:nth-of-type(4)', text: 'Users')
|
||||
expect(rendered).to have_selector('table thead th:nth-of-type(5)', text: 'Actions')
|
||||
|
||||
expect(rendered).to have_selector('table tbody tr:nth-of-type(1) td:nth-of-type(1)', text: organizer_role.id)
|
||||
expect(rendered).to have_selector('table tbody tr:nth-of-type(1) td:nth-of-type(2)', text: 'Organizer')
|
||||
expect(rendered).to have_selector('table tbody tr:nth-of-type(1) td:nth-of-type(3)', text: 'For the organizers of the conference (who shall have full access)')
|
||||
expect(rendered).to have_selector('table tbody tr:nth-of-type(1) td:nth-of-type(4)', text: 'user name for organizer')
|
||||
expect(rendered).to have_selector('table tbody tr:nth-of-type(1) td:nth-of-type(5)', text: 'Users')
|
||||
|
||||
expect(rendered).to have_selector('table tbody tr:nth-of-type(2) td:nth-of-type(1)', text: cfp_role.id)
|
||||
expect(rendered).to have_selector('table tbody tr:nth-of-type(2) td:nth-of-type(2)', text: 'Cfp')
|
||||
expect(rendered).to have_selector('table tbody tr:nth-of-type(2) td:nth-of-type(3)', text: 'For the members of the CfP team')
|
||||
expect(rendered).to have_selector('table tbody tr:nth-of-type(2) td:nth-of-type(4)', text: 'user name for cfp')
|
||||
expect(rendered).to have_selector('table tbody tr:nth-of-type(2) td:nth-of-type(5)', text: 'Users')
|
||||
end
|
||||
end
|
||||
28
spec/views/admin/roles/show.html.haml_spec.rb
Normal file
28
spec/views/admin/roles/show.html.haml_spec.rb
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'admin/roles/show' do
|
||||
let(:conference) { create(:conference) }
|
||||
let(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
|
||||
let(:organizer) { create(:user, name: 'test name', email: 'test@email.osem', role_ids: [organizer_role.id]) }
|
||||
|
||||
before(:each) do
|
||||
sign_in organizer
|
||||
assign :conference, conference
|
||||
assign :selection, 'organizer'
|
||||
assign :role, organizer_role
|
||||
assign :users, [organizer]
|
||||
render
|
||||
end
|
||||
|
||||
it 'renders show properly' do
|
||||
expect(rendered).to include(organizer_role.name.capitalize)
|
||||
expect(rendered).to include('Add user by email:')
|
||||
expect(rendered).to have_selector('table thead th:nth-of-type(1)', text: '')
|
||||
expect(rendered).to have_selector('table thead th:nth-of-type(2)', text: 'ID')
|
||||
expect(rendered).to have_selector('table thead th:nth-of-type(3)', text: 'Name')
|
||||
expect(rendered).to have_selector('table thead th:nth-of-type(4)', text: 'Email')
|
||||
expect(rendered).to have_selector('table tbody tr:nth-of-type(1) td:nth-of-type(2)', text: organizer.id)
|
||||
expect(rendered).to have_selector('table tbody tr:nth-of-type(1) td:nth-of-type(3)', text: 'test name')
|
||||
expect(rendered).to have_selector('table tbody tr:nth-of-type(1) td:nth-of-type(4)', text: 'test@email.osem')
|
||||
end
|
||||
end
|
||||
Loading…
Add table
Add a link
Reference in a new issue