Simplify form: Just use a textarea for members.

4 files changed, 4 insertions, 31 deletions

diff --git a/spec/features/register_band_spec.rb b/spec/features/register_band_spec.rb
index 625cb20..249bf3f 100644
--- a/spec/features/register_band_spec.rb
+++ b/spec/features/register_band_spec.rb
@@ -38,6 +38,7 @@ feature "Submit registration form" do
       expect(find_field('Webside:').value).to eql(@band_params['website'])
       expect(find_field('Plateselskap:').value).to eql(@band_params['label'])
       expect(find_field('Kort bio:').value).to eql(@band_params['shortbio'])
+      expect(find_field('Medlemmer:').value).to eql(@band_params['members'])
 
       within ('#form-contact-info') do
         expect(find_field('Navn:').value).to eql(@band_params['contact']['name'])
@@ -46,12 +47,6 @@ feature "Submit registration form" do
         expect(find_field('E-post:').value).to eql(@band_params['contact']['email'])
       end
 
-      within '#form-members .member-info' do
-        expect(find_field('Navn:').value).to eql(@band_params['members']['1']['name'])
-        expect(find_field('Instrument:').value).to eql(@band_params['members']['1']['instrument'])
-        expect(find_field('Alder:').value).to eql(@band_params['members']['1']['age'])
-      end
-
       within '#form-songs #song-1-info' do
         expect(find_field('Tittel:').value).to eql(@band_params['songs']['1']['title'])
         expect(find_field('Lengde:').value).to eql(@band_params['songs']['1']['time'])
diff --git a/spec/registration_spec.rb b/spec/registration_spec.rb
index 7e4ca3a..fbd2016 100644
--- a/spec/registration_spec.rb
+++ b/spec/registration_spec.rb
@@ -21,10 +21,6 @@ describe RegistrationApp do
       expect(last_response.body).to match(/form id="registration-form"/)
     end
 
-    it 'displays the add member button' do
-      expect(last_response.body).to match(/id="add-member-button"/)
-    end
-
     it 'displays the add song button' do
       expect(last_response.body).to match(/id="add-song-button"/)
     end
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'