diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-01-21 13:03:32 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-01-21 13:03:32 +0000 |
| commit | 8cd853ce0c2d67614dc2e0b07b4cf855a2a381d2 (patch) | |
| tree | 4442ec2d7b07ebae6c5601d6822959960e47a95d /test | |
| parent | 69454c834519a68b80318ad0efecd682a1013cda (diff) | |
| parent | a4d3fec8a71241d5c40fa76e33f15fa217154600 (diff) | |
| download | pleroma-8cd853ce0c2d67614dc2e0b07b4cf855a2a381d2.tar.gz | |
Merge branch '530_federator_user_info_overwrite_fix' into 'develop'
[#530] Prevents user `info` from being overwritten because of race conditions
Closes #530
See merge request pleroma/pleroma!691
Diffstat (limited to 'test')
| -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 |