diff options
author | Patrick Figel <patrick@figel.email> | 2017-04-29 00:18:32 +0200 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-29 00:18:32 +0200 |
commit | 8ac7fca5d06b776cc09127f9c6a9018e9acade5b (patch) | |
tree | adb3c38b5908c6fc26014da208ef391ff97fdf66 /spec/services/update_remote_profile_service_spec.rb | |
parent | a823509b99eb428b1f68ed89594b88f48546253a (diff) |
Set correct attachment type for rejected media (#2599)
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.
Diffstat (limited to 'spec/services/update_remote_profile_service_spec.rb')
-rw-r--r-- | spec/services/update_remote_profile_service_spec.rb | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/spec/services/update_remote_profile_service_spec.rb b/spec/services/update_remote_profile_service_spec.rb index f96f2f6ba..64ec2dbbb 100644 --- a/spec/services/update_remote_profile_service_spec.rb +++ b/spec/services/update_remote_profile_service_spec.rb @@ -56,4 +56,29 @@ RSpec.describe UpdateRemoteProfileService do expect(remote_account.reload.note).to eq 'Software engineer, free time musician and DIGITAL SPORTS 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 'DIGITAL CAT' + end + + it 'sets note' do + expect(remote_account.reload.note).to eq 'Software engineer, free time musician and DIGITAL SPORTS 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 |