diff options
| -rw-r--r-- | app/models/follow_request.rb | 4 | ||||
| -rw-r--r-- | spec/models/follow_request_spec.rb | 27 |
2 files changed, 10 insertions, 21 deletions
diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb index 60036d903..458bcd28a 100644 --- a/app/models/follow_request.rb +++ b/app/models/follow_request.rb @@ -27,7 +27,5 @@ class FollowRequest < ApplicationRecord destroy! end - def reject! - destroy! - end + alias reject! destroy! end diff --git a/spec/models/follow_request_spec.rb b/spec/models/follow_request_spec.rb index cc6f8ee62..1436501e9 100644 --- a/spec/models/follow_request_spec.rb +++ b/spec/models/follow_request_spec.rb @@ -1,25 +1,16 @@ require 'rails_helper' RSpec.describe FollowRequest, type: :model do - describe '#authorize!' - describe '#reject!' + describe '#authorize!' do + let(:follow_request) { Fabricate(:follow_request, account: account, target_account: target_account) } + let(:account) { Fabricate(:account) } + let(:target_account) { Fabricate(:account) } - describe 'validations' do - it 'has a valid fabricator' do - follow_request = Fabricate.build(:follow_request) - expect(follow_request).to be_valid - end - - it 'is invalid without an account' do - follow_request = Fabricate.build(:follow_request, account: nil) - follow_request.valid? - expect(follow_request).to model_have_error_on_field(:account) - end - - it 'is invalid without a target account' do - follow_request = Fabricate.build(:follow_request, target_account: nil) - follow_request.valid? - expect(follow_request).to model_have_error_on_field(:target_account) + it 'calls Account#follow!, MergeWorker.perform_async, and #destroy!' do + expect(account).to receive(:follow!).with(target_account) + expect(MergeWorker).to receive(:perform_async).with(target_account.id, account.id) + expect(follow_request).to receive(:destroy!) + follow_request.authorize! end end end |