summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/instance_controller_test.exs
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2019-10-24 14:42:14 +0700
committerEgor Kislitsyn <egor@kislitsyn.com>2019-10-24 14:55:36 +0700
commit4c1dd55c48f80f3ebdb26d1a0c1a75b7922f578c (patch)
treef296a9b23362e59daf1eac6b669886be8dab1576 /test/web/mastodon_api/controllers/instance_controller_test.exs
parent478f0883eb994c639923b7b27259a02bcef8708c (diff)
parent17c237ba808d4356bb1e202e459680563b79ef99 (diff)
downloadpleroma-4c1dd55c48f80f3ebdb26d1a0c1a75b7922f578c.tar.gz
pleroma-4c1dd55c48f80f3ebdb26d1a0c1a75b7922f578c.zip
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
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")