Another round of splash design

* 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

View file

@ -4,7 +4,7 @@ describe 'admin/lodgings/index' do
it 'renders lodgings list' do
@conference = create(:conference)
@conference.venue = create(:venue)
@conference.venue.lodgings << create(:lodging, venue: @conference.venue)
@conference.lodgings << create(:lodging)
assign :venue, @conference.venue
render
expect(rendered).to include('Example Hotel')

View file

@ -1,17 +0,0 @@
require 'spec_helper'
describe 'admin/venues/edit' do
it 'renders venues#show' do
@conference = create(:conference)
@venue = @conference.venue
@venue.name = 'Croatia'
@venue.description = 'Lorem ipsum dolsum'
@venue.save!
assign :conference, @conference
assign :venue, @venue
render
expect(rendered).to include('Croatia')
expect(rendered).to include('Lorem ipsum dolsum')
end
end