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:
parent
30e8ab856c
commit
cb227a0afc
55 changed files with 717 additions and 548 deletions
|
|
@ -17,8 +17,10 @@ feature Conference do
|
|||
text).to eq('Update Venue')
|
||||
|
||||
fill_in 'venue_name', with: 'Example University'
|
||||
fill_in 'venue_address', with: 'Example Street 42 \n' +
|
||||
'12345 Example City \n Germany'
|
||||
fill_in 'venue_street', with: 'Example Street 42'
|
||||
fill_in 'venue_city', with: 'Example City'
|
||||
fill_in 'venue_postalcode', with: '12345'
|
||||
select 'Germany', from: 'venue_country'
|
||||
fill_in 'venue_website', with: 'www.example.com'
|
||||
fill_in 'venue_description',
|
||||
with: 'Lorem ipsum dolor sit amet, consetetur' \
|
||||
|
|
@ -31,15 +33,13 @@ feature Conference do
|
|||
|
||||
venue = Conference.find(conference.id).venue
|
||||
expect(venue.name).to eq('Example University')
|
||||
expect(venue.address).to eq('Example Street 42 \n' \
|
||||
'12345 Example City \n Germany')
|
||||
expect(venue.street).to eq('Example Street 42')
|
||||
expect(venue.website).to eq('www.example.com')
|
||||
expect(venue.description).to eq('Lorem ipsum dolor sit amet, consetetur' \
|
||||
'sadipscing elitr, sed diam nonumy eirmod tempor')
|
||||
|
||||
click_link 'Edit Venue'
|
||||
fill_in 'venue_name', with: 'Example University new'
|
||||
fill_in 'venue_address', with: 'Example Street 42 \n ' \
|
||||
'12345 Example City \n Germany new'
|
||||
fill_in 'venue_website', with: 'www.example.com new'
|
||||
fill_in 'venue_description',
|
||||
with: 'new'
|
||||
|
|
@ -50,8 +50,6 @@ feature Conference do
|
|||
|
||||
venue.reload
|
||||
expect(venue.name).to eq('Example University new')
|
||||
expect(venue.address).to eq('Example Street 42 \n ' \
|
||||
'12345 Example City \n Germany new')
|
||||
expect(venue.website).to eq('www.example.com new')
|
||||
expect(venue.description).to eq('new')
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue