Skip to content

Commit 13e8494

Browse files
committed
Change method name
This better reflects what the method actually does Signed-off-by: jonathan.kerr <[email protected]>
1 parent 3c96476 commit 13e8494

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

app/controllers/admin/member_search_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ class Admin::MemberSearchController < Admin::ApplicationController
22
def index
33
member_params = params[:member_search] || {}
44
name = member_params[:name]
5-
members = name.blank? ? Member.none : Member.find_members(name).select(:id, :name, :surname, :pronouns)
5+
members = name.blank? ? Member.none : Member.find_members_by_name(name).select(:id, :name, :surname, :pronouns)
66
callback_url = member_params[:callback_url] || params[:callback_url] || results_admin_member_search_index_path
77
if members.size == 1
88
query = { member_pick: { members: [members.first.id] } }

app/models/member.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def recent_notes
118118
member_notes.where('created_at > ?', notes_from_date)
119119
end
120120

121-
def self.find_members(name)
121+
def self.find_members_by_name(name)
122122
name.strip!
123123
name.eql?('') ? self.none : where("CONCAT(name, ' ', surname) ILIKE ?", "%#{name}%")
124124
end

spec/controllers/admin/member_search_controller_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
context "and when admin user searches for a single existing user" do
2727
before do
28-
allow(Member).to receive(:find_members).with('Juliet').and_return(fake_relation)
28+
allow(Member).to receive(:find_members_by_name).with('Juliet').and_return(fake_relation)
2929
allow(fake_relation).to receive(:select).with(any_args).and_return([fake_juliet])
3030
get :index, params: {member_search: {name: "Juliet", callback_url: root_path}}
3131
end
@@ -43,7 +43,7 @@
4343
let(:fake_romeo) { double('Member', id: 2, name: 'Romeo', surname: 'Capulet')}
4444

4545
before do
46-
allow(Member).to receive(:find_members).with('e').and_return(fake_relation)
46+
allow(Member).to receive(:find_members_by_name).with('e').and_return(fake_relation)
4747
allow(fake_relation).to receive(:select).with(any_args).and_return([fake_juliet, fake_romeo])
4848
get :index, params: {member_search: {name: 'e', callback_url: root_path}}
4949
end

spec/models/member_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,27 +141,27 @@
141141
describe '#find_members' do
142142
describe 'search by first name' do
143143
it 'finds the member' do
144-
expect(Member.find_members(member.name).first).to eq(member)
144+
expect(Member.find_members_by_name(member.name).first).to eq(member)
145145
end
146146
end
147147

148148
describe 'search by last name' do
149149
it 'finds the member' do
150-
expect(Member.find_members(member.surname).first).to eq(member)
150+
expect(Member.find_members_by_name(member.surname).first).to eq(member)
151151
end
152152
end
153153

154154
describe 'search by full name' do
155155
it 'finds the member' do
156-
expect(Member.find_members("#{member.name} #{member.surname}").first).to eq(member)
156+
expect(Member.find_members_by_name("#{member.name} #{member.surname}").first).to eq(member)
157157
end
158158
end
159159

160160
describe 'search bar is empty' do
161161
it 'returns no members' do
162162
Fabricate(:member)
163163
expect(Member.all.size).to be > 0
164-
expect(Member.find_members('').size).to eq(0)
164+
expect(Member.find_members_by_name('').size).to eq(0)
165165
end
166166
end
167167

0 commit comments

Comments
 (0)