diff options
| author | ThibG <thib@sitedethib.com> | 2020-09-29 10:29:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-29 10:29:42 +0200 |
| commit | 62e3f588dee75fc6a37457f8218630daad056cba (patch) | |
| tree | 69439eebc4da7137206ee82e6ec3fa21cf8c7ed0 /spec/models/follow_request_spec.rb | |
| parent | 787d5d728923393f12421a480b3c7aee789a11fe (diff) | |
| parent | ccfc2b6dce4bfda283bb6bc968a23fe4a76951d7 (diff) | |
Merge pull request #1430 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/models/follow_request_spec.rb')
| -rw-r--r-- | spec/models/follow_request_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/follow_request_spec.rb b/spec/models/follow_request_spec.rb index 4b824c0db..7c8e121d9 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, uri: follow_request.uri) + expect(account).to receive(:follow!).with(target_account, reblogs: true, notify: false, uri: follow_request.uri) expect(MergeWorker).to receive(:perform_async).with(target_account.id, account.id) expect(follow_request).to receive(:destroy!) follow_request.authorize! |