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

Another round of splash design

Browse source 
* Add map to splash
* Reverse venue<->conference relation
* Split venue address into fields
* Don't go through venue for lodgings anymore
This commit is contained in:
Henne Vogelsang 2014-11-20 14:57:03 +01:00
parent 30e8ab856c
commit cb227a0afc
55 changed files with 717 additions and 548 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,7 +33,7 @@ describe 'conference/show.html.haml' do
conference: @conference)
@conference.venue = create(:venue)
@conference.venue.lodgings << create(:lodging, venue: @conference.venue)
@conference.lodgings << create(:lodging)
assign :conference, @conference
render
end
@ -51,13 +51,12 @@ describe 'conference/show.html.haml' do
end
it 'renders call_for_papers partial' do
expect(rendered).to match(/#{@conference.call_for_papers.description}/)
expect(rendered).to match(/We are ready to accept your proposals for sessions!/)
end
it 'renders sponsors partial' do
expect(view).to render_template(partial: 'conference/_sponsors')
expect(rendered).to match(/example@example.com/)
expect(rendered).to match(/Platin/)
expect(rendered).to match(/Example sponsor/)
expect(rendered).to match(/www.example.com/)
expect(rendered).to match(/Lorem Ipsum Dolor/)
@ -72,8 +71,8 @@ describe 'conference/show.html.haml' do
expect(rendered).to match(/twitter.com/)
end
it 'renders location partial' do
expect(view).to render_template(partial: 'conference/_location')
it 'renders venue partial' do
expect(view).to render_template(partial: 'conference/_venue')
expect(rendered).to match(/Suse Office/)
expect(rendered).to match(/Maxfeldstrasse 5/)
expect(rendered).to match(/www.opensuse.org/)