User/Person models merge

This commit is contained in:
Stella Rouzi 2014-06-23 19:07:50 +03:00
parent 66b84e3660
commit 23bf55b66c
80 changed files with 1064 additions and 1221 deletions

View file

@ -36,20 +36,11 @@ feature Event do
select('YouTube', from: 'event[media_type]')
fill_in 'event_media_id', with: '123456'
fill_in 'person_biography', with: 'Lorem ipsum biography'
fill_in 'person_public_name', with: 'Example User'
fill_in 'user_biography', with: 'Lorem ipsum biography'
fill_in 'user_name', with: 'Example User'
click_button 'Submit Session'
expect(current_path).to eq(edit_user_registration_path)
fill_in 'user_person_attributes_first_name', with: 'Example'
fill_in 'user_person_attributes_last_name', with: 'User'
fill_in 'user_person_attributes_biography', with: 'Lorem ipsum biography'
click_button 'Update'
expect(flash).
to eq('You updated your account successfully.')
expect(current_path).to eq(register_conference_path(conference.short_title))
expect(Event.count).to eq(expected_count)