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

@ -11,6 +11,7 @@ describe 'User with admin role' do
let!(:organization) { create(:organization) }
let!(:my_conference) { create(:full_conference, organization: organization) }
let!(:registration_ticket) { create(:registration_ticket, conference: my_conference) }
let(:my_venue) { my_conference.venue || create(:venue, conference: my_conference) }
let(:my_registration) { create(:registration, conference: my_conference, user: admin) }