projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
[akkoma]
/
test
/
web
/
mastodon_api
/
status_view_test.exs
diff --git
a/test/web/mastodon_api/status_view_test.exs
b/test/web/mastodon_api/status_view_test.exs
index 351dbf673e421c4549024a5cac1a4f84702dd72a..db2fdc2f6dda92a15df7e0f3020ee301f5c387fe 100644
(file)
--- a/
test/web/mastodon_api/status_view_test.exs
+++ b/
test/web/mastodon_api/status_view_test.exs
@@
-5,13
+5,14
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
use Pleroma.DataCase
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
use Pleroma.DataCase
+ alias Pleroma.Activity
+ alias Pleroma.User
+ alias Pleroma.Web.ActivityPub.ActivityPub
+ alias Pleroma.Web.CommonAPI
+ alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.MastodonAPI.StatusView
alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.MastodonAPI.StatusView
- alias Pleroma.User
alias Pleroma.Web.OStatus
alias Pleroma.Web.OStatus
- alias Pleroma.Web.CommonAPI
- alias Pleroma.Web.ActivityPub.ActivityPub
- alias Pleroma.Activity
import Pleroma.Factory
import Tesla.Mock
import Pleroma.Factory
import Tesla.Mock
@@
-72,6
+73,8
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
note = insert(:note_activity)
user = User.get_cached_by_ap_id(note.data["actor"])
note = insert(:note_activity)
user = User.get_cached_by_ap_id(note.data["actor"])
+ convo_id = Utils.context_to_conversation_id(note.data["object"]["context"])
+
status = StatusView.render("status.json", %{activity: note})
created_at =
status = StatusView.render("status.json", %{activity: note})
created_at =
@@
-98,7
+101,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
muted: false,
pinned: false,
sensitive: false,
muted: false,
pinned: false,
sensitive: false,
- spoiler_text:
note.data["object"]["summary"]
,
+ spoiler_text:
HtmlSanitizeEx.basic_html(note.data["object"]["summary"])
,
visibility: "public",
media_attachments: [],
mentions: [],
visibility: "public",
media_attachments: [],
mentions: [],
@@
-120,7
+123,13
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
static_url: "corndog.png",
visible_in_picker: false
}
static_url: "corndog.png",
visible_in_picker: false
}
- ]
+ ],
+ pleroma: %{
+ local: true,
+ conversation_id: convo_id,
+ content: %{"text/plain" => HtmlSanitizeEx.strip_tags(note.data["object"]["content"])},
+ spoiler_text: %{"text/plain" => HtmlSanitizeEx.strip_tags(note.data["object"]["summary"])}
+ }
}
assert status == expected
}
assert status == expected
@@
-168,7
+177,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
status = StatusView.render("status.json", %{activity: activity})
status = StatusView.render("status.json", %{activity: activity})
- actor =
Repo.get_by(User, ap_id:
activity.actor)
+ actor =
User.get_by_ap_id(
activity.actor)
assert status.mentions ==
Enum.map([user, actor], fn u -> AccountView.render("mention.json", %{user: u}) end)
assert status.mentions ==
Enum.map([user, actor], fn u -> AccountView.render("mention.json", %{user: u}) end)
@@
-193,7
+202,8
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
remote_url: "someurl",
preview_url: "someurl",
text_url: "someurl",
remote_url: "someurl",
preview_url: "someurl",
text_url: "someurl",
- description: nil
+ description: nil,
+ pleroma: %{mime_type: "image/png"}
}
assert expected == StatusView.render("attachment.json", %{attachment: object})
}
assert expected == StatusView.render("attachment.json", %{attachment: object})