Merge branch 'master' into org-adimins-frontend

This commit is contained in:
Shlok Srivastava 2017-08-22 12:20:51 +00:00 committed by GitHub
commit 334efb3cba
28 changed files with 179 additions and 62 deletions

View file

@ -5,6 +5,7 @@ feature 'Has correct abilities' do
let(:conference) { create(:full_conference, organization: organization) }
let(:role_organization_admin) { Role.find_by(name: 'organization_admin', resource: organization) }
let(:user_organization_admin) { create(:user, role_ids: [role_organization_admin.id]) }
let!(:registration_ticket) { create(:registration_ticket, conference: conference) }
context 'when user is organization_admin' do
before do

View file

@ -8,6 +8,7 @@ feature 'Has correct abilities' do
let(:role_organizer_conf) { Role.find_by(name: 'organizer', resource: conference) }
let(:role_organizer_other_conf) { Role.find_by(name: 'organizer', resource: other_conference) }
let(:user_organizer) { create(:user, role_ids: [role_organizer_conf.id, role_organizer_other_conf.id]) }
let!(:registration_ticket) { create(:registration_ticket, conference: conference) }
context 'when user is organizer' do
before do

View file

@ -6,6 +6,7 @@ feature RegistrationPeriod do
let!(:conference) { create(: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!(:registration_ticket) { create(:registration_ticket, conference: conference) }
shared_examples 'successfully' do
scenario 'create and update registration period', js: true do