projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feld-mastoweb5000' 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 601e551a9596218de1e33688b2dd2099ac0716e2..9e2bc3c185ce8bf4eb2d70b1aaf4b412ed76b604 100644
(file)
--- a/
test/web/mastodon_api/status_view_test.exs
+++ b/
test/web/mastodon_api/status_view_test.exs
@@
-56,7
+56,12
@@
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})
+
+ # invalidate the cache
+ User.invalidate_cache(user)
{:ok, [activity]} = OStatus.handle_incoming(incoming)
{:ok, [activity]} = OStatus.handle_incoming(incoming)
@@
-78,7
+83,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",
@@
-90,7
+95,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