summaryrefslogtreecommitdiff
path: root/test/integration/mastodon_websocket_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-01-23 13:05:58 +0100
committerlain <lain@soykaf.club>2019-01-23 13:05:58 +0100
commit2de208817c04d9a48aaf0fdaf887dd0e10d15907 (patch)
tree38cf094a6405c147fe5d8cff3be173f2379166d9 /test/integration/mastodon_websocket_test.exs
parent7390192c03248ff18eff19d555f28300a7b07e09 (diff)
parentb624b7a150c813722c4ffe82112c03e246fb5760 (diff)
downloadpleroma-2de208817c04d9a48aaf0fdaf887dd0e10d15907.tar.gz
pleroma-2de208817c04d9a48aaf0fdaf887dd0e10d15907.zip
Merge branch 'develop' into rename/pleroma_activity_consistency
Diffstat (limited to 'test/integration/mastodon_websocket_test.exs')
-rw-r--r--test/integration/mastodon_websocket_test.exs3
1 files changed, 0 insertions, 3 deletions
diff --git a/test/integration/mastodon_websocket_test.exs b/test/integration/mastodon_websocket_test.exs
index 03aabf12c..2e385f5ad 100644
--- a/test/integration/mastodon_websocket_test.exs
+++ b/test/integration/mastodon_websocket_test.exs
@@ -66,13 +66,10 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
assert json["payload"]
assert {:ok, json} = Jason.decode(json["payload"])
- # Note: we remove the "statuses_count" from this result as it changes in the meantime
-
view_json =
Pleroma.Web.MastodonAPI.StatusView.render("status.json", activity: activity, for: nil)
|> Jason.encode!()
|> Jason.decode!()
- |> put_in(["account", "statuses_count"], 0)
assert json == view_json
end