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

Merge remote-tracking branch 'upstream/develop' into aliases

Browse source
This commit is contained in:
Alex Gleason 2020-10-08 15:44:48 -05:00
commit 77b1ea68a7
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
648 changed files with 15204 additions and 11903 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
View file

@ -214,6 +214,10 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController.UpdateCredentialsTest do
assert user_data = json_response_and_validate_schema(conn, 200)
assert user_data["display_name"] == "markorepairs"
update_activity = Repo.one(Pleroma.Activity)
assert update_activity.data["type"] == "Update"
assert update_activity.data["object"]["name"] == "markorepairs"
end
test "updates the user's AKAs", %{conn: conn} do