diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-25 05:00:47 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-25 05:00:47 +0000 |
| commit | c9b418e5477229017b3750c55cf3ea3d03b7e609 (patch) | |
| tree | d1b458bea76ff3ec296897de405f9e3c8578f897 /test/integration/mastodon_websocket_test.exs | |
| parent | 44693fbf6e5c5ec5622207e263688e3af7d1a83a (diff) | |
| parent | 4df71cd88b2725f1838c2899b3078a74dbb0c33f (diff) | |
| download | pleroma-c9b418e5477229017b3750c55cf3ea3d03b7e609.tar.gz pleroma-c9b418e5477229017b3750c55cf3ea3d03b7e609.zip | |
Merge branch 'develop' into 'oembed_provider'
# Conflicts:
# lib/pleroma/activity.ex
Diffstat (limited to 'test/integration/mastodon_websocket_test.exs')
| -rw-r--r-- | test/integration/mastodon_websocket_test.exs | 3 |
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 |