diff --git a/app/helpers/budgets_helper.rb b/app/helpers/budgets_helper.rb index aa6684b2d..0e3594b0a 100644 --- a/app/helpers/budgets_helper.rb +++ b/app/helpers/budgets_helper.rb @@ -1,7 +1,7 @@ module BudgetsHelper def budget_phases_select_options - Budget::VALID_PHASES.map { |ph| [ t("budget.phase.#{ph}"), ph ] } + Budget::PHASES.map { |ph| [ t("budget.phase.#{ph}"), ph ] } end def budget_currency_symbol_select_options diff --git a/app/models/budget.rb b/app/models/budget.rb index 425750956..186a1aa4e 100644 --- a/app/models/budget.rb +++ b/app/models/budget.rb @@ -2,11 +2,11 @@ class Budget < ActiveRecord::Base include Measurable - VALID_PHASES = %w(accepting reviewing selecting valuating balloting reviewing_ballots finished).freeze + PHASES = %w(accepting reviewing selecting valuating balloting reviewing_ballots finished).freeze CURRENCY_SYMBOLS = %w(€ $ £ ¥).freeze validates :name, presence: true - validates :phase, inclusion: { in: VALID_PHASES } + validates :phase, inclusion: { in: PHASES } validates :currency_symbol, presence: true has_many :investments, dependent: :destroy @@ -94,7 +94,7 @@ class Budget < ActiveRecord::Base def sanitize_descriptions s = WYSIWYGSanitizer.new - VALID_PHASES.each do |phase| + PHASES.each do |phase| sanitized = s.sanitize(self.send("description_#{phase}")) self.send("description_#{phase}=", sanitized) end diff --git a/spec/models/budget_spec.rb b/spec/models/budget_spec.rb index 04ebc419e..17f4de4ff 100644 --- a/spec/models/budget_spec.rb +++ b/spec/models/budget_spec.rb @@ -6,7 +6,7 @@ describe Budget do it "changes depending on the phase" do budget = create(:budget) - Budget::VALID_PHASES.each do |phase| + Budget::PHASES.each do |phase| budget.phase = phase expect(budget.description).to eq(budget.send("description_#{phase}")) expect(budget.description).to be_html_safe @@ -18,7 +18,7 @@ describe Budget do let(:budget) { create(:budget) } it "is validated" do - Budget::VALID_PHASES.each do |phase| + Budget::PHASES.each do |phase| budget.phase = phase expect(budget).to be_valid end