summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/instance_controller_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-11-05 15:21:00 +0100
committerlain <lain@soykaf.club>2019-11-05 15:21:00 +0100
commit1bd1f62af55e01613e6362661b36a19091c87424 (patch)
tree519963a50af82c1a0b251f1405d663ba9ccd4714 /test/web/mastodon_api/controllers/instance_controller_test.exs
parentfaced6236b9e2ce9675cf743068f16098b744562 (diff)
parentf11eebc18383be7d7b4b037582e4e1e08b74653b (diff)
downloadpleroma-1bd1f62af55e01613e6362661b36a19091c87424.tar.gz
pleroma-1bd1f62af55e01613e6362661b36a19091c87424.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
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")