diff options
| author | Roger Braun <roger@rogerbraun.net> | 2018-02-11 09:50:55 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2018-02-11 09:50:55 +0100 |
| commit | 52200998c997576c9008cbe50b0a7b9f0e6134cc (patch) | |
| tree | c0d68f476442b8dd86fca1e182d5c09553800810 /test/web/ostatus | |
| parent | 4a13b8488787773d09f67d1a436d5906e2f5b171 (diff) | |
| parent | 0e2ca77eec511857508208d3faeb9217c4496f8a (diff) | |
| download | pleroma-52200998c997576c9008cbe50b0a7b9f0e6134cc.tar.gz pleroma-52200998c997576c9008cbe50b0a7b9f0e6134cc.zip | |
Merge branch 'develop' into feature/activitypub
Diffstat (limited to 'test/web/ostatus')
| -rw-r--r-- | test/web/ostatus/feed_representer_test.exs | 1 | ||||
| -rw-r--r-- | test/web/ostatus/ostatus_test.exs | 6 | ||||
| -rw-r--r-- | test/web/ostatus/user_representer_test.exs | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/test/web/ostatus/feed_representer_test.exs b/test/web/ostatus/feed_representer_test.exs index df5a964e2..e10936366 100644 --- a/test/web/ostatus/feed_representer_test.exs +++ b/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" /> diff --git a/test/web/ostatus/ostatus_test.exs b/test/web/ostatus/ostatus_test.exs index de01612b3..b27f8cb55 100644 --- a/test/web/ostatus/ostatus_test.exs +++ b/test/web/ostatus/ostatus_test.exs @@ -302,7 +302,8 @@ defmodule Pleroma.Web.OStatusTest do "host" => "social.heldscal.la", "fqn" => user, "bio" => "cofe", - "avatar" => %{"type" => "Image", "url" => [%{"href" => "https://social.heldscal.la/avatar/29191-original-20170421154949.jpeg", "mediaType" => "image/jpeg", "type" => "Link"}]} + "avatar" => %{"type" => "Image", "url" => [%{"href" => "https://social.heldscal.la/avatar/29191-original-20170421154949.jpeg", "mediaType" => "image/jpeg", "type" => "Link"}]}, + "subscribe_address" => "https://social.heldscal.la/main/ostatussub?profile={uri}" } assert data == expected end @@ -325,7 +326,8 @@ defmodule Pleroma.Web.OStatusTest do "host" => "social.heldscal.la", "fqn" => user, "bio" => "cofe", - "avatar" => %{"type" => "Image", "url" => [%{"href" => "https://social.heldscal.la/avatar/29191-original-20170421154949.jpeg", "mediaType" => "image/jpeg", "type" => "Link"}]} + "avatar" => %{"type" => "Image", "url" => [%{"href" => "https://social.heldscal.la/avatar/29191-original-20170421154949.jpeg", "mediaType" => "image/jpeg", "type" => "Link"}]}, + "subscribe_address" => "https://social.heldscal.la/main/ostatussub?profile={uri}" } assert data == expected end diff --git a/test/web/ostatus/user_representer_test.exs b/test/web/ostatus/user_representer_test.exs index d5d70f5c6..b22420379 100644 --- a/test/web/ostatus/user_representer_test.exs +++ b/test/web/ostatus/user_representer_test.exs @@ -21,6 +21,7 @@ defmodule Pleroma.Web.OStatus.UserRepresenterTest do <summary>#{user.bio}</summary> <name>#{user.nickname}</name> <link rel="avatar" href="#{User.avatar_url(user)}" /> + <link rel="header" href="#{User.banner_url(user)}" /> """ assert clean(res) == clean(expected) |