Browse Source

Remove redundant code in AtomSerializer and spec (#3528)

* Remove redundant status.reply? in AtomSerializer#object

* Cover AtomSerializer more
closed-social-glitch-2
Akihiko Odaki (@fn_aki@pawoo.net) 6 years ago
committed by Eugen Rochko
parent
commit
ce7c0def88
3 changed files with 1479 additions and 130 deletions
  1. +1
    -1
      app/lib/atom_serializer.rb
  2. +1
    -1
      spec/fabricators/follow_request_fabricator.rb
  3. +1477
    -128
      spec/lib/atom_serializer_spec.rb

+ 1
- 1
app/lib/atom_serializer.rb View File

@ -107,7 +107,7 @@ class AtomSerializer
serialize_status_attributes(object, status)
append_element(object, 'link', nil, rel: :alternate, type: 'text/html', href: TagManager.instance.url_for(status))
append_element(object, 'thr:in-reply-to', nil, ref: TagManager.instance.uri_for(status.thread), href: TagManager.instance.url_for(status.thread)) if statusn>.reply?span> <span class="o">&& !status.thread.nil?
append_element(object, 'thr:in-reply-to', nil, ref: TagManager.instance.uri_for(status.thread), href: TagManager.instance.url_for(status.thread)) unless status.thread.nil?
append_element(object, 'ostatus:conversation', nil, ref: conversation_uri(status.conversation)) unless status.conversation_id.nil?
object

+ 1
- 1
spec/fabricators/follow_request_fabricator.rb View File

@ -1,4 +1,4 @@
Fabricator(:follow_request) do
account
target_account { Fabricate(:account) }
target_account { Fabricate(:account, locked: true) }
end

+ 1477
- 128
spec/lib/atom_serializer_spec.rb
File diff suppressed because it is too large
View File


Loading…
Cancel
Save