projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/develop' into patch-image-description
[akkoma]
/
test
/
web
/
twitter_api
/
views
/
activity_view_test.exs
diff --git
a/test/web/twitter_api/views/activity_view_test.exs
b/test/web/twitter_api/views/activity_view_test.exs
index 3d6b264b12f717aca519990cb5b3458ceb99acc5..4f854ecaa978eb9807122cff922f306923f7dcc5 100644
(file)
--- a/
test/web/twitter_api/views/activity_view_test.exs
+++ b/
test/web/twitter_api/views/activity_view_test.exs
@@
-148,7
+148,8
@@
defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do
"text" => "Hey @shp!",
"uri" => activity.data["object"]["id"],
"user" => UserView.render("show.json", %{user: user}),
"text" => "Hey @shp!",
"uri" => activity.data["object"]["id"],
"user" => UserView.render("show.json", %{user: user}),
- "visibility" => "direct"
+ "visibility" => "direct",
+ "card" => nil
}
assert result == expected
}
assert result == expected
@@
-344,7
+345,7
@@
defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do
"https://peertube.moe/videos/watch/df5f464b-be8d-46fb-ad81-2d4c2d1630e3"
)
"https://peertube.moe/videos/watch/df5f464b-be8d-46fb-ad81-2d4c2d1630e3"
)
- %Activity{} = activity = Activity.get_create_
activity_
by_object_ap_id(object.data["id"])
+ %Activity{} = activity = Activity.get_create_by_object_ap_id(object.data["id"])
result = ActivityView.render("activity.json", activity: activity)
result = ActivityView.render("activity.json", activity: activity)