diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-02-02 07:33:09 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-02-02 07:33:09 +0000 |
| commit | 3163311098ddaa0ca8b40be3fedfcf7631119ad5 (patch) | |
| tree | 88d5701dd9f4645ef2167d5733579313eaf21e25 /test | |
| parent | ab83e0de6d389428cec11fe94280d675a38f00d0 (diff) | |
| parent | 29be70c0082ea09f03896c7e52e2b8a9cdbea641 (diff) | |
| download | pleroma-3163311098ddaa0ca8b40be3fedfcf7631119ad5.tar.gz pleroma-3163311098ddaa0ca8b40be3fedfcf7631119ad5.zip | |
Merge branch 'feature/remote-follow' into 'develop'
Add remote following of local profiles.
See merge request pleroma/pleroma!59
Diffstat (limited to 'test')
| -rw-r--r-- | test/web/ostatus/ostatus_test.exs | 6 |
1 files changed, 4 insertions, 2 deletions
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 |