gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues 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

6
spec/models/ability_spec.rb
View file

@ -28,7 +28,7 @@ describe 'User' do
end
context 'when user is a Signed In User' do # Test abilities for signed in users (without any role)
let(:user) { create(:participant) }
let(:user) { create(:user) }
let(:registration1) { create(:registration, conference: conference_public, user: user) }
let(:registration2) { create(:registration, conference: conference_not_public, user: user) }
@ -52,8 +52,8 @@ describe 'User' do
end
context 'signed in users can manage their events' do
let(:user) { create(:participant) }
let(:user2) { create(:participant) }
let(:user) { create(:user) }
let(:user2) { create(:user) }
let(:myevent) { create(:event, users: [user]) }
let(:someevent) { create(:event, users: [user2]) }
let(:commercial_myevent) { create(:commercial, commercialable: myevent) }