diff --git a/app/models/form/question.rb b/app/models/form/question.rb index f4ccc361f..fffa0059e 100644 --- a/app/models/form/question.rb +++ b/app/models/form/question.rb @@ -106,7 +106,7 @@ class Form::Question end def action_text(log) - if has_inferred_check_answers_value_or_is_derived?(log) + if is_derived_or_has_inferred_check_answers_value?(log) "Change" elsif type == "checkbox" answer_options.keys.any? { |key| value_is_yes?(log[key]) } ? "Change" : "Answer" @@ -254,7 +254,7 @@ class Form::Question @guidance_partial && @guidance_position == GuidancePosition::BOTTOM end - def has_inferred_check_answers_value_or_is_derived?(log) + def is_derived_or_has_inferred_check_answers_value?(log) selected_answer_option_is_derived?(log) || has_inferred_check_answers_value?(log) end diff --git a/app/models/form/subsection.rb b/app/models/form/subsection.rb index f8591427c..3f5827c92 100644 --- a/app/models/form/subsection.rb +++ b/app/models/form/subsection.rb @@ -44,7 +44,7 @@ class Form::Subsection def applicable_questions(log) questions.select do |q| - (q.displayed_to_user?(log) && !q.derived?) || q.has_inferred_check_answers_value_or_is_derived?(log) + (q.displayed_to_user?(log) && !q.derived?) || q.is_derived_or_has_inferred_check_answers_value?(log) end end diff --git a/spec/models/form/question_spec.rb b/spec/models/form/question_spec.rb index 34865dff2..48e71c76b 100644 --- a/spec/models/form/question_spec.rb +++ b/spec/models/form/question_spec.rb @@ -275,7 +275,7 @@ RSpec.describe Form::Question, type: :model do end it "knows it has an inferred value or is derived for check answers" do - expect(question.has_inferred_check_answers_value_or_is_derived?(lettings_log)).to be true + expect(question.is_derived_or_has_inferred_check_answers_value?(lettings_log)).to be true end end