Expand coverage for Tag.search_for method (#38405)
This commit is contained in:
parent
806e2a993a
commit
df479d598f
@ -32,7 +32,7 @@ class Admin::TagFilter
|
|||||||
when :status
|
when :status
|
||||||
status_scope(value)
|
status_scope(value)
|
||||||
when :name
|
when :name
|
||||||
Tag.search_for(value.to_s.strip, params[:limit], params[:offset], exclude_unlistable: false)
|
Tag.search_for(value, params[:limit], params[:offset], exclude_unlistable: false)
|
||||||
when :order
|
when :order
|
||||||
order_scope(value)
|
order_scope(value)
|
||||||
else
|
else
|
||||||
|
|||||||
@ -128,7 +128,7 @@ class Tag < ApplicationRecord
|
|||||||
end
|
end
|
||||||
|
|
||||||
def search_for(term, limit = 5, offset = 0, options = {})
|
def search_for(term, limit = 5, offset = 0, options = {})
|
||||||
stripped_term = term.strip
|
stripped_term = term.to_s.strip
|
||||||
options.reverse_merge!({ exclude_unlistable: true, exclude_unreviewed: false })
|
options.reverse_merge!({ exclude_unlistable: true, exclude_unreviewed: false })
|
||||||
|
|
||||||
query = Tag.matches_name(stripped_term)
|
query = Tag.matches_name(stripped_term)
|
||||||
|
|||||||
@ -338,6 +338,23 @@ RSpec.describe Tag do
|
|||||||
expect(results).to eq [tag]
|
expect(results).to eq [tag]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'finds tag records from padded term queries' do
|
||||||
|
tag = Fabricate(:tag, name: 'MATCH')
|
||||||
|
_miss_tag = Fabricate(:tag, name: 'miss')
|
||||||
|
|
||||||
|
results = described_class.search_for(' match ')
|
||||||
|
|
||||||
|
expect(results)
|
||||||
|
.to contain_exactly(tag)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'handles nil query' do
|
||||||
|
results = described_class.search_for(nil)
|
||||||
|
|
||||||
|
expect(results)
|
||||||
|
.to be_empty
|
||||||
|
end
|
||||||
|
|
||||||
it 'finds the exact matching tag as the first item' do
|
it 'finds the exact matching tag as the first item' do
|
||||||
similar_tag = Fabricate(:tag, name: 'matchlater', reviewed_at: Time.now.utc)
|
similar_tag = Fabricate(:tag, name: 'matchlater', reviewed_at: Time.now.utc)
|
||||||
tag = Fabricate(:tag, name: 'match', reviewed_at: Time.now.utc)
|
tag = Fabricate(:tag, name: 'match', reviewed_at: Time.now.utc)
|
||||||
@ -364,5 +381,16 @@ RSpec.describe Tag do
|
|||||||
|
|
||||||
expect(results).to eq [tag, unlisted_tag]
|
expect(results).to eq [tag, unlisted_tag]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'excludes non reviewed tags via option' do
|
||||||
|
tag = Fabricate(:tag, name: 'match', reviewed_at: 5.days.ago)
|
||||||
|
unreviewed_tag = Fabricate(:tag, name: 'matchreviewed', reviewed_at: nil)
|
||||||
|
|
||||||
|
results = described_class.search_for('match', 5, 0, exclude_unreviewed: true)
|
||||||
|
|
||||||
|
expect(results)
|
||||||
|
.to include(tag)
|
||||||
|
.and not_include(unreviewed_tag)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user