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

3 files changed, 7 insertions, 7 deletions

diff --git a/spec/services/account_search_service_spec.rb b/spec/services/account_search_service_spec.rb
index 25bb56bca..4685e619f 100644
--- a/spec/services/account_search_service_spec.rb
+++ b/spec/services/account_search_service_spec.rb
@@ -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
diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
index 91902ff69..92fbc73cd 100644
--- a/spec/services/post_status_service_spec.rb
+++ b/spec/services/post_status_service_spec.rb
@@ -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
diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb
index 00475c699..3ffcc389b 100644
--- a/spec/services/search_service_spec.rb
+++ b/spec/services/search_service_spec.rb
@@ -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