Browse Source

refactor: flip name

pull/1257/head
natdeanlewissoftwire 3 years ago
parent
commit
7191a795f8
  1. 4
      app/models/form/question.rb
  2. 2
      app/models/form/subsection.rb
  3. 2
      spec/models/form/question_spec.rb

4
app/models/form/question.rb

@ -106,7 +106,7 @@ class Form::Question
end end
def action_text(log) 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" "Change"
elsif type == "checkbox" elsif type == "checkbox"
answer_options.keys.any? { |key| value_is_yes?(log[key]) } ? "Change" : "Answer" 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 @guidance_partial && @guidance_position == GuidancePosition::BOTTOM
end 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) selected_answer_option_is_derived?(log) || has_inferred_check_answers_value?(log)
end end

2
app/models/form/subsection.rb

@ -44,7 +44,7 @@ class Form::Subsection
def applicable_questions(log) def applicable_questions(log)
questions.select do |q| 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
end end

2
spec/models/form/question_spec.rb

@ -275,7 +275,7 @@ RSpec.describe Form::Question, type: :model do
end end
it "knows it has an inferred value or is derived for check answers" do 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
end end

Loading…
Cancel
Save