about summary refs log tree commit diff
path: root/spec/models
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-05-04 14:16:30 -0500
committerDavid Yip <yipdw@member.fsf.org>2018-05-04 14:16:30 -0500
commit7600067a300b650a6f30da19a469c913243f3a13 (patch)
tree8b84acffba4bd167b8e7c6d332c48013b68e7079 /spec/models
parentcb62935c0b00f41ff5d4ab77a8cc38174b05d186 (diff)
parent6793bec4c67e695100cb4d8551f0bda0b7e87b12 (diff)
Merge remote-tracking branch 'origin/master' into gs-master
  Conflicts:
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
    	db/schema.rb
Diffstat (limited to 'spec/models')
-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 7bc93a2aa..4b824c0db 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)
+      expect(account).to        receive(:follow!).with(target_account, reblogs: true, 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!