summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/instance_controller_test.exs
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-10-24 09:23:59 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-10-24 09:23:59 +0300
commit99cf1ef9be93ebab04d088848804369e6295a76d (patch)
tree94738e2bc0ee642db4abc4e65a9798782de59623 /test/web/mastodon_api/controllers/instance_controller_test.exs
parentd3fb9e02cc0ce7dc462e587e639e117aaef5fbc5 (diff)
parent17c237ba808d4356bb1e202e459680563b79ef99 (diff)
downloadpleroma-99cf1ef9be93ebab04d088848804369e6295a76d.tar.gz
pleroma-99cf1ef9be93ebab04d088848804369e6295a76d.zip
Merge branch 'develop' into issue/1276
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")