diff options
| author | Wim Vanderbauwhede <wim.vanderbauwhede@mail.be> | 2019-02-14 16:41:40 +0000 |
|---|---|---|
| committer | Wim Vanderbauwhede <wim.vanderbauwhede@mail.be> | 2019-02-14 16:41:40 +0000 |
| commit | 04b1c135543965860029557fc216eb38fd63b6c7 (patch) | |
| tree | c1fb60376eeb35539704c23d282af7777895d4ea /test/integration | |
| parent | bf5b1c7f06c9f8882c40cf2385439bee3b74522c (diff) | |
| parent | 1d17082ab2523eb75ee0ca4a49e45da0d0edabd7 (diff) | |
| download | pleroma-04b1c135543965860029557fc216eb38fd63b6c7.tar.gz pleroma-04b1c135543965860029557fc216eb38fd63b6c7.zip | |
Merge remote-tracking branch 'upstream/develop' into patch-image-description
Diffstat (limited to 'test/integration')
| -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 |