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

Merge branch 'develop' into 'feature/2164-unify-api-arguments'

Browse source 
# Conflicts:
#   CHANGELOG.md
This commit is contained in:
feld 2021-02-02 17:11:38 +00:00
commit cd5ff7a943
12 changed files with 168 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs
View file

@ -47,6 +47,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
assert result["pleroma"]["metadata"]["federation"]
assert result["pleroma"]["metadata"]["fields_limits"]
assert result["pleroma"]["vapid_public_key"]
assert result["pleroma"]["stats"]["mau"] == 0
assert email == from_config_email
assert thumbnail == from_config_thumbnail

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

@ -263,6 +263,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
fake_conn =
conn
|> assign(:user, refresh_record(conn.assigns.user))
|> put_req_header("content-type", "application/json")
|> post("/api/v1/statuses", %{
"status" =>