diff options
| author | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-09-20 14:54:30 +0000 |
|---|---|---|
| committer | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-09-20 14:54:30 +0000 |
| commit | 7458adc2567caf90c3b01ef4b8bf90a67cbc041c (patch) | |
| tree | f0d31e8c06c7627abdc4cd54f8f935a304622b7b /test | |
| parent | c9585ec00760b46f013f36a7f7625ac36471d3e8 (diff) | |
| parent | 40c51f118f463127b2538e04fe3b29f90f89055d (diff) | |
| download | pleroma-7458adc2567caf90c3b01ef4b8bf90a67cbc041c.tar.gz | |
Merge branch 'feature/mastodon_api_2.5.0' into 'develop'
Update mastodon API to 2.5.0
Closes: https://git.pleroma.social/pleroma/pleroma/issues/298
Closes: https://git.pleroma.social/pleroma/pleroma/issues/299
See: https://git.pleroma.social/pleroma/pleroma/merge_requests/351
Diffstat (limited to 'test')
| -rw-r--r-- | test/web/mastodon_api/account_view_test.exs | 3 | ||||
| -rw-r--r-- | test/web/mastodon_api/status_view_test.exs | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/test/web/mastodon_api/account_view_test.exs b/test/web/mastodon_api/account_view_test.exs index e1e07fbcd..dc52b92bc 100644 --- a/test/web/mastodon_api/account_view_test.exs +++ b/test/web/mastodon_api/account_view_test.exs @@ -126,7 +126,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do muting_notifications: false, requested: false, domain_blocking: false, - showing_reblogs: false + showing_reblogs: false, + endorsed: false } assert expected == AccountView.render("relationship.json", %{user: user, target: other_user}) diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs index b3b6c5851..b9c019206 100644 --- a/test/web/mastodon_api/status_view_test.exs +++ b/test/web/mastodon_api/status_view_test.exs @@ -28,6 +28,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do content: HtmlSanitizeEx.basic_html(note.data["object"]["content"]), created_at: created_at, reblogs_count: 0, + replies_count: 0, favourites_count: 0, reblogged: false, favourited: false, |