projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/config-disable-chat' 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 1575b1d6e07c8865238afa23aa50f97a16eb8d3b..0d396f3b8418a97988b8473631afb3ce96007e24 100644
(file)
--- a/
test/web/mastodon_api/status_view_test.exs
+++ b/
test/web/mastodon_api/status_view_test.exs
@@
-17,9
+17,9
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
|> String.replace(~r/\.\d+Z/, ".000Z")
expected = %{
|> String.replace(~r/\.\d+Z/, ".000Z")
expected = %{
- id:
note.id
,
+ id:
to_string(note.id)
,
uri: note.data["object"]["id"],
uri: note.data["object"]["id"],
- url: note.data["object"]["
external_
id"],
+ url: note.data["object"]["id"],
account: AccountView.render("account.json", %{user: user}),
in_reply_to_id: nil,
in_reply_to_account_id: nil,
account: AccountView.render("account.json", %{user: user}),
in_reply_to_id: nil,
in_reply_to_account_id: nil,
@@
-32,7
+32,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
favourited: false,
muted: false,
sensitive: false,
favourited: false,
muted: false,
sensitive: false,
- spoiler_text:
""
,
+ spoiler_text:
note.data["object"]["summary"]
,
visibility: "public",
media_attachments: [],
mentions: [],
visibility: "public",
media_attachments: [],
mentions: [],
@@
-41,7
+41,14
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
name: "Web",
website: nil
},
name: "Web",
website: nil
},
- language: nil
+ language: nil,
+ emojis: [
+ %{
+ shortcode: "2hu",
+ url: "corndog.png",
+ static_url: "corndog.png"
+ }
+ ]
}
assert status == expected
}
assert status == expected
@@
-49,7
+56,9
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
test "contains mentions" do
incoming = File.read!("test/fixtures/incoming_reply_mastodon.xml")
test "contains mentions" do
incoming = File.read!("test/fixtures/incoming_reply_mastodon.xml")
- user = insert(:user, %{ap_id: "https://pleroma.soykaf.com/users/lain"})
+ # a user with this ap id might be in the cache.
+ recipient = "https://pleroma.soykaf.com/users/lain"
+ user = User.get_cached_by_ap_id(recipient) || insert(:user, %{ap_id: recipient})
{:ok, [activity]} = OStatus.handle_incoming(incoming)
{:ok, [activity]} = OStatus.handle_incoming(incoming)
@@
-71,7
+80,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
}
expected = %{
}
expected = %{
- id:
1638338801
,
+ id:
"1638338801"
,
type: "image",
url: "someurl",
remote_url: "someurl",
type: "image",
url: "someurl",
remote_url: "someurl",
@@
-83,7
+92,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
# If theres a "id", use that instead of the generated one
object = Map.put(object, "id", 2)
# If theres a "id", use that instead of the generated one
object = Map.put(object, "id", 2)
- assert %{id:
2
} = StatusView.render("attachment.json", %{attachment: object})
+ assert %{id:
"2"
} = StatusView.render("attachment.json", %{attachment: object})
end
test "a reblog" do
end
test "a reblog" do
@@
-94,7
+103,8
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
represented = StatusView.render("status.json", %{for: user, activity: reblog})
represented = StatusView.render("status.json", %{for: user, activity: reblog})
- assert represented[:id] == reblog.id
- assert represented[:reblog][:id] == activity.id
+ assert represented[:id] == to_string(reblog.id)
+ assert represented[:reblog][:id] == to_string(activity.id)
+ assert represented[:emojis] == []
end
end
end
end