projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for...
[akkoma]
/
test
/
integration
/
mastodon_websocket_test.exs
diff --git
a/test/integration/mastodon_websocket_test.exs
b/test/integration/mastodon_websocket_test.exs
index ed7ce8fe036849bcfac98fee481789a07fc9752f..bd229c55ff0e0448133a9a3d61ce82878c525512 100644
(file)
--- a/
test/integration/mastodon_websocket_test.exs
+++ b/
test/integration/mastodon_websocket_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Integration.MastodonWebsocketTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Integration.MastodonWebsocketTest do
@@
-68,7
+68,7
@@
defmodule Pleroma.Integration.MastodonWebsocketTest do
assert {:ok, json} = Jason.decode(json["payload"])
view_json =
assert {:ok, json} = Jason.decode(json["payload"])
view_json =
- Pleroma.Web.MastodonAPI.StatusView.render("s
tatus
.json", activity: activity, for: nil)
+ Pleroma.Web.MastodonAPI.StatusView.render("s
how
.json", activity: activity, for: nil)
|> Jason.encode!()
|> Jason.decode!()
|> Jason.encode!()
|> Jason.decode!()