From ab821a06f43dcdaa5cf3740ac387328fac12f5fb Mon Sep 17 00:00:00 2001
From: Kat <katrina@madetech.com>
Date: Mon, 23 May 2022 12:29:19 +0100
Subject: [PATCH] Move case logs filter from helpers to modules

---
 app/controllers/case_logs_controller.rb                       | 4 +++-
 .../{helpers/filter.rb => modules/case_logs_filter.rb}        | 2 +-
 app/controllers/organisations_controller.rb                   | 4 +++-
 spec/requests/organisations_controller_spec.rb                | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)
 rename app/controllers/{helpers/filter.rb => modules/case_logs_filter.rb} (97%)

diff --git a/app/controllers/case_logs_controller.rb b/app/controllers/case_logs_controller.rb
index 2393e599a..df5f37b88 100644
--- a/app/controllers/case_logs_controller.rb
+++ b/app/controllers/case_logs_controller.rb
@@ -1,6 +1,8 @@
+require_relative "./modules/case_logs_filter"
+
 class CaseLogsController < ApplicationController
   include Pagy::Backend
-  include Helpers::Filter
+  include CaseLogsFilter
 
   skip_before_action :verify_authenticity_token, if: :json_api_request?
   before_action :authenticate, if: :json_api_request?
diff --git a/app/controllers/helpers/filter.rb b/app/controllers/modules/case_logs_filter.rb
similarity index 97%
rename from app/controllers/helpers/filter.rb
rename to app/controllers/modules/case_logs_filter.rb
index deded7105..74f079924 100644
--- a/app/controllers/helpers/filter.rb
+++ b/app/controllers/modules/case_logs_filter.rb
@@ -1,4 +1,4 @@
-module Helpers::Filter
+module CaseLogsFilter
   def filtered_case_logs(logs)
     if session[:case_logs_filters].present?
       filters = JSON.parse(session[:case_logs_filters])
diff --git a/app/controllers/organisations_controller.rb b/app/controllers/organisations_controller.rb
index c00889d85..480b0ab17 100644
--- a/app/controllers/organisations_controller.rb
+++ b/app/controllers/organisations_controller.rb
@@ -1,6 +1,8 @@
+require_relative "./modules/case_logs_filter"
+
 class OrganisationsController < ApplicationController
   include Pagy::Backend
-  include Helpers::Filter
+  include CaseLogsFilter
 
   before_action :authenticate_user!, except: [:index]
   before_action :find_resource, except: [:index]
diff --git a/spec/requests/organisations_controller_spec.rb b/spec/requests/organisations_controller_spec.rb
index 5b7f98ed9..d843b6f3e 100644
--- a/spec/requests/organisations_controller_spec.rb
+++ b/spec/requests/organisations_controller_spec.rb
@@ -459,7 +459,7 @@ RSpec.describe OrganisationsController, type: :request do
         end
 
         it "shows the total organisations count" do
-          expect(CGI.unescape_html(response.body)).to match("<strong>#{total_organisations_count}</strong> total organisations")
+          expect(CGI.unescape_html(response.body)).to match("<strong>#{total_organisations_count}</strong><span style=\"font-weight: normal\"> total organisations</span>")
         end
 
         it "has pagination links" do