Browse Source

Update spec

pull/607/head
baarkerlounger 3 years ago
parent
commit
f2b897cfa0
  1. 7
      app/controllers/modules/users_filter.rb
  2. 2
      app/controllers/organisations_controller.rb
  3. 2
      app/controllers/users_controller.rb
  4. 8
      spec/requests/users_controller_spec.rb

7
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)

2
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

2
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|

8
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

Loading…
Cancel
Save