potsda.mn/mastodon
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove redundant code in AtomSerializer and spec (#3528)

Browse source 
* Remove redundant status.reply? in AtomSerializer#object

* Cover AtomSerializer more
This commit is contained in:
Akihiko Odaki (@fn_aki@pawoo.net) 2017-06-04 03:51:08 +09:00 committed by Eugen Rochko
parent dab8fc4584
commit ce7c0def88
3 changed files with 1488 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/lib/atom_serializer.rb
View file

@ -107,7 +107,7 @@ class AtomSerializer
serialize_status_attributes(object, status) serialize_status_attributes(object, status)
append_element(object, 'link', nil, rel: :alternate, type: 'text/html', href: TagManager.instance.url_for(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? append_element(object, 'ostatus:conversation', nil, ref: conversation_uri(status.conversation)) unless status.conversation_id.nil?
object object

2
spec/fabricators/follow_request_fabricator.rb
View file

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

1623
spec/lib/atom_serializer_spec.rb
View file

File diff suppressed because it is too large Load diff