diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-09-27 04:37:48 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-09-27 04:37:48 +0000 |
| commit | 91e2bcf218e0bfda7a1f1e355754147099063356 (patch) | |
| tree | 6d791b64c4b6e8cfb35a19f057e7f65c150feff1 /test/integration/mastodon_websocket_test.exs | |
| parent | eb9aa7aa1095de150d036839c78c402019efb4b1 (diff) | |
| parent | 5ea5c58a85b7be56370b151ce8977982d47fde8c (diff) | |
| download | pleroma-91e2bcf218e0bfda7a1f1e355754147099063356.tar.gz pleroma-91e2bcf218e0bfda7a1f1e355754147099063356.zip | |
Merge branch 'refactor/status-controller' into 'develop'
Extract status actions from `MastodonAPIController` to `StatusController`
See merge request pleroma/pleroma!1719
Diffstat (limited to 'test/integration/mastodon_websocket_test.exs')
| -rw-r--r-- | test/integration/mastodon_websocket_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/mastodon_websocket_test.exs b/test/integration/mastodon_websocket_test.exs index ed7ce8fe0..63fce07bb 100644 --- a/test/integration/mastodon_websocket_test.exs +++ b/test/integration/mastodon_websocket_test.exs @@ -68,7 +68,7 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do assert {:ok, json} = Jason.decode(json["payload"]) view_json = - Pleroma.Web.MastodonAPI.StatusView.render("status.json", activity: activity, for: nil) + Pleroma.Web.MastodonAPI.StatusView.render("show.json", activity: activity, for: nil) |> Jason.encode!() |> Jason.decode!() |