Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop

test/notification_test.exs

@@ -14,9 +14,9 @@ defmodule Pleroma.NotificationTest do
 
       {:ok, [notification, other_notification]} = Notification.create_notifications(activity)
 
-      assert notification.user_id == other_user.id
+      notified_ids = Enum.sort([notification.user_id, other_notification.user_id])
+      assert notified_ids == [other_user.id, third_user.id]
       assert notification.activity_id == activity.id
-      assert other_notification.user_id == third_user.id
       assert other_notification.activity_id == activity.id
     end
   end

test/web/ostatus/feed_representer_test.exs

@@ -26,6 +26,7 @@ defmodule Pleroma.Web.OStatus.FeedRepresenterTest do
       <id>#{OStatus.feed_path(user)}</id>
       <title>#{user.nickname}'s timeline</title>
       <updated>#{most_recent_update}</updated>
+      <logo>#{User.avatar_url(user)}</logo>
       <link rel="hub" href="#{OStatus.pubsub_path(user)}" />
       <link rel="salmon" href="#{OStatus.salmon_path(user)}" />
       <link rel="self" href="#{OStatus.feed_path(user)}" type="application/atom+xml" />