mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-29 12:03:57 +00:00
221580a3af
Conflicts: - `app/controllers/home_controller.rb`: Upstream made it so `/web` is available to non-logged-in users and `/` redirects to `/web` instead of `/about`. Kept our version since glitch-soc's WebUI doesn't have what's needed yet and I think /about is still a much better landing page anyway. - `app/models/form/admin_settings.rb`: Upstream added new settings, and glitch-soc had an extra setting. Not really a conflict. Added upstream's new settings. - `app/serializers/initial_state_serializer.rb`: Upstream added a new `server` initial state object. Not really a conflict. Merged upstream's changes. - `app/views/admin/settings/edit.html.haml`: Upstream added new settings. Not really a conflict. Merged upstream's changes. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Upstream refactored that part and removed the file. Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb` - `config/settings.yml`: Upstream added new settings. Not a real conflict. Added upstream's new settings.
38 lines
1.5 KiB
Ruby
38 lines
1.5 KiB
Ruby
require 'rails_helper'
|
|
|
|
RSpec.describe FollowRequest, type: :model do
|
|
describe '#authorize!' do
|
|
let(:follow_request) { Fabricate(:follow_request, account: account, target_account: target_account) }
|
|
let(:account) { Fabricate(:account) }
|
|
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, languages: nil, bypass_limit: true)
|
|
expect(MergeWorker).to receive(:perform_async).with(target_account.id, account.id)
|
|
expect(follow_request).to receive(:destroy!)
|
|
follow_request.authorize!
|
|
end
|
|
|
|
it 'generates a Follow' do
|
|
follow_request = Fabricate.create(:follow_request)
|
|
follow_request.authorize!
|
|
target = follow_request.target_account
|
|
expect(follow_request.account.following?(target)).to be true
|
|
end
|
|
|
|
it 'correctly passes show_reblogs when true' do
|
|
follow_request = Fabricate.create(:follow_request, show_reblogs: true)
|
|
follow_request.authorize!
|
|
target = follow_request.target_account
|
|
expect(follow_request.account.muting_reblogs?(target)).to be false
|
|
end
|
|
|
|
it 'correctly passes show_reblogs when false' do
|
|
follow_request = Fabricate.create(:follow_request, show_reblogs: false)
|
|
follow_request.authorize!
|
|
target = follow_request.target_account
|
|
expect(follow_request.account.muting_reblogs?(target)).to be true
|
|
end
|
|
end
|
|
end
|