From 003ebe7bd0a1dd0ba021e3affe02be5cdb8964d4 Mon Sep 17 00:00:00 2001 From: Markus Graf Date: Mon, 9 Nov 2015 10:33:26 +0100 Subject: [PATCH] set a language flag in database --- app/controllers/supporters_controller.rb | 2 +- app/models/supporter.rb | 2 ++ spec/features/support_spec.rb | 1 + spec/models/supporter_spec.rb | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/supporters_controller.rb b/app/controllers/supporters_controller.rb index 2ac685c..bbce1c0 100644 --- a/app/controllers/supporters_controller.rb +++ b/app/controllers/supporters_controller.rb @@ -6,7 +6,7 @@ class SupportersController < ApplicationController end def create - @supporter = Supporter.new supporter_form_params + @supporter = Supporter.new supporter_form_params.merge(language: I18n.locale) if !input_to_fast? && @supporter.save redirect_to thanks_path else diff --git a/app/models/supporter.rb b/app/models/supporter.rb index 9b38a17..f8d87e3 100644 --- a/app/models/supporter.rb +++ b/app/models/supporter.rb @@ -18,6 +18,7 @@ class Supporter field :age_category, type: String field :coordinates, type: Array field :comments, type: String + field :language, type: String validates :first_name, presence: true validates :last_name, presence: true @@ -27,6 +28,7 @@ class Supporter validates :email, presence: true, uniqueness: true, format: /.+@.+\..+/i validates :support, presence: true validates :age_category, presence: true + validates :language, presence: true def self.counter actual = count.to_i diff --git a/spec/features/support_spec.rb b/spec/features/support_spec.rb index ae19cac..d0f162a 100644 --- a/spec/features/support_spec.rb +++ b/spec/features/support_spec.rb @@ -21,6 +21,7 @@ feature 'Support announcement' do supporter = Supporter.find_by(email: 'blocher@blocher.ch') expect(supporter.coordinates).to eq [8.618589100000001, 47.2926304] expect(supporter.comments).to eq 'Test text' + expect(supporter.language).to eq 'de' end scenario 'A bot tries to enter data' do diff --git a/spec/models/supporter_spec.rb b/spec/models/supporter_spec.rb index d0b80ac..8fc39e8 100644 --- a/spec/models/supporter_spec.rb +++ b/spec/models/supporter_spec.rb @@ -10,6 +10,7 @@ describe Supporter do it { is_expected.to validate_uniqueness_of(:email) } it { is_expected.to validate_presence_of(:support) } it { is_expected.to validate_presence_of(:age_category) } + it { is_expected.to validate_presence_of(:language) } describe '.counter' do it 'counts only from a certain number on' do