From 2b664060f45efd7329b53f87f83cc764a5a53bdb Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 10 Oct 2015 14:52:35 +0200 Subject: Don't display error message when there's no errors. --- lib/band.rb | 4 ++++ spec/registration_spec.rb | 4 ++++ views/layout.erb | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/band.rb b/lib/band.rb index 760274b..e75dd6e 100644 --- a/lib/band.rb +++ b/lib/band.rb @@ -45,4 +45,8 @@ class Band errors << "Du må ha med minst én låt!" end end + + def has_errors + errors.length > 0 + end end diff --git a/spec/registration_spec.rb b/spec/registration_spec.rb index 4b27bbe..db7db70 100644 --- a/spec/registration_spec.rb +++ b/spec/registration_spec.rb @@ -46,6 +46,10 @@ describe RegistrationApp do expect(last_response).to be_ok end + it 'should not display any errors' do + expect(last_response.body).not_to include("Det er feil i skjemaet") + end + it 'displays submitted data to user' do expect(last_response).to match(/Bandnavn\: Imbalance/) expect(last_response).to match(/Hjemsted\: Oslo/) diff --git a/views/layout.erb b/views/layout.erb index 8dd0c31..eb1d803 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -8,7 +8,7 @@ Norsk Urskog 2015 - Påmeldingsskjema for band - <% if @band && @band.errors %> + <% if @band && @band.has_errors %>

Det er feil i skjemaet!

Vennligst se over følgende og prøv igjen:

-- cgit v1.2.3