diff options
| author | Harald Eilertsen <haraldei@anduin.net> | 2015-10-30 14:22:26 +0100 |
|---|---|---|
| committer | Harald Eilertsen <haraldei@anduin.net> | 2015-10-30 14:22:26 +0100 |
| commit | 90f4ed34c62f5d90b536cac97265d323d0c1c136 (patch) | |
| tree | b9c6f3c9494d21804b1cdab73daf5b57286a3ff7 /spec/support | |
| parent | f67121a270a345f718dd8e146b13a0fe84da1885 (diff) | |
| download | norsk-urskog-registrations-90f4ed34c62f5d90b536cac97265d323d0c1c136.tar.gz norsk-urskog-registrations-90f4ed34c62f5d90b536cac97265d323d0c1c136.tar.bz2 norsk-urskog-registrations-90f4ed34c62f5d90b536cac97265d323d0c1c136.zip | |
Simplify form: Just use a textarea for members.
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/band_factory.rb | 15 | ||||
| -rw-r--r-- | spec/support/submit_form_helper.rb | 9 |
2 files changed, 3 insertions, 21 deletions
diff --git a/spec/support/band_factory.rb b/spec/support/band_factory.rb index 56993fa..3ae2589 100644 --- a/spec/support/band_factory.rb +++ b/spec/support/band_factory.rb @@ -11,11 +11,7 @@ module BandFactory :contact_addr => "Streetname 666\n1234Someplace Nice", :contact_phone => '98765432', :contact_email => 'band@example.com', - :members => [ - { :name => 'Member 1', :instrument => 'Instrument 1', :age => '24' }, - { :name => 'Member 2', :instrument => 'Instrument 2', :age => '0' }, - { :name => 'Member 3', :instrument => '', :age => '' }, - ], + :members => "Member 1 (Instrument 1, 24\nMember 2 (Instrument 2)\nMember 3", }.merge(options) num_songs = opts.delete(:songs) @@ -32,17 +28,10 @@ module BandFactory 'phone' => opts[:contact_phone], 'email' => opts[:contact_email] }, - 'members' => {}, + 'members' => opts[:members], 'songs' => {} } - (1..opts[:members].length).each do |i| - params['members'][i.to_s] = {} - params['members'][i.to_s]['name'] = opts[:members][i-1][:name] - params['members'][i.to_s]['instrument'] = opts[:members][i-1][:instrument] - params['members'][i.to_s]['age'] = opts[:members][i-1][:age] - end - (1..num_songs).each do |i| num = i.to_s params['songs'][num] = create_song_params diff --git a/spec/support/submit_form_helper.rb b/spec/support/submit_form_helper.rb index 80d06bf..45e7d67 100644 --- a/spec/support/submit_form_helper.rb +++ b/spec/support/submit_form_helper.rb @@ -5,6 +5,7 @@ module SubmitFormHelper fill_in 'Webside:', with: params['website'] fill_in 'Plateselskap:', with: params['label'] fill_in 'Kort bio:', with: params['shortbio'] + fill_in 'Medlemmer:', with: params['members'] within '#form-contact-info' do fill_in 'Navn:', with: params['contact']['name'] @@ -13,14 +14,6 @@ module SubmitFormHelper fill_in 'E-post:', with: params['contact']['email'] end - click_on 'Legg til medlem' - - within '#form-members .member-info' do - fill_in 'Navn:', with: params['members']['1']['name'] - fill_in 'Instrument:', with: params['members']['1']['instrument'] - fill_in 'Alder:', with: params['members']['1']['age'] - end - if params['songs'] click_on 'Legg til låt' |