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, 43 deletions

diff --git a/test/tasks/refresh_counter_cache_test.exs b/test/tasks/refresh_counter_cache_test.exs
deleted file mode 100644
index 6a1a9ac17..000000000
--- a/test/tasks/refresh_counter_cache_test.exs
+++ /dev/null
@@ -1,43 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Mix.Tasks.Pleroma.RefreshCounterCacheTest do
-  use Pleroma.DataCase
-  alias Pleroma.Web.CommonAPI
-  import ExUnit.CaptureIO, only: [capture_io: 1]
-  import Pleroma.Factory
-
-  test "counts statuses" do
-    user = insert(:user)
-    other_user = insert(:user)
-
-    CommonAPI.post(user, %{visibility: "public", status: "hey"})
-
-    Enum.each(0..1, fn _ ->
-      CommonAPI.post(user, %{
-        visibility: "unlisted",
-        status: "hey"
-      })
-    end)
-
-    Enum.each(0..2, fn _ ->
-      CommonAPI.post(user, %{
-        visibility: "direct",
-        status: "hey @#{other_user.nickname}"
-      })
-    end)
-
-    Enum.each(0..3, fn _ ->
-      CommonAPI.post(user, %{
-        visibility: "private",
-        status: "hey"
-      })
-    end)
-
-    assert capture_io(fn -> Mix.Tasks.Pleroma.RefreshCounterCache.run([]) end) =~ "Done\n"
-
-    assert %{"direct" => 3, "private" => 4, "public" => 1, "unlisted" => 2} =
-             Pleroma.Stats.get_status_visibility_count()
-  end
-end