tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

Browse Source
This commit is contained in:
Jenkins
2017-12-06 20:17:13 +00:00
parent f2f2f10320 a0047fdca0
commit 8ca91cef45
78 changed files with 1382 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spec/services/account_search_service_spec.rb
View File

@@ -72,7 +72,7 @@ describe AccountSearchService do
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, false, nil)
subject.call('two@example.com', 10, nil, resolve: false)
expect(Account).to have_received(:search_for).with('two example.com', 10)
end
@@ -82,9 +82,9 @@ describe AccountSearchService 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, false, account)
subject.call('two@example.com', 10, account, resolve: false)
expect(Account).to have_received(:advanced_search_for).with('two example.com', account, 10)
expect(Account).to have_received(:advanced_search_for).with('two example.com', account, 10, nil)
end
end
end
@@ -125,7 +125,7 @@ describe AccountSearchService do
service = double(call: nil)
allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
results = subject.call('newuser@remote.com', 10, true)
results = subject.call('newuser@remote.com', 10, nil, resolve: true)
expect(service).to have_received(:call).with('newuser@remote.com')
end
@@ -133,7 +133,7 @@ describe AccountSearchService do
service = double(call: nil)
allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
results = subject.call('newuser@remote.com', 10, false)
results = subject.call('newuser@remote.com', 10, nil, resolve: false)
expect(service).not_to have_received(:call)
end
end

2
spec/services/post_status_service_spec.rb
View File

@@ -182,7 +182,7 @@ RSpec.describe PostStatusService do
expect(status2.id).to eq status1.id
end
def create_status_with_options(options = {})
def create_status_with_options(**options)
subject.call(Fabricate(:account), 'test', nil, options)
end
end

2
spec/services/search_service_spec.rb
View File

@@ -68,7 +68,7 @@ describe SearchService do
allow(AccountSearchService).to receive(:new).and_return(service)
results = subject.call(query, 10)
expect(service).to have_received(:call).with(query, 10, false, nil)
expect(service).to have_received(:call).with(query, 10, nil, resolve: false)
expect(results).to eq empty_results.merge(accounts: [account])
end
end