mirror of
https://github.com/funamitech/mastodon
synced 2024-11-30 07:49:04 +09:00
8ac7fca5d0
In #2110, a new attachment type "unknown" was introduced for attachments that were rejected due to a domain being blocked using reject_media. However, the "type" field was never set to "unknown" because a default value of "0" (image) is set for that column, causing the `type.blank?` expression to always equal false. This version uses type_changed? instead, causing the type to be set to "unknown" unless a type has been explicitly set. This introduces a small change in behaviour causing the type to be set to unknown before paperclip calls `before_post_process`. Presumably this behaviour is more appropriate than the current one because the attachment type has not been determined by that point. Included are new tests for `ProcessFeedService` and `UpdateRemoteProfileService` which now check that remote media is downloaded for non-blocked domains and is rejected for others.
85 lines
3.1 KiB
Ruby
85 lines
3.1 KiB
Ruby
require 'rails_helper'
|
||
|
||
RSpec.describe UpdateRemoteProfileService do
|
||
let(:xml) { File.read(File.join(Rails.root, 'spec', 'fixtures', 'push', 'feed.atom')) }
|
||
|
||
subject { UpdateRemoteProfileService.new }
|
||
|
||
before do
|
||
stub_request(:get, 'https://quitter.no/avatar/7477-300-20160211190340.png').to_return(request_fixture('avatar.txt'))
|
||
end
|
||
|
||
context 'with updated details' do
|
||
let(:remote_account) { Fabricate(:account, username: 'bob', domain: 'example.com') }
|
||
|
||
before do
|
||
subject.call(xml, remote_account)
|
||
end
|
||
|
||
it 'downloads new avatar' do
|
||
expect(a_request(:get, 'https://quitter.no/avatar/7477-300-20160211190340.png')).to have_been_made
|
||
end
|
||
|
||
it 'sets the avatar remote url' do
|
||
expect(remote_account.reload.avatar_remote_url).to eq 'https://quitter.no/avatar/7477-300-20160211190340.png'
|
||
end
|
||
|
||
it 'sets display name' do
|
||
expect(remote_account.reload.display_name).to eq 'ＤＩＧＩＴＡＬ ＣＡＴ'
|
||
end
|
||
|
||
it 'sets note' do
|
||
expect(remote_account.reload.note).to eq 'Software engineer, free time musician and ＤＩＧＩＴＡＬ ＳＰＯＲＴＳ enthusiast. Likes cats. Warning: May contain memes'
|
||
end
|
||
end
|
||
|
||
context 'with unchanged details' do
|
||
let(:remote_account) { Fabricate(:account, username: 'bob', domain: 'example.com', display_name: 'ＤＩＧＩＴＡＬ ＣＡＴ', note: 'Software engineer, free time musician and ＤＩＧＩＴＡＬ ＳＰＯＲＴＳ enthusiast. Likes cats. Warning: May contain memes', avatar_remote_url: 'https://quitter.no/avatar/7477-300-20160211190340.png') }
|
||
|
||
before do
|
||
subject.call(xml, remote_account)
|
||
end
|
||
|
||
it 'does not re-download avatar' do
|
||
expect(a_request(:get, 'https://quitter.no/avatar/7477-300-20160211190340.png')).to have_been_made.once
|
||
end
|
||
|
||
it 'sets the avatar remote url' do
|
||
expect(remote_account.reload.avatar_remote_url).to eq 'https://quitter.no/avatar/7477-300-20160211190340.png'
|
||
end
|
||
|
||
it 'sets display name' do
|
||
expect(remote_account.reload.display_name).to eq 'ＤＩＧＩＴＡＬ ＣＡＴ'
|
||
end
|
||
|
||
it 'sets note' do
|
||
expect(remote_account.reload.note).to eq 'Software engineer, free time musician and ＤＩＧＩＴＡＬ ＳＰＯＲＴＳ enthusiast. Likes cats. Warning: May contain memes'
|
||
end
|
||
end
|
||
|
||
context 'with updated details from a domain set to reject media' do
|
||
let(:remote_account) { Fabricate(:account, username: 'bob', domain: 'example.com') }
|
||
let!(:domain_block) { Fabricate(:domain_block, domain: 'example.com', reject_media: true) }
|
||
|
||
before do
|
||
subject.call(xml, remote_account)
|
||
end
|
||
|
||
it 'does not the avatar remote url' do
|
||
expect(remote_account.reload.avatar_remote_url).to be_nil
|
||
end
|
||
|
||
it 'sets display name' do
|
||
expect(remote_account.reload.display_name).to eq 'ＤＩＧＩＴＡＬ ＣＡＴ'
|
||
end
|
||
|
||
it 'sets note' do
|
||
expect(remote_account.reload.note).to eq 'Software engineer, free time musician and ＤＩＧＩＴＡＬ ＳＰＯＲＴＳ enthusiast. Likes cats. Warning: May contain memes'
|
||
end
|
||
|
||
it 'does not set store the avatar' do
|
||
expect(remote_account.reload.avatar_file_name).to be_nil
|
||
end
|
||
end
|
||
end
|