added comments

This commit is contained in:
2015-11-01 11:03:54 +01:00
parent 12eefc1814
commit bc571842fd
5 changed files with 8 additions and 3 deletions
+1 -1
View File
@@ -18,6 +18,6 @@ class SupportersController < ApplicationController
private private
def supporter_form_params def supporter_form_params
params.require(:supporter).permit(:first_name, :last_name, :street, :zip, :email, :support, :age_category, :city) params.require(:supporter).permit(:first_name, :last_name, :street, :zip, :email, :support, :age_category, :city, :comments)
end end
end end
+1
View File
@@ -17,6 +17,7 @@ class Supporter
field :support, type: String # Indicates the type of support field :support, type: String # Indicates the type of support
field :age_category, type: String field :age_category, type: String
field :coordinates, type: Array field :coordinates, type: Array
field :comments, type: String
validates :first_name, presence: true validates :first_name, presence: true
validates :last_name, presence: true validates :last_name, presence: true
+1
View File
@@ -11,6 +11,7 @@ h1 = title t('.title_html')
= f.input :email, placeholder: t('.placeholders.email') = f.input :email, placeholder: t('.placeholders.email')
= f.input :support, as: :radio_buttons, collection: t('support_type'), label_method: :last, value_method: :first = f.input :support, as: :radio_buttons, collection: t('support_type'), label_method: :last, value_method: :first
= f.input :age_category, as: :radio_buttons, collection: t('age_category'), label_method: :last, value_method: :first = f.input :age_category, as: :radio_buttons, collection: t('age_category'), label_method: :last, value_method: :first
= f.input :comments, as: :text
.form-group .form-group
= f.submit value: t('.submit'), class: 'btn btn-success' = f.submit value: t('.submit'), class: 'btn btn-success'
.form-group .form-group
+1
View File
@@ -42,3 +42,4 @@ de:
email: E-Mail email: E-Mail
support: Unterstützung support: Unterstützung
age_category: Alterskategorie age_category: Alterskategorie
comments: Kommentar / Feedback (optional)
+4 -2
View File
@@ -11,14 +11,16 @@ feature 'Support announcement' do
fill_in 'Postleitzahl', with: '8704' fill_in 'Postleitzahl', with: '8704'
fill_in 'Ort', with: 'Herrliberg' fill_in 'Ort', with: 'Herrliberg'
fill_in 'E-Mail', with: 'blocher@blocher.ch' fill_in 'E-Mail', with: 'blocher@blocher.ch'
fill_in 'Kommentar / Feedback', with: 'Test text'
choose 'Ich unterschreibe eine Volksinitiative für die Freigabe von Cannabis und helfe aktiv Unterschriften in meiner Umgebung zu sammeln.' choose 'Ich unterschreibe eine Volksinitiative für die Freigabe von Cannabis und helfe aktiv Unterschriften in meiner Umgebung zu sammeln.'
choose 'Ich bin über 64 Jahre alt' choose 'Ich bin über 64 Jahre alt'
expect { click_button 'Unterstützung zusichern' }.to change { Supporter.count }.by(1) expect { click_button 'Unterstützung zusichern' }.to change { Supporter.count }.by(1)
supporter = Supporter.find_by(email: 'blocher@blocher.ch')
expect(Supporter.find_by(email: 'blocher@blocher.ch').coordinates).to eq [8.618589100000001, 47.2926304] expect(supporter.coordinates).to eq [8.618589100000001, 47.2926304]
expect(supporter.comments).to eq 'Test text'
end end
scenario 'A bot tries to enter data' do scenario 'A bot tries to enter data' do