From 55983d657c857077ff0144e4c18d84194597b67e Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Fri, 30 Oct 2015 14:32:07 +0100
Subject: Simplify form: Don't mess with adding songs, display them all at
 once.

---
 registration.rb                    | 1 +
 spec/registration_spec.rb          | 4 ----
 spec/support/submit_form_helper.rb | 2 --
 views/index.erb                    | 6 ++----
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/registration.rb b/registration.rb
index 3aea657..009406a 100644
--- a/registration.rb
+++ b/registration.rb
@@ -11,6 +11,7 @@ class RegistrationApp < Sinatra::Base
 
   get '/' do
     @band = Band.new
+    3.times { @band.songs << Song.new }
     erb :index
   end
 
diff --git a/spec/registration_spec.rb b/spec/registration_spec.rb
index fbd2016..96ae18f 100644
--- a/spec/registration_spec.rb
+++ b/spec/registration_spec.rb
@@ -20,10 +20,6 @@ describe RegistrationApp do
     it 'displays the registration form' do
       expect(last_response.body).to match(/form id="registration-form"/)
     end
-
-    it 'displays the add song button' do
-      expect(last_response.body).to match(/id="add-song-button"/)
-    end
   end
 
   describe 'POST submit' do
diff --git a/spec/support/submit_form_helper.rb b/spec/support/submit_form_helper.rb
index 45e7d67..3d881cb 100644
--- a/spec/support/submit_form_helper.rb
+++ b/spec/support/submit_form_helper.rb
@@ -15,8 +15,6 @@ module SubmitFormHelper
     end
 
     if params['songs']
-      click_on 'Legg til låt'
-
       within '#form-songs #song-1-info' do
         fill_in 'Tittel:', with: params['songs']['1']['title']
         fill_in 'Lengde:', with: params['songs']['1']['time']
diff --git a/views/index.erb b/views/index.erb
index ab3a762..9b39a9e 100644
--- a/views/index.erb
+++ b/views/index.erb
@@ -66,10 +66,8 @@
             nøye med å oppgi riktige navn (ingen pseudonymer) på utøvere og komponister, da vi sjekker dette
             opp imot TONO/NCB for å sikre at evt. vederlag blir betalt riktig.</p>
 
-            <input type="button" name="add_song" value="Legg til låt" id="add-song-button">
-
-            <% @band.songs.each do |s| %>
-              <%= erb :song, layout: false, locals: { song_number: 1, song: s } %>
+            <% @band.songs.each_index do |i| %>
+              <%= erb :song, layout: false, locals: { song_number: i, song: @band.songs[i] } %>
             <% end %>
         </div>
 
-- 
cgit v1.2.3