Remove redundant code in AtomSerializer and spec (#3528)

* Remove redundant status.reply? in AtomSerializer#object * Cover AtomSerializer more
2017-06-04 03:51:08 +09:00 · 2017-06-04 03:51:08 +09:00 · ce7c0def88
parent dab8fc4584
commit ce7c0def88
3 changed files with 1488 additions and 139 deletions
--- a/app/lib/atom_serializer.rb
+++ b/app/lib/atom_serializer.rb
@ -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 status.reply? && !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
--- a/spec/fabricators/follow_request_fabricator.rb
+++ b/spec/fabricators/follow_request_fabricator.rb
@ -1,4 +1,4 @@
 Fabricator(:follow_request) do
  account
-  target_account { Fabricate(:account) }
+  target_account { Fabricate(:account, locked: true) }
 end
--- a/spec/lib/atom_serializer_spec.rb
+++ b/spec/lib/atom_serializer_spec.rb