Skip to content

Commit 13e5ec6

Browse files
committed
Add tests for model code
This adds three tests for the model method and improves the model method Signed-off-by: jonathan.kerr <[email protected]>
1 parent d5adc84 commit 13e5ec6

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

app/models/member.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def recent_notes
119119
end
120120

121121
def self.find_members(name)
122-
where('name ILIKE ?', "%#{name}%").or(where('surname ILIKE ?', "%#{name}%"))
122+
where("CONCAT(name, ' ', surname) ILIKE ?", "%#{name}%")
123123
end
124124

125125
private

spec/models/member_spec.rb

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,25 @@
137137
expect(member.flag_to_organisers?).to be true
138138
end
139139
end
140+
141+
describe '#find_members' do
142+
describe 'search by first name' do
143+
it "should find the member" do
144+
expect(Member.find_members(member.name).first).to eq(member)
145+
end
146+
end
147+
148+
describe 'search by last name' do
149+
it "should find the member" do
150+
expect(Member.find_members(member.surname).first).to eq(member)
151+
end
152+
end
153+
154+
describe 'search by full name' do
155+
it "should find the member" do
156+
expect(Member.find_members("#{member.name} #{member.surname}").first).to eq(member)
157+
end
158+
end
159+
160+
end
140161
end

0 commit comments

Comments
 (0)