forked from AkkomaGang/akkoma
Merge branch 'application-to-generator' into 'develop'
Status application field: test improvements See merge request pleroma/pleroma!3356
This commit is contained in:
commit
210aa42f74
2 changed files with 24 additions and 1 deletions
lib/pleroma/web/mastodon_api/views
test/pleroma/web/mastodon_api/controllers
|
@ -536,6 +536,8 @@ defp build_emoji_map(emoji, users, current_user) do
|
|||
end
|
||||
|
||||
@spec build_application(map() | nil) :: map() | nil
|
||||
defp build_application(%{type: _type, name: name, url: url}), do: %{name: name, website: url}
|
||||
defp build_application(%{"type" => _type, "name" => name, "url" => url}),
|
||||
do: %{name: name, website: url}
|
||||
|
||||
defp build_application(_), do: nil
|
||||
end
|
||||
|
|
|
@ -376,6 +376,17 @@ test "discloses application metadata when enabled" do
|
|||
"status" => "cofe is my copilot"
|
||||
})
|
||||
|
||||
assert %{
|
||||
"content" => "cofe is my copilot"
|
||||
} = json_response_and_validate_schema(result, 200)
|
||||
|
||||
activity = result.assigns.activity.id
|
||||
|
||||
result =
|
||||
conn
|
||||
|> put_req_header("content-type", "application/json")
|
||||
|> get("api/v1/statuses/#{activity}")
|
||||
|
||||
assert %{
|
||||
"content" => "cofe is my copilot",
|
||||
"application" => %{
|
||||
|
@ -396,6 +407,16 @@ test "hides application metadata when disabled" do
|
|||
"status" => "club mate is my wingman"
|
||||
})
|
||||
|
||||
assert %{"content" => "club mate is my wingman"} =
|
||||
json_response_and_validate_schema(result, 200)
|
||||
|
||||
activity = result.assigns.activity.id
|
||||
|
||||
result =
|
||||
conn
|
||||
|> put_req_header("content-type", "application/json")
|
||||
|> get("api/v1/statuses/#{activity}")
|
||||
|
||||
assert %{
|
||||
"content" => "club mate is my wingman",
|
||||
"application" => nil
|
||||
|
|
Loading…
Reference in a new issue