Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances

# Conflicts:
#	lib/pleroma/web/feed/user_controller.ex
#	lib/pleroma/web/o_status/o_status_controller.ex
#	lib/pleroma/web/router.ex
#	lib/pleroma/web/static_fe/static_fe_controller.ex

1 files changed, 0 insertions, 37 deletions

diff --git a/test/user/query_test.exs b/test/user/query_test.exs
deleted file mode 100644
index e2f5c7d81..000000000
--- a/test/user/query_test.exs
+++ /dev/null
@@ -1,37 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.User.QueryTest do
-  use Pleroma.DataCase, async: true
-
-  alias Pleroma.Repo
-  alias Pleroma.User
-  alias Pleroma.User.Query
-  alias Pleroma.Web.ActivityPub.InternalFetchActor
-
-  import Pleroma.Factory
-
-  describe "internal users" do
-    test "it filters out internal users by default" do
-      %User{nickname: "internal.fetch"} = InternalFetchActor.get_actor()
-
-      assert [_user] = User |> Repo.all()
-      assert [] == %{} |> Query.build() |> Repo.all()
-    end
-
-    test "it filters out users without nickname by default" do
-      insert(:user, %{nickname: nil})
-
-      assert [_user] = User |> Repo.all()
-      assert [] == %{} |> Query.build() |> Repo.all()
-    end
-
-    test "it returns internal users when enabled" do
-      %User{nickname: "internal.fetch"} = InternalFetchActor.get_actor()
-      insert(:user, %{nickname: nil})
-
-      assert %{internal: true} |> Query.build() |> Repo.aggregate(:count) == 2
-    end
-  end
-end