about summary refs log tree commit diff
path: root/spec/models/follow_request_spec.rb
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-05-07 19:51:00 +0200
committerGitHub <noreply@github.com>2021-05-07 19:51:00 +0200
commit50f8ee2e07e0a8a0ab8971543cb6544c8d6c5f5d (patch)
tree2d0f4954a3077e3e0bb2d02f671af41b69672e2a /spec/models/follow_request_spec.rb
parenta346912030012dc1451249373ff7ef1a61016517 (diff)
parente08b31a70624fe069d2f26bf2078a69e2d48f6aa (diff)
Merge pull request #1526 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/models/follow_request_spec.rb')
-rw-r--r--spec/models/follow_request_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/follow_request_spec.rb b/spec/models/follow_request_spec.rb
index 7c8e121d9..b0e854f09 100644
--- a/spec/models/follow_request_spec.rb
+++ b/spec/models/follow_request_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe FollowRequest, type: :model do
     let(:target_account) { Fabricate(:account) }
 
     it 'calls Account#follow!, MergeWorker.perform_async, and #destroy!' do
-      expect(account).to        receive(:follow!).with(target_account, reblogs: true, notify: false, uri: follow_request.uri)
+      expect(account).to        receive(:follow!).with(target_account, reblogs: true, notify: false, uri: follow_request.uri, bypass_limit: true)
       expect(MergeWorker).to    receive(:perform_async).with(target_account.id, account.id)
       expect(follow_request).to receive(:destroy!)
       follow_request.authorize!