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

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

17
spec/features/cfp_spec.rb
View file

@ -2,15 +2,15 @@ require 'spec_helper'
feature Conference do
# It is necessary to use bang version of let to build roles before user
let!(:participant_role) { create(:participant_role) }
let!(:organizer_conference_1_role) { create(:organizer_conference_1_role) }
let!(:conference) { create(:conference) }
let!(:organizer_role) { create(:organizer_role, resource: conference) }
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
shared_examples 'add and update cfp' do |user|
shared_examples 'add and update cfp' do
scenario 'adds a new cfp', feature: true, js: true do
expected_count = CallForPapers.count + 1
conference = create(:conference)
sign_in create(user)
sign_in organizer
visit admin_conference_callforpapers_path(conference.short_title)
@ -46,11 +46,10 @@ feature Conference do
end
scenario 'update cfp', feature: true, js: true do
conference = create(:conference)
conference.call_for_papers = create(:call_for_papers)
expected_count = CallForPapers.count
sign_in create(user)
sign_in organizer
visit admin_conference_callforpapers_path(conference.short_title)
# Validate update with empty start date will not saved
@ -87,6 +86,6 @@ feature Conference do
end
describe 'organizer' do
it_behaves_like 'add and update cfp', :organizer_conference_1
it_behaves_like 'add and update cfp'
end
end