diff --git a/app/models/form/question.rb b/app/models/form/question.rb index 4159a6384..6fd839e4e 100644 --- a/app/models/form/question.rb +++ b/app/models/form/question.rb @@ -38,7 +38,7 @@ class Form::Question return checkbox_answer_label(case_log) if type == "checkbox" return case_log[id]&.to_formatted_s(:govuk_date).to_s if type == "date" - answer = value_label_from_value(case_log[id]) if case_log[id].present? + answer = label_from_value(case_log[id]) if case_log[id].present? answer_label = [prefix, format_value(answer), suffix_label(case_log)].join("") if answer return answer_label if answer_label @@ -49,7 +49,7 @@ class Form::Question return [] unless inferred_answers enabled_inferred_answers(inferred_answers, case_log).keys.map do |x| - form.get_question(x).value_label_from_value(case_log[x]) + form.get_question(x).label_from_value(case_log[x]) end end @@ -101,7 +101,7 @@ class Form::Question end end - def value_label_from_value(value) + def label_from_value(value) return unless value case type diff --git a/spec/models/form/question_spec.rb b/spec/models/form/question_spec.rb index 027eb5d56..9ffac8883 100644 --- a/spec/models/form/question_spec.rb +++ b/spec/models/form/question_spec.rb @@ -84,7 +84,7 @@ RSpec.describe Form::Question, type: :model do end it "can map label from value" do - expect(question.value_label_from_value(2)).to eq("Yearly") + expect(question.label_from_value(2)).to eq("Yearly") end context "when answer options include yes, no, prefer not to say" do @@ -128,7 +128,7 @@ RSpec.describe Form::Question, type: :model do end it "can map label from value" do - expect(question.value_label_from_value("E06000014")).to eq("York") + expect(question.label_from_value("E06000014")).to eq("York") end end