summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/instance_controller_test.exs
diff options
context:
space:
mode:
authorMaxim Filippov <colixer@gmail.com>2019-11-05 02:12:48 +0300
committerMaxim Filippov <colixer@gmail.com>2019-11-05 02:12:48 +0300
commit43ea16870fe60578a6528e1f01bfaab68943a1bc (patch)
tree108e2d85abfa60cea3b85cd07e0b2ab467b39668 /test/web/mastodon_api/controllers/instance_controller_test.exs
parent24eecc3cb4a35376124b1fc792183d8b8dd0a9cc (diff)
parentfee127696308dbec9cff6b2a9b399cf2877cf445 (diff)
downloadpleroma-43ea16870fe60578a6528e1f01bfaab68943a1bc.tar.gz
pleroma-43ea16870fe60578a6528e1f01bfaab68943a1bc.zip
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
Diffstat (limited to 'test/web/mastodon_api/controllers/instance_controller_test.exs')
-rw-r--r--test/web/mastodon_api/controllers/instance_controller_test.exs9
1 files changed, 1 insertions, 8 deletions
diff --git a/test/web/mastodon_api/controllers/instance_controller_test.exs b/test/web/mastodon_api/controllers/instance_controller_test.exs
index f8049f81f..e00de6b18 100644
--- a/test/web/mastodon_api/controllers/instance_controller_test.exs
+++ b/test/web/mastodon_api/controllers/instance_controller_test.exs
@@ -41,20 +41,13 @@ defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
user = insert(:user, %{local: true})
user2 = insert(:user, %{local: true})
- {:ok, _user2} = User.deactivate(user2, !user2.info.deactivated)
+ {:ok, _user2} = User.deactivate(user2, !user2.deactivated)
insert(:user, %{local: false, nickname: "u@peer1.com"})
insert(:user, %{local: false, nickname: "u@peer2.com"})
{:ok, _} = Pleroma.Web.CommonAPI.post(user, %{"status" => "cofe"})
- # Stats should count users with missing or nil `info.deactivated` value
-
- {:ok, _user} =
- user.id
- |> User.get_cached_by_id()
- |> User.update_info(&Ecto.Changeset.change(&1, %{deactivated: nil}))
-
Pleroma.Stats.force_update()
conn = get(conn, "/api/v1/instance")