diff options
| author | feld <feld@feld.me> | 2019-10-23 17:34:42 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2019-10-23 17:34:42 +0000 |
| commit | 17c237ba808d4356bb1e202e459680563b79ef99 (patch) | |
| tree | 62faffc1033054e2aa1414d85bc0009c004c6910 /test/web/mastodon_api/controllers/instance_controller_test.exs | |
| parent | 54077677eaad44ea355c7f0db7ea5e94183d5a30 (diff) | |
| parent | c0246309a5013b17a405644a0918ec0d3569eaf1 (diff) | |
| download | pleroma-17c237ba808d4356bb1e202e459680563b79ef99.tar.gz pleroma-17c237ba808d4356bb1e202e459680563b79ef99.zip | |
Merge branch '1304-user-info-deprecation' into 'develop'
[#1304] User.Info deprecation
Closes #1304
See merge request pleroma/pleroma!1851
Diffstat (limited to 'test/web/mastodon_api/controllers/instance_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/controllers/instance_controller_test.exs | 9 |
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") |