hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

Browse source
This commit is contained in:
Ivan Tashkinov 2021-03-07 11:34:39 +03:00
commit 92526e0230
8 changed files with 69 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

19
test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
View file

@ -376,6 +376,16 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest 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
|> get("api/v1/statuses/#{activity}")
assert %{
"content" => "cofe is my copilot",
"application" => %{
@ -396,6 +406,15 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest 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
|> get("api/v1/statuses/#{activity}")
assert %{
"content" => "club mate is my wingman",
"application" => nil