diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-28 10:32:03 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-28 10:36:04 +0300 |
| commit | 1053319cd64a0eab40fab6dc9ce3a1b78711069b (patch) | |
| tree | 3d613f7c6129f667ea16aedfe46259d9ca6bde29 /test/integration/mastodon_websocket_test.exs | |
| parent | 73ae38ca04df02656bfb239ceba4ffe64879e927 (diff) | |
| parent | 50ab06435353144582f6afbf37402aef13c2b3f1 (diff) | |
| download | pleroma-1053319cd64a0eab40fab6dc9ce3a1b78711069b.tar.gz pleroma-1053319cd64a0eab40fab6dc9ce3a1b78711069b.zip | |
Merge branch 'develop' into tests/mastodon_api_controller.ex
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!() |