From e7f20cc43ff21afa229da40ee4e5755495948772 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 26 Feb 2019 15:21:36 +0100 Subject: Add type, limit, offset, min_id, max_id, account_id to search API (#10091) * Add type, limit, offset, min_id, max_id, account_id to search API Fix #8939 * Make the offset work on accounts and hashtags search as well * Assure brakeman we are not doing mass assignment here * Do not allow paginating unless a type is chosen * Fix search query and index id field on statuses instead of created_at --- spec/services/account_search_service_spec.rb | 36 ++++++++++++++-------------- spec/services/search_service_spec.rb | 20 ++++++++-------- 2 files changed, 28 insertions(+), 28 deletions(-) (limited to 'spec') diff --git a/spec/services/account_search_service_spec.rb b/spec/services/account_search_service_spec.rb index c6cbdcce1..7b071b378 100644 --- a/spec/services/account_search_service_spec.rb +++ b/spec/services/account_search_service_spec.rb @@ -4,18 +4,18 @@ describe AccountSearchService, type: :service do describe '.call' do describe 'with a query to ignore' do it 'returns empty array for missing query' do - results = subject.call('', 10) + results = subject.call('', nil, limit: 10) expect(results).to eq [] end it 'returns empty array for hashtag query' do - results = subject.call('#tag', 10) + results = subject.call('#tag', nil, limit: 10) expect(results).to eq [] end it 'returns empty array for limit zero' do Fabricate(:account, username: 'match') - results = subject.call('match', 0) + results = subject.call('match', nil, limit: 0) expect(results).to eq [] end @@ -25,7 +25,7 @@ describe AccountSearchService, type: :service do it 'does not return a nil entry in the array for the exact match' do match = Fabricate(:account, username: 'matchingusername') - results = subject.call('match', 5) + results = subject.call('match', nil, limit: 5) expect(results).to eq [match] end end @@ -35,7 +35,7 @@ describe AccountSearchService, type: :service do before do allow(Account).to receive(:find_local) allow(Account).to receive(:search_for) - subject.call('@', 10) + subject.call('@', nil, limit: 10) end it 'uses find_local with empty query to look for local accounts' do @@ -47,7 +47,7 @@ describe AccountSearchService, type: :service do before do allow(Account).to receive(:find_local) allow(Account).to receive(:search_for) - subject.call('one', 10) + subject.call('one', nil, limit: 10) end it 'uses find_local to look for local accounts' do @@ -55,7 +55,7 @@ describe AccountSearchService, type: :service do end it 'uses search_for to find matches' do - expect(Account).to have_received(:search_for).with('one', 10) + expect(Account).to have_received(:search_for).with('one', 10, 0) end end @@ -65,16 +65,16 @@ describe AccountSearchService, type: :service do end it 'uses find_remote to look for remote accounts' do - subject.call('two@example.com', 10) + subject.call('two@example.com', nil, limit: 10) expect(Account).to have_received(:find_remote).with('two', 'example.com') end describe 'and there is no account provided' do it 'uses search_for to find matches' do allow(Account).to receive(:search_for) - subject.call('two@example.com', 10, nil, resolve: false) + subject.call('two@example.com', nil, limit: 10, resolve: false) - expect(Account).to have_received(:search_for).with('two example.com', 10) + expect(Account).to have_received(:search_for).with('two example.com', 10, 0) end end @@ -82,9 +82,9 @@ describe AccountSearchService, type: :service do it 'uses advanced_search_for to find matches' do account = Fabricate(:account) allow(Account).to receive(:advanced_search_for) - subject.call('two@example.com', 10, account, resolve: false) + subject.call('two@example.com', account, limit: 10, resolve: false) - expect(Account).to have_received(:advanced_search_for).with('two example.com', account, 10, nil) + expect(Account).to have_received(:advanced_search_for).with('two example.com', account, 10, nil, 0) end end end @@ -95,7 +95,7 @@ describe AccountSearchService, type: :service do partial = Fabricate(:account, username: 'exactness') exact = Fabricate(:account, username: 'exact') - results = subject.call('exact', 10) + results = subject.call('exact', nil, limit: 10) expect(results.size).to eq 2 expect(results).to eq [exact, partial] end @@ -114,7 +114,7 @@ describe AccountSearchService, type: :service do exact = Fabricate(:account, username: 'e') Rails.configuration.x.local_domain = 'example.com' - results = subject.call('e@example.com', 2) + results = subject.call('e@example.com', nil, limit: 2) expect(results.size).to eq 2 expect(results).to eq([exact, remote]).or eq([exact, remote_too]) end @@ -125,7 +125,7 @@ describe AccountSearchService, type: :service do service = double(call: nil) allow(ResolveAccountService).to receive(:new).and_return(service) - results = subject.call('newuser@remote.com', 10, nil, resolve: true) + results = subject.call('newuser@remote.com', nil, limit: 10, resolve: true) expect(service).to have_received(:call).with('newuser@remote.com') end @@ -133,7 +133,7 @@ describe AccountSearchService, type: :service do service = double(call: nil) allow(ResolveAccountService).to receive(:new).and_return(service) - results = subject.call('newuser@remote.com', 10, nil, resolve: false) + results = subject.call('newuser@remote.com', nil, limit: 10, resolve: false) expect(service).not_to have_received(:call) end end @@ -143,7 +143,7 @@ describe AccountSearchService, type: :service do partial = Fabricate(:account, username: 'exactness') exact = Fabricate(:account, username: 'exact', suspended: true) - results = subject.call('exact', 10) + results = subject.call('exact', nil, limit: 10) expect(results.size).to eq 1 expect(results).to eq [partial] end @@ -151,7 +151,7 @@ describe AccountSearchService, type: :service do it "does not return suspended remote accounts" do remote = Fabricate(:account, username: 'a', domain: 'remote', display_name: 'e', suspended: true) - results = subject.call('a@example.com', 2) + results = subject.call('a@example.com', nil, limit: 2) expect(results.size).to eq 0 expect(results).to eq [] end diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb index 671080f1d..d064cd9b8 100644 --- a/spec/services/search_service_spec.rb +++ b/spec/services/search_service_spec.rb @@ -10,7 +10,7 @@ describe SearchService, type: :service do it 'returns empty results without searching' do allow(AccountSearchService).to receive(:new) allow(Tag).to receive(:search_for) - results = subject.call('', 10) + results = subject.call('', nil, 10) expect(results).to eq(empty_results) expect(AccountSearchService).not_to have_received(:new) @@ -27,7 +27,7 @@ describe SearchService, type: :service do it 'returns the empty results' do service = double(call: nil) allow(ResolveURLService).to receive(:new).and_return(service) - results = subject.call(@query, 10) + results = subject.call(@query, nil, 10) expect(service).to have_received(:call).with(@query, on_behalf_of: nil) expect(results).to eq empty_results @@ -40,7 +40,7 @@ describe SearchService, type: :service do service = double(call: account) allow(ResolveURLService).to receive(:new).and_return(service) - results = subject.call(@query, 10) + results = subject.call(@query, nil, 10) expect(service).to have_received(:call).with(@query, on_behalf_of: nil) expect(results).to eq empty_results.merge(accounts: [account]) end @@ -52,7 +52,7 @@ describe SearchService, type: :service do service = double(call: status) allow(ResolveURLService).to receive(:new).and_return(service) - results = subject.call(@query, 10) + results = subject.call(@query, nil, 10) expect(service).to have_received(:call).with(@query, on_behalf_of: nil) expect(results).to eq empty_results.merge(statuses: [status]) end @@ -67,8 +67,8 @@ describe SearchService, type: :service do service = double(call: [account]) allow(AccountSearchService).to receive(:new).and_return(service) - results = subject.call(query, 10) - expect(service).to have_received(:call).with(query, 10, nil, resolve: false) + results = subject.call(query, nil, 10) + expect(service).to have_received(:call).with(query, nil, limit: 10, offset: 0, resolve: false) expect(results).to eq empty_results.merge(accounts: [account]) end end @@ -77,17 +77,17 @@ describe SearchService, type: :service do it 'includes the tag in the results' do query = '#tag' tag = Tag.new - allow(Tag).to receive(:search_for).with('tag', 10).and_return([tag]) + allow(Tag).to receive(:search_for).with('tag', 10, 0).and_return([tag]) - results = subject.call(query, 10) - expect(Tag).to have_received(:search_for).with('tag', 10) + results = subject.call(query, nil, 10) + expect(Tag).to have_received(:search_for).with('tag', 10, 0) expect(results).to eq empty_results.merge(hashtags: [tag]) end it 'does not include tag when starts with @ character' do query = '@username' allow(Tag).to receive(:search_for) - results = subject.call(query, 10) + results = subject.call(query, nil, 10) expect(Tag).not_to have_received(:search_for) expect(results).to eq empty_results end -- cgit