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

Merge pull request #562 from differentreality/highlights_cfp

Browse source 
add highlights and fix cfp in splashpage
This commit is contained in:
Stella Rouzi 2015-01-22 20:40:24 +02:00
commit 6076e29733
26 changed files with 206 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spec/views/conference/show.html.haml_spec.rb
View file

@ -12,7 +12,8 @@ describe 'conference/show.html.haml' do
include_tickets: true,
include_social_media: true,
include_venue: true,
include_lodgings: true)
include_lodgings: true,
include_cfp: true)
@conference.contact.update(sponsor_email: 'example@example.com',
facebook: 'http://facebook.com',
@ -24,8 +25,7 @@ describe 'conference/show.html.haml' do
start_date: Date.yesterday,
end_date: Date.tomorrow)
@conference.call_for_paper = create(:call_for_paper, conference: @conference,
include_cfp_in_splash: true)
@conference.call_for_paper = create(:call_for_paper, conference: @conference)
@conference.sponsorship_levels << create(:sponsorship_level, conference: @conference)
@sponsorship_level = @conference.sponsorship_levels.first