From 61d0e967f275c556327c3fbda8474ce1e9db6258 Mon Sep 17 00:00:00 2001
From: MadeTech Dushan <dushan@madetech.com>
Date: Mon, 7 Feb 2022 12:10:44 +0000
Subject: [PATCH] test and lint fixes

---
 app/helpers/check_answers_helper.rb | 2 +-
 app/models/form/question.rb         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/helpers/check_answers_helper.rb b/app/helpers/check_answers_helper.rb
index e22b6ae24..d8b72dc73 100644
--- a/app/helpers/check_answers_helper.rb
+++ b/app/helpers/check_answers_helper.rb
@@ -13,7 +13,7 @@ module CheckAnswersHelper
 
   def get_answer_label(question, case_log)
     if question.answer_label.present?
-      question.answer_label
+      question.answer_label(case_log)
     else
       "<span class=\"app-!-colour-muted\">You didn’t answer this question</span>".html_safe
     end
diff --git a/app/models/form/question.rb b/app/models/form/question.rb
index 706afd6e7..d832865f3 100644
--- a/app/models/form/question.rb
+++ b/app/models/form/question.rb
@@ -112,13 +112,13 @@ private
 
     label = ""
 
-    suffix.each do |s| 
+    suffix.each do |s|
       condition = s["depends_on"]
       next unless condition
 
       answer = case_log.send(condition.keys.first)
       if answer == condition.values.first
-        label = ANSWER_SUFFIX_LABELS.has_key?(answer) ? ANSWER_SUFFIX_LABELS[answer] : answer
+        label = ANSWER_SUFFIX_LABELS.key?(answer) ? ANSWER_SUFFIX_LABELS[answer] : answer
       end
     end
     label
@@ -150,6 +150,6 @@ private
   ANSWER_SUFFIX_LABELS = {
     "Weekly" => " every week",
     "Monthly" => " every month",
-    "Yearly" => " every year"
+    "Yearly" => " every year",
   }.freeze
 end