From f2b897cfa072e1cd1cd48770d4a8871a2425a4c0 Mon Sep 17 00:00:00 2001
From: baarkerlounger <db@slothlife.xyz>
Date: Tue, 24 May 2022 17:37:39 +0100
Subject: [PATCH] Update spec

---
 app/controllers/modules/users_filter.rb     | 7 +++----
 app/controllers/organisations_controller.rb | 2 +-
 app/controllers/users_controller.rb         | 2 +-
 spec/requests/users_controller_spec.rb      | 8 ++++----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/controllers/modules/users_filter.rb b/app/controllers/modules/users_filter.rb
index 7d2c78e5f..2c4f8975d 100644
--- a/app/controllers/modules/users_filter.rb
+++ b/app/controllers/modules/users_filter.rb
@@ -1,8 +1,7 @@
 module Modules::UsersFilter
-  def filtered_users(base_collection)
-    search_param = params["search"]
-    if search_param.present?
-      base_collection.search_by(search_param)
+  def filtered_users(base_collection, search_term=nil)
+    if search_term.present?
+      base_collection.search_by(search_term)
     else
       base_collection
     end.filter_by_active.includes(:organisation)
diff --git a/app/controllers/organisations_controller.rb b/app/controllers/organisations_controller.rb
index 387ab035f..4781da5e6 100644
--- a/app/controllers/organisations_controller.rb
+++ b/app/controllers/organisations_controller.rb
@@ -18,7 +18,7 @@ class OrganisationsController < ApplicationController
   end
 
   def users
-    @pagy, @users = pagy(filtered_users(@organisation.users))
+    @pagy, @users = pagy(filtered_users(@organisation.users, params["search"]))
     @searched = params["search"].presence
     render "users/index"
   end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 2b576d187..7b2873461 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -10,7 +10,7 @@ class UsersController < ApplicationController
   def index
     redirect_to users_organisation_path(current_user.organisation) unless current_user.support?
 
-    @pagy, @users = pagy(filtered_users(User.all))
+    @pagy, @users = pagy(filtered_users(User.all, params["search"]))
     @searched = params["search"].presence
 
     respond_to do |format|
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 70434a046..54c4e3526 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -359,7 +359,7 @@ RSpec.describe UsersController, type: :request do
 
         it "shows a search bar" do
           follow_redirect!
-          expect(page).to have_field("search-field", type: "search")
+          expect(page).to have_field("search", type: "search")
         end
       end
 
@@ -369,7 +369,7 @@ RSpec.describe UsersController, type: :request do
         let!(:other_org_user) { FactoryBot.create(:user, name: "User 4", email: "joe@other_example.com") }
 
         before do
-          get "/organisations/#{user.organisation.id}/users?search-field=#{search_param}"
+          get "/organisations/#{user.organisation.id}/users?search=#{search_param}"
         end
 
         context "when our search string matches case" do
@@ -822,12 +822,12 @@ RSpec.describe UsersController, type: :request do
       end
 
       it "shows a search bar" do
-        expect(page).to have_field("search-field", type: "search")
+        expect(page).to have_field("search", type: "search")
       end
 
       context "when a search parameter is passed" do
         before do
-          get "/users?search-field=#{search_param}"
+          get "/users?search=#{search_param}"
         end
 
         context "when our search term matches a name" do