From dcaa730e4d317ea570a2026f5144b448805abf4d Mon Sep 17 00:00:00 2001 From: Kat Date: Tue, 22 Feb 2022 11:57:25 +0000 Subject: [PATCH] rubocop --- app/models/case_log.rb | 4 ++-- spec/models/case_log_spec.rb | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/models/case_log.rb b/app/models/case_log.rb index fb6813fb1..21d60a872 100644 --- a/app/models/case_log.rb +++ b/app/models/case_log.rb @@ -217,8 +217,8 @@ private form.invalidated_page_questions(self).each do |question| enabled = form.enabled_page_questions(self) contains_selected_answer_option = enabled.map(&:id).include?(question.id) && enabled.find { |q| q.id == question.id }.answer_options.values.map { |x| x["value"] }.include?(public_send(question.id)) - unless contains_selected_answer_option - public_send("#{question.id}=", nil) if respond_to?(question.id.to_s) + if !contains_selected_answer_option && respond_to?(question.id.to_s) + public_send("#{question.id}=", nil) end end end diff --git a/spec/models/case_log_spec.rb b/spec/models/case_log_spec.rb index 564f9350c..89875c2b4 100644 --- a/spec/models/case_log_spec.rb +++ b/spec/models/case_log_spec.rb @@ -538,7 +538,7 @@ RSpec.describe CaseLog do it "does clear the value for answers that do not apply for invalidated page" do case_log.update!({ wchair: "Yes", sex2: "Female", age2: 33 }) - case_log.update!({ cbl: "No" }) + case_log.update!({ cbl: "No" }) case_log.update!({ preg_occ: "Yes" }) expect(case_log.cbl).to eq(nil) @@ -581,7 +581,6 @@ RSpec.describe CaseLog do expect(case_log["layear"]).to eq("1 year but under 2 years") end end - end describe "paper trail" do