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

fix from rebase

Browse source 
Conflicts:
	app/views/layouts/_admin_sidebar.html.haml
This commit is contained in:
Stella Rouzi 2014-08-12 22:11:07 +03:00
parent f7ef401be7
commit f5081813d9
6 changed files with 29 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

16
spec/features/contact_spec.rb
View file

@ -2,18 +2,16 @@ require 'spec_helper'
feature Contact do
# It is necessary to use bang version of let to build roles before user
let!(:organizer_role) { create(:organizer_role) }
let!(:participant_role) { create(:participant_role) }
let!(:admin_role) { create(:admin_role) }
let!(:conference) { create(:conference) }
let!(:organizer_role) { create(:organizer_role, resource: conference) }
let!(:organizer) { create(:user, email: 'admin@example.com', role_ids: [organizer_role.id]) }
shared_examples 'update a contact' do |user|
shared_examples 'update a contact' do
scenario 'sucessfully', feature: true, js: true do
conference = create(:conference)
contact = conference.contact
expected_count = Contact.count
sign_in create(user)
sign_in organizer
visit edit_admin_conference_contact_path(conference.short_title)
click_link 'Edit'
@ -39,10 +37,6 @@ feature Contact do
end
end
describe 'admin' do
it_behaves_like 'update a contact', :admin
end
describe 'organizer' do
it_behaves_like 'update a contact', :organizer
end