mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-20 11:35:29 +01:00
Code Issues Projects Releases Wiki Activity

Fix nil query_username (#2013)

Browse Source
This commit is contained in:
Tomohiro Suwa 2017-04-18 02:57:02 +09:00 committed by Eugen
parent 630de52fdd
commit 3399dd7a66
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/account_search_service.rb
View File

@ -41,7 +41,7 @@ class AccountSearchService < BaseService
end end
def query_username def query_username
@_query_username ||= split_query_string.first @_query_username ||= split_query_string.first || ''
end end
def query_domain def query_domain

12
spec/services/account_search_service_spec.rb
View File

@ -25,6 +25,18 @@ describe AccountSearchService do
end end
describe 'searching local and remote users' do describe 'searching local and remote users' do
describe "when only '@'" do
before do
allow(Account).to receive(:find_remote)
allow(Account).to receive(:search_for)
subject.call('@', 10)
end
it 'uses find_remote with empty query to look for local accounts' do
expect(Account).to have_received(:find_remote).with('', nil)
end
end
describe 'when no domain' do describe 'when no domain' do
before do before do
allow(Account).to receive(:find_remote) allow(Account).to receive(:find_remote)