mirror of
https://github.com/openSUSE/osem.git
synced 2026-08-13 19:54:02 +00:00
Merge branch 'master' into fix-proposal-confirmation-spec
This commit is contained in:
commit
8db02db539
2 changed files with 30 additions and 0 deletions
|
|
@ -152,6 +152,8 @@ class Ability
|
|||
can :manage, Registration, conference_id: conf_ids_for_organizer
|
||||
# To access conference/proposals
|
||||
can :manage, Event, program: { conference_id: conf_ids_for_organizer }
|
||||
can :manage, Commercial, commercialable_type: 'Event',
|
||||
commercialable_id: Event.where(program_id: Program.where(conference_id: conf_ids_for_organizer).pluck(:id)).pluck(:id)
|
||||
# To access comment link in menu bar
|
||||
can :index, Comment, commentable_type: 'Event',
|
||||
commentable_id: Event.where(program_id: Program.where(conference_id: conf_ids_for_organizer).pluck(:id)).pluck(:id)
|
||||
|
|
@ -163,6 +165,8 @@ class Ability
|
|||
commentable_id: Event.where(program_id: Program.where(conference_id: conf_ids_for_cfp).pluck(:id)).pluck(:id)
|
||||
# To access conference/proposals
|
||||
can :manage, Event, program: { conference_id: conf_ids_for_cfp }
|
||||
can :manage, Commercial, commercialable_type: 'Event',
|
||||
commercialable_id: Event.where(program_id: Program.where(conference_id: conf_ids_for_cfp).pluck(:id)).pluck(:id)
|
||||
end
|
||||
|
||||
if conf_ids_for_info_desk
|
||||
|
|
|
|||
|
|
@ -264,5 +264,31 @@ describe 'User' do
|
|||
it{ should_not be_able_to(:edit, other_self_organized_track) }
|
||||
it{ should_not be_able_to(:update, other_self_organized_track) }
|
||||
end
|
||||
|
||||
context 'when user is organizer of conference' do
|
||||
let(:conference) { create(:conference) }
|
||||
let(:user) { create(:organizer, resource: conference) }
|
||||
let(:event_in_conference) { create(:event, program: conference.program) }
|
||||
let(:event_in_other_conference) { create(:event) }
|
||||
let(:commercial_in_conference) { create(:commercial, commercialable: event_in_conference) }
|
||||
let(:commercial_in_other_conference) { create(:commercial, commercialable: event_in_other_conference) }
|
||||
|
||||
it{ should be_able_to(:create, event_in_conference.commercials.new) }
|
||||
it{ should be_able_to(:manage, commercial_in_conference) }
|
||||
it{ should_not be_able_to(:manage, commercial_in_other_conference) }
|
||||
end
|
||||
|
||||
context 'when user is on cfp team of conference' do
|
||||
let(:conference) { create(:conference) }
|
||||
let(:user) { create(:cfp_user, resource: conference) }
|
||||
let(:event_in_conference) { create(:event, program: conference.program) }
|
||||
let(:event_in_other_conference) { create(:event) }
|
||||
let(:commercial_in_conference) { create(:commercial, commercialable: event_in_conference) }
|
||||
let(:commercial_in_other_conference) { create(:commercial, commercialable: event_in_other_conference) }
|
||||
|
||||
it{ should be_able_to(:create, event_in_conference.commercials.new) }
|
||||
it{ should be_able_to(:manage, commercial_in_conference) }
|
||||
it{ should_not be_able_to(:manage, commercial_in_other_conference) }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue