gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix conflicts

Browse source
This commit is contained in:
Stella Rouzi 2014-08-12 15:48:29 +03:00
parent e2fb434dc7
commit 71dfb3b7e4
34 changed files with 160 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

12
spec/factories/users.rb
View file

@ -15,16 +15,12 @@ FactoryGirl.define do
gravida.
EOS
factory :participant do
after(:create) { |user| user.role_ids = create(:participant_role).id }
end
factory :organizer_conference_1 do
after(:create) { |user| user.role_ids = create(:organizer_conference_1_role).id }
end
factory :admin do
is_admin true
end
factory :organizer do
after(:create) { |user| user.role_ids = create(:organizer_role).id }
end
end
end